From 2f56f73915cf97d3134c7abe719bd5d19e41234d Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Fri, 13 Nov 2020 14:38:16 +0100
Subject: [PATCH] no-jira: wording for password reset panel in administration
---
src/main/java/org/olat/_spring/extensionContext.xml | 10 +++++-----
.../org/olat/admin/user/bulkChange/_content/index.html | 6 +++++-
.../user/bulkChange/_i18n/LocalStrings_ar.properties | 1 -
.../user/bulkChange/_i18n/LocalStrings_de.properties | 5 +++--
.../user/bulkChange/_i18n/LocalStrings_el.properties | 2 --
.../user/bulkChange/_i18n/LocalStrings_en.properties | 5 +++--
.../user/bulkChange/_i18n/LocalStrings_fr.properties | 4 ++--
.../user/bulkChange/_i18n/LocalStrings_it.properties | 2 --
.../user/bulkChange/_i18n/LocalStrings_jp.properties | 2 --
.../bulkChange/_i18n/LocalStrings_nl_NL.properties | 2 --
.../user/bulkChange/_i18n/LocalStrings_pl.properties | 2 --
.../bulkChange/_i18n/LocalStrings_pt_BR.properties | 3 +--
.../bulkChange/_i18n/LocalStrings_zh_TW.properties | 2 --
13 files changed, 19 insertions(+), 27 deletions(-)
diff --git a/src/main/java/org/olat/_spring/extensionContext.xml b/src/main/java/org/olat/_spring/extensionContext.xml
index 764986fae34..8ecb2fe6daa 100644
--- a/src/main/java/org/olat/_spring/extensionContext.xml
+++ b/src/main/java/org/olat/_spring/extensionContext.xml
@@ -613,10 +613,10 @@
</property>
</bean>
- <!-- user bulk-pw change ("OLAT password") -->
+ <!-- User bulk password change ("OLAT password") -->
<bean class="org.olat.core.extensions.action.GenericActionExtension" init-method="initExtensionPoints">
- <property name="order" value="7304" />
- <property name="actionController">
+ <property name="order" value="8900" />
+ <property name="actionController">
<bean class="org.olat.core.gui.control.creator.AutoCreator" scope="prototype">
<property name="className" value="org.olat.admin.user.bulkChange.UserBulkChangePasswordController"/>
</bean>
@@ -629,8 +629,8 @@
<value>org.olat.admin.SystemAdminMainController</value>
</list>
</property>
- <property name="parentTreeNodeIdentifier" value="sysconfigParent" />
- </bean>
+ <property name="parentTreeNodeIdentifier" value="loginAndSecurityParent" />
+ </bean>
diff --git a/src/main/java/org/olat/admin/user/bulkChange/_content/index.html b/src/main/java/org/olat/admin/user/bulkChange/_content/index.html
index 1833574eaca..14dd065d72a 100644
--- a/src/main/java/org/olat/admin/user/bulkChange/_content/index.html
+++ b/src/main/java/org/olat/admin/user/bulkChange/_content/index.html
@@ -1 +1,5 @@
-$r.render("form")
\ No newline at end of file
+<fieldset>
+ <legend>$r.translate("main.menu.title")</legend>
+ <div class="o_error" role="alert">$r.translate("password.reset.desc")</div>
+ $r.render("form")
+</fieldset>
diff --git a/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_ar.properties b/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_ar.properties
index 41ec8b062e1..04ab0bca783 100644
--- a/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_ar.properties
+++ b/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_ar.properties
@@ -6,7 +6,6 @@ bulk.psw.users=\u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u0645\u0633\u062A\u06
error.password=$org.olat.user\:error.password.invalid
form.name.language=\u0627\u0644\u0644\u063A\u0629
form.name.pwd=\u0643\u0644\u0645\u0629 \u0627\u0644\u0645\u0631\u0648\u0631
-main.menu.title=\u0643\u0644\u0645\u0629 \u0645\u0631\u0648\u0631 \u0623\u0648\u0644\u0627\u062A
role.add=\u0625\u0636\u0627\u0641\u0629
role.remove=\u062D\u0630\u0641
step.notmandatory=\u0647\u0630\u0647 \u0627\u0644\u062E\u0637\u0648\u0629 \u0644\u064A\u0633\u062A \u0625\u062C\u0628\u0627\u0631\u064A\u0629 \u0628\u0634\u0631\u0637 \u0623\u0646 \u064A\u0643\u0648\u0646 \u0647\u0646\u0627\u0643 \u062A\u0639\u062F\u064A\u0644\u0627\u062A \u0623\u062E\u0631\u0649.
diff --git a/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_de.properties
index 2c65ff15b89..f932271faec 100644
--- a/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_de.properties
@@ -3,6 +3,7 @@ error.password=$org.olat.user\:error.password.invalid
form.name.language=Sprache
form.name.pwd=Passwort
organisations=Organisation
+password.reset.desc=\u00C4nderungen sind endg\u00FCltig und k\u00F6nnen nicht zur\u00FCckgesetzt werden.
role.add=hinzuf\u00FCgen
role.remove=entfernen
step.notmandatory=Dieser Schritt kann \u00FCbersprungen werden, sofern Sie in andernorts \u00C4nderungen vornehmen.
@@ -35,8 +36,8 @@ table.role.principal=Principals
table.role.removed=Entfernte Rolle
table.user.login=Benutzername
title=\u00C4nderung von Benutzer-Attributen
-main.menu.title=OLAT Passwort
-main.menu.title.alt=Massen\u00E4nderung des OLAT Passworts
+main.menu.title=Passwort Reset
+main.menu.title.alt=Massen\u00E4nderung des Passworts
bulk.psw.users=Benutzerliste
bulk.psw.newpsw=Passwort
bulk.psw.submit=Ausf\u00FChren
diff --git a/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_el.properties b/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_el.properties
index 1602aff0a2e..31d285f0723 100644
--- a/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_el.properties
+++ b/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_el.properties
@@ -8,8 +8,6 @@ bulk.psw.users=\u039B\u03AF\u03C3\u03C4\u03B1 \u03C7\u03C1\u03B7\u03C3\u03C4\u03
error.password=$org.olat.user\:error.password.invalid
form.name.language=\u0393\u03BB\u03CE\u03C3\u03C3\u03B1
form.name.pwd=\u039A\u03C9\u03B4\u03B9\u03BA\u03CC\u03C2 \u03A0\u03C1\u03CC\u03C3\u03B2\u03B1\u03C3\u03B7\u03C2
-main.menu.title=\u039A\u03C9\u03B4\u03B9\u03BA\u03CC\u03C2 OLAT
-main.menu.title.alt=\u039C\u03B1\u03B6\u03B9\u03BA\u03AE \u03B1\u03BB\u03BB\u03B1\u03B3\u03AE \u03BA\u03C9\u03B4\u03B9\u03BA\u03CE\u03BD OLAT
role.add=\u03A0\u03C1\u03BF\u03C3\u03B8\u03AE\u03BA\u03B7
role.remove=\u0391\u03C6\u03B1\u03AF\u03C1\u03B5\u03C3\u03B7
step.notmandatory=\u0391\u03C5\u03C4\u03CC \u03C4\u03BF \u03B2\u03AE\u03BC\u03B1 \u03B4\u03B5\u03BD \u03B5\u03AF\u03BD\u03B1\u03B9 \u03C5\u03C0\u03BF\u03C7\u03C1\u03B5\u03C9\u03C4\u03B9\u03BA\u03CC, \u03B5\u03C6\u03CC\u03C3\u03BF\u03BD \u03C5\u03C0\u03AC\u03C1\u03C7\u03BF\u03C5\u03BD \u03B1\u03BB\u03BB\u03BF\u03CD \u03C4\u03C1\u03BF\u03C0\u03BF\u03C0\u03BF\u03B9\u03AE\u03C3\u03B5\u03B9\u03C2.
diff --git a/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_en.properties
index bad73e76e93..7ae21129e81 100644
--- a/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_en.properties
@@ -8,9 +8,10 @@ bulk.psw.users=User list
error.password=$org.olat.user\:error.password.invalid
form.name.language=Language
form.name.pwd=Password
-main.menu.title=OLAT password
-main.menu.title.alt=Bulk modification of OLAT password
+main.menu.title=Password reset
+main.menu.title.alt=Bulk modification of passwords
organisations=Organisation
+password.reset.desc=Changes are definitive and cannot be restored.
role.add=Add
role.remove=Remove
step.notmandatory=This step is not mandatory provided that there are modifications elsewhere.
diff --git a/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_fr.properties
index 960214c867f..dd15e73bd7c 100644
--- a/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_fr.properties
@@ -9,8 +9,8 @@ bulk.psw.users=Liste utilisateurs
error.password=$org.olat.user\:error.password.invalid
form.name.language=langue
form.name.pwd=mot de passe
-main.menu.title=Mot de passe OLAT
-main.menu.title.alt=Modification en masse du mot de passe OLAT
+main.menu.title=Rénitialiser mot de passe
+main.menu.title.alt=Modification en masse du mot de passe
organisations=Organisation
role.add=ajouter
role.remove=enlever
diff --git a/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_it.properties
index 6a65f8e46c6..d8fca24b5fa 100644
--- a/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_it.properties
@@ -9,8 +9,6 @@ bulk.psw.users=Lista utenti
error.password=$org.olat.user\:error.password.invalid
form.name.language=Lingua
form.name.pwd=Password
-main.menu.title=Password OLAT
-main.menu.title.alt=Modificazione in massa della password OLAT
organisations=Organizzazioni
role.add=aggiungere
role.remove=eliminare
diff --git a/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_jp.properties b/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_jp.properties
index 0df0c3442f1..d72e086b5bd 100644
--- a/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_jp.properties
+++ b/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_jp.properties
@@ -8,8 +8,6 @@ bulk.psw.users=\u30E6\u30FC\u30B6\u30EA\u30B9\u30C8
error.password=$org.olat.user\:error.password.invalid
form.name.language=\u8A00\u8A9E
form.name.pwd=\u30D1\u30B9\u30EF\u30FC\u30C9
-main.menu.title=OLAT\u30D1\u30B9\u30EF\u30FC\u30C9
-main.menu.title.alt=OLAT\u30D1\u30B9\u30EF\u30FC\u30C9\u306E\u30D0\u30EB\u30AF\u4FEE\u6B63
role.add=\u8FFD\u52A0
role.remove=\u524A\u9664
step.notmandatory=\u4ED6\u306E\u5834\u6240\u3067\u4FEE\u6B63\u3067\u304D\u308B\u305F\u3081\u3001\u3053\u306E\u30B9\u30C6\u30C3\u30D7\u306F\u5FC5\u9808\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
diff --git a/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_nl_NL.properties b/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_nl_NL.properties
index a57668277ec..771e4b93c00 100644
--- a/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_nl_NL.properties
+++ b/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_nl_NL.properties
@@ -8,8 +8,6 @@ bulk.psw.users=Gebruikerslijst
error.password=$org.olat.user\:error.password.invalid
form.name.language=Taal
form.name.pwd=Wachtwoord
-main.menu.title=OLAT wachtwoord
-main.menu.title.alt=Massa wijziging van OLAT wachtwoord
role.add=toevoegen
role.remove=Verwijder
step.notmandatory=Deze stap is niet verplicht als er elders aanpassingen zijn
diff --git a/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_pl.properties
index a5071983ce6..170c5f3ab5a 100644
--- a/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_pl.properties
+++ b/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_pl.properties
@@ -9,8 +9,6 @@ bulk.psw.users=Lista u\u017Cytkownik\u00F3w
error.password=$org.olat.user\:error.password.invalid
form.name.language=J\u0119zyk
form.name.pwd=Has\u0142o
-main.menu.title=Has\u0142o OLAT
-main.menu.title.alt=Masowa zmiana hase\u0142 OLAT
role.add=dodaj
role.remove=usu\u0144
step.notmandatory=This step is not mandatory provided that there are modifications elsewhere.
diff --git a/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_pt_BR.properties
index ff2585ad10f..96e44cbcd65 100644
--- a/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_pt_BR.properties
@@ -9,8 +9,7 @@ bulk.psw.users=Lista de usu\u00E1rios
error.password=$org.olat.user\:error.password.invalid
form.name.language=Idioma
form.name.pwd=Senha
-main.menu.title=Senha OLAT
-main.menu.title.alt=Bulk modifica\u00E7\u00E3o da senha OLAT
+main.menu.title.alt=Bulk modifica\u00E7\u00E3o da senha
organisations=Organiza\u00E7\u00E3o
role.add=Adicionar
role.remove=Remover
diff --git a/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_zh_TW.properties b/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_zh_TW.properties
index 1f47a85f880..18b6ae76b46 100644
--- a/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_zh_TW.properties
+++ b/src/main/java/org/olat/admin/user/bulkChange/_i18n/LocalStrings_zh_TW.properties
@@ -8,8 +8,6 @@ bulk.psw.users=\u4F7F\u7528\u8005\u6E05\u55AE
error.password=$org.olat.user\:error.password.invalid
form.name.language=\u8A9E\u8A00
form.name.pwd=\u5BC6\u78BC
-main.menu.title=OLAT \u5BC6\u78BC
-main.menu.title.alt=\u5927\u6279\u4FEE\u6539 OLAT \u5BC6\u78BC
role.add=\u52A0\u5165
role.remove=\u79FB\u9664
step.notmandatory=\u9019\u500B\u6B65\u9A5F\u4E0D\u662F\u5FC5\u8981\u7684\uFF0C\u5047\u8A2D\u5225\u7684\u5730\u65B9\u6709\u4FEE\u6539\u7684\u8A71\u3002
--
GitLab