Skip to content

Conversation

@Gerry-Forde
Copy link
Member

@Gerry-Forde Gerry-Forde commented Oct 14, 2025

@rhdh-bot
Copy link
Collaborator

rhdh-bot commented Oct 14, 2025

…-custom-plugins.adoc

Co-authored-by: Debsmita Santra <debsmita.santra@gmail.com>
…-custom-plugins.adoc

Co-authored-by: Debsmita Santra <debsmita.santra@gmail.com>
…s.adoc

Co-authored-by: Debsmita Santra <debsmita.santra@gmail.com>
@Gerry-Forde
Copy link
Member Author

Merging this now, so that we can build Pantheon title to be ready for publication. Any further documentation updates can be made async.

@Gerry-Forde Gerry-Forde merged commit 8e3cdb2 into redhat-developer:main Nov 10, 2025
3 checks passed
@Gerry-Forde
Copy link
Member Author

/cherry-pick release-1.8

@openshift-cherrypick-robot
Copy link
Contributor

@Gerry-Forde: #1443 failed to apply on top of branch "release-1.8":

Applying: RHIDP-8635-1 - Comprehensive documentation for developers on adding localization support to custom plugins
.git/rebase-apply/patch:495: trailing whitespace.
.. In the helm chart -> Root Schema -> Backstage chart schema -> Backstage parameters -> Backstage container additional volume mounts 
.git/rebase-apply/patch:503: trailing whitespace.
---- 
.git/rebase-apply/patch:67: new blank line at EOF.
+
.git/rebase-apply/patch:530: new blank line at EOF.
+
warning: 4 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	titles/customizing/master.adoc
Falling back to patching base and 3-way merge...
Auto-merging titles/customizing/master.adoc
Applying: RHIDP-8635-1 - Comprehensive documentation for developers on adding localization support to custom plugins
Applying: RHIDP-8635-1 - Comprehensive documentation for developers on adding localization support to custom plugins
Applying: RHIDP-8635-1 - Comprehensive documentation for developers on adding localization support to custom plugins
Applying: Update modules/customizing-the-appearance/proc-adding-localization-to-custom-plugins.adoc
Applying: Update modules/customizing-the-appearance/proc-adding-localization-to-custom-plugins.adoc
Applying: Update modules/customizing-the-appearance/proc-overriding-translations.adoc
Applying: RHIDP-8635-1 - Comprehensive documentation for developers on adding localization support to custom plugins
Applying: RHIDP-8635-1 - Comprehensive documentation for developers on adding localization support to custom plugins
Applying: RHIDP-8635-1 - Comprehensive documentation for developers on adding localization support to custom plugins
Applying: RHIDP-8635-1 - Comprehensive documentation for developers on adding localization support to custom plugins
Applying: Update modules/customizing-the-appearance/proc-overriding-translations.adoc
Applying: Update modules/customizing-the-appearance/proc-overriding-translations.adoc
Applying: Update modules/customizing-the-appearance/proc-overriding-translations.adoc
Applying: Update modules/customizing-the-appearance/proc-overriding-translations.adoc
Applying: Update modules/customizing-the-appearance/con-language-persistence.adoc
Applying: Update modules/customizing-the-appearance/proc-overriding-translations.adoc
Applying: Update modules/customizing-the-appearance/proc-overriding-translations.adoc
Applying: Update modules/customizing-the-appearance/proc-overriding-translations.adoc
Applying: Update modules/customizing-the-appearance/proc-overriding-translations.adoc
Applying: Update modules/customizing-the-appearance/proc-overriding-translations.adoc
Applying: Update modules/customizing-the-appearance/proc-overriding-translations.adoc
Applying: Update modules/customizing-the-appearance/ref-best-practices-for-localization.adoc
Applying: Update modules/customizing-the-appearance/proc-overriding-translations.adoc
Applying: Update modules/customizing-the-appearance/proc-adding-localization-to-custom-plugins.adoc
Applying: RHIDP-8635-1 - Comprehensive documentation for developers on adding localization support to custom plugins
Applying: RHIDP-8635-1 - Comprehensive documentation for developers on adding localization support to custom plugins
Applying: RHIDP-8635-1 - Comprehensive documentation for developers on adding localization support to custom plugins
Applying: RHIDP-8635-1 - Comprehensive documentation for developers on adding localization support to custom plugins
.git/rebase-apply/patch:76: trailing whitespace.
You can enable translation key support for floating action buttons, so that users can onboard in their preferred language. In {product-short}, all existing and newly created floating action buttons support localization using dedicated translation keys. 
.git/rebase-apply/patch:208: trailing whitespace.
You can enable translation key support for sidebar menu items, so that users can onboard in their preferred language. In {product-short}, all existing and newly created sidebar menu items support localization using the `titleKey` translation key. 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	assemblies/assembly-configuring-the-quickstarts.adoc
Falling back to patching base and 3-way merge...
Auto-merging assemblies/assembly-configuring-the-quickstarts.adoc
CONFLICT (content): Merge conflict in assemblies/assembly-configuring-the-quickstarts.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0029 RHIDP-8635-1 - Comprehensive documentation for developers on adding localization support to custom plugins

In response to this:

/cherry-pick release-1.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Peer review done 📘 Technical review done ⛅ Any procedure has been succesfully tested

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants