Skip to content

Revert " fix(translations): stop translating two admin messages twice" - #3842

Merged
bobvandevijver merged 1 commit into
6.1from
revert-3834-fix/double-translated-messages
Oct 24, 2026
Merged

bobvandevijver merged 1 commit into
6.1from
revert-3834-fix/double-translated-messages

Conversation

@bobvandevijver

Copy link
Copy Markdown
Member

Reverts #3834.

@Vondry reverting this as it makes the merge up to 6.2 impossible due to your translation clean-up there. If you want you can submit it again for 6.2.

Copilot AI balanced review requested due to automatic review settings October 24, 2026 16:35
@bobvandevijver
bobvandevijver merged commit dff8bef into 6.1 Oct 24, 2026
36 checks passed
@bobvandevijver
bobvandevijver deleted the revert-3834-fix/double-translated-messages branch October 24, 2026 16:37

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Approval recommended

The changes exactly reverse #3834 as requested, with no blocking issues beyond the behavior intentionally restored by the rollback.

No open issues 🎉

What changed in this PR

Reverts #3834 in Bolt’s admin translations to unblock the merge into 6.2, where the double-translation fix can be resubmitted.

Changes:

  • Restores translation of the login-required flash before rendering and the secure-preview label before passing it to the button macro.
  • Restores the previous translation catalogue entries and wording.
File Description
translations/​security.sk.xlf Restores Slovak login-required translation.
translations/​security.ru.xlf Restores Russian login-required translation.
translations/​security.en.xlf Restores English login-required entry.
translations/​security.de.xlf Restores German login-required translation and source note.
translations/​security.cs.xlf Restores Czech login-required translation.
translations/​messages.sk.xlf Restores Slovak secure-preview entry.
translations/​messages.ru.xlf Restores secure-preview entry and previous login wording.
translations/​messages.fr.xlf Restores French secure-preview entry.
translations/​messages.en.xlf Restores English secure-preview entry.
translations/​messages.de.xlf Removes login-required entry from the messages domain.
translations/​messages.cs.xlf Restores secure-preview entry and previous login wording.
templates/​content/​_buttons.html.twig Restores translation before calling the button macro.
src/​Security/​AuthenticationEntryPointRedirector.php Restores translator injection and security-domain flash translation.

Review effort: Balanced

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants