From 7657a0e89a9a9247c42d9d551d0fc2f3e2fe181c Mon Sep 17 00:00:00 2001 From: Marius Balteanu Date: Wed, 13 Aug 2025 20:44:09 +0000 Subject: [PATCH] Reverts r23919 due to an unwanted change (#43125). git-svn-id: https://svn.redmine.org/redmine/trunk@23922 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/journals/new.js.erb | 4 ++-- config/locales/ar.yml | 1 - config/locales/az.yml | 1 - config/locales/bg.yml | 1 - config/locales/bs.yml | 1 - config/locales/ca.yml | 1 - config/locales/cs.yml | 1 - config/locales/da.yml | 1 - config/locales/de.yml | 1 - config/locales/el.yml | 1 - config/locales/en-GB.yml | 1 - config/locales/es-PA.yml | 1 - config/locales/es.yml | 1 - config/locales/et.yml | 1 - config/locales/eu.yml | 1 - config/locales/fa.yml | 1 - config/locales/fi.yml | 1 - config/locales/fr.yml | 1 - config/locales/gl.yml | 1 - config/locales/he.yml | 1 - config/locales/hr.yml | 1 - config/locales/hu.yml | 1 - config/locales/id.yml | 1 - config/locales/it.yml | 1 - config/locales/ja.yml | 1 - config/locales/ko.yml | 1 - config/locales/lt.yml | 1 - config/locales/lv.yml | 1 - config/locales/mk.yml | 1 - config/locales/mn.yml | 1 - config/locales/nl.yml | 1 - config/locales/no.yml | 1 - config/locales/pl.yml | 1 - config/locales/pt-BR.yml | 1 - config/locales/pt.yml | 1 - config/locales/ro.yml | 1 - config/locales/ru.yml | 1 - config/locales/sk.yml | 1 - config/locales/sl.yml | 1 - config/locales/sq.yml | 1 - config/locales/sr-YU.yml | 1 - config/locales/sr.yml | 1 - config/locales/sv.yml | 1 - config/locales/ta-IN.yml | 1 - config/locales/th.yml | 1 - config/locales/tr.yml | 1 - config/locales/uk.yml | 1 - config/locales/vi.yml | 1 - config/locales/zh-TW.yml | 1 - config/locales/zh.yml | 1 - 50 files changed, 2 insertions(+), 51 deletions(-) diff --git a/app/views/journals/new.js.erb b/app/views/journals/new.js.erb index 2320cc106..0f832f37f 100644 --- a/app/views/journals/new.js.erb +++ b/app/views/journals/new.js.erb @@ -1,4 +1,4 @@ -showAndScrollTo("add_notes"); +showAndScrollTo("update"); var notes = $('#issue_notes').val(); if (notes > "") { notes = notes + "\n\n"} @@ -6,7 +6,7 @@ if (notes > "") { notes = notes + "\n\n"} $('#issue_notes').blur().focus().val(notes + "<%= raw escape_javascript(@content) %>"); <% # when quoting a private journal, check the private checkbox - if @journal && @journal.private_notes? + if @journal && @journal.private_notes? %> $('#issue_private_notes').prop('checked', true); <% end %> diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 17a15ab40..ab68e841e 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -1534,4 +1534,3 @@ ar: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/az.yml b/config/locales/az.yml index 41f35e28f..54b623974 100644 --- a/config/locales/az.yml +++ b/config/locales/az.yml @@ -1625,4 +1625,3 @@ az: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/bg.yml b/config/locales/bg.yml index e4167698a..e4eb0d224 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -1477,4 +1477,3 @@ bg: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/bs.yml b/config/locales/bs.yml index 820993b02..be1d37733 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -1520,4 +1520,3 @@ bs: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 7864192a9..f047922c6 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -1521,4 +1521,3 @@ ca: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/cs.yml b/config/locales/cs.yml index cf65f5bcd..c2438194d 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -1515,4 +1515,3 @@ cs: omezeno rolí a členstvím v projektu uživatele, který to povolil. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/da.yml b/config/locales/da.yml index ba6207034..1226d4a3c 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -1551,4 +1551,3 @@ da: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/de.yml b/config/locales/de.yml index aac0a90ce..9c8da2187 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1491,4 +1491,3 @@ de: text_oauth_info_scopes: Scopes für die Applikation auswählen. Die Applikation wird niemals mehr Rechte haben als hier ausgewählt. Sie wird außerdem auf die Rollen und Projektmitgliedschaften des Benutzers, der sie autorisiert hat, beschränkt sein. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/el.yml b/config/locales/el.yml index 5ccb18e10..642d77281 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -1534,4 +1534,3 @@ el: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 9439ba044..1fc956a0c 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -1535,4 +1535,3 @@ en-GB: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/es-PA.yml b/config/locales/es-PA.yml index ba5e54881..e13baf1f2 100644 --- a/config/locales/es-PA.yml +++ b/config/locales/es-PA.yml @@ -1565,4 +1565,3 @@ es-PA: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/es.yml b/config/locales/es.yml index 4a956ae42..f4abb327d 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -1601,4 +1601,3 @@ es: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/et.yml b/config/locales/et.yml index 9eabec555..8f3dc3d88 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -1539,4 +1539,3 @@ et: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/eu.yml b/config/locales/eu.yml index a1b27d9eb..cfdba7ad0 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -1535,4 +1535,3 @@ eu: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 82ca23eaa..9e4e58d1e 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -1462,4 +1462,3 @@ fa: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/fi.yml b/config/locales/fi.yml index e8041259e..2105ff7ee 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -1552,4 +1552,3 @@ fi: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/fr.yml b/config/locales/fr.yml index efed171d5..bbbffe200 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1511,4 +1511,3 @@ fr: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/gl.yml b/config/locales/gl.yml index b1337da1b..385135dd0 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -1540,4 +1540,3 @@ gl: limitado polos roles e permisos no proxecto do usuario que o autorizou. label_position: Posición label_message: Mensaxe - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/he.yml b/config/locales/he.yml index 8a1688223..d6b575bad 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -1539,4 +1539,3 @@ he: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/hr.yml b/config/locales/hr.yml index e9fa1b264..23bf9602d 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -1531,4 +1531,3 @@ hr: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 439cdd737..79fbe4578 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -1523,4 +1523,3 @@ limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/id.yml b/config/locales/id.yml index 011227c37..8ecb084b2 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -1536,4 +1536,3 @@ id: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/it.yml b/config/locales/it.yml index 6a393bd6d..b6f34ecbc 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -1473,4 +1473,3 @@ it: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/ja.yml b/config/locales/ja.yml index d331bee3c..9d51f82a9 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -1483,4 +1483,3 @@ ja: text_oauth_info_scopes: Select the scopes this application may request. The application will not be allowed to do more than what is selected here. It will also always be limited by the roles and project memberships of the user who authorized it. - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/ko.yml b/config/locales/ko.yml index b2c6d0410..d811f93e8 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -1551,4 +1551,3 @@ ko: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 327868723..d768b59f0 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -1495,4 +1495,3 @@ lt: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 61f0f3a47..f88bd078a 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -1528,4 +1528,3 @@ lv: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 6cb28a803..6f69193bf 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -1534,4 +1534,3 @@ mk: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/mn.yml b/config/locales/mn.yml index b5b9a1a1c..6f6ef7fc2 100644 --- a/config/locales/mn.yml +++ b/config/locales/mn.yml @@ -1534,4 +1534,3 @@ mn: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 4e65ec763..d937e44d9 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -1509,4 +1509,3 @@ nl: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/no.yml b/config/locales/no.yml index 08cf1eca6..26c96e893 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -1525,4 +1525,3 @@ limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 96dac0026..c5e286563 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -1478,4 +1478,3 @@ pl: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 0c121c0cd..c087d46a2 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -1539,4 +1539,3 @@ pt-BR: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 3d91dd11c..34825aea7 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -1527,4 +1527,3 @@ pt: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 3662fc3ec..441b672a5 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -1529,4 +1529,3 @@ ro: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/ru.yml b/config/locales/ru.yml index fd413463a..80e442b02 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1603,4 +1603,3 @@ ru: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 06324021f..8852ae029 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -1523,4 +1523,3 @@ sk: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 6f3588211..e87a57170 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -1534,4 +1534,3 @@ sl: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 5ab1637e0..14c958e65 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -1496,4 +1496,3 @@ sq: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml index 4c9f4aad9..8e31e93db 100644 --- a/config/locales/sr-YU.yml +++ b/config/locales/sr-YU.yml @@ -1536,4 +1536,3 @@ sr-YU: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/sr.yml b/config/locales/sr.yml index c8a6dc785..0c04d39bb 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -1535,4 +1535,3 @@ sr: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/sv.yml b/config/locales/sv.yml index e57e37dfb..ab63dd62b 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -1498,4 +1498,3 @@ sv: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/ta-IN.yml b/config/locales/ta-IN.yml index b79db5386..70284cec6 100644 --- a/config/locales/ta-IN.yml +++ b/config/locales/ta-IN.yml @@ -1489,4 +1489,3 @@ ta-IN: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/th.yml b/config/locales/th.yml index 11ea63aab..8ada77934 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -1530,4 +1530,3 @@ th: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/tr.yml b/config/locales/tr.yml index acdcbce0f..15b00e007 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -1533,4 +1533,3 @@ tr: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/uk.yml b/config/locales/uk.yml index cb7b333d0..e1e890a44 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -1522,4 +1522,3 @@ uk: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 186f9e2dd..119c94652 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -1538,4 +1538,3 @@ vi: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index c0574e5a4..6dc0d66b0 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -1546,4 +1546,3 @@ 此外，其存取權限也將始終受限於授權使用者的角色與所屬專案成員資格。 label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up diff --git a/config/locales/zh.yml b/config/locales/zh.yml index b3a02cc4d..bcde1116d 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1470,4 +1470,3 @@ zh: limited by the roles and project memberships of the user who authorized it. label_position: Position label_message: Message - twofa_already_setup: Two-factor authentication already set up