From c9ea28bf2bb80092830c64ac4bff5bc92f620623 Mon Sep 17 00:00:00 2001
From: gnaegi <none@none>
Date: Thu, 20 Dec 2012 16:31:35 +0100
Subject: [PATCH] OO-458 add username / pwd rules also to user import wizard
---
src/main/java/org/olat/admin/user/imp/_content/step0.html | 6 ++++++
.../olat/admin/user/imp/_i18n/LocalStrings_de.properties | 1 +
.../olat/admin/user/imp/_i18n/LocalStrings_en.properties | 1 +
3 files changed, 8 insertions(+)
diff --git a/src/main/java/org/olat/admin/user/imp/_content/step0.html b/src/main/java/org/olat/admin/user/imp/_content/step0.html
index 4d15b92c418..135ffb50e49 100644
--- a/src/main/java/org/olat/admin/user/imp/_content/step0.html
+++ b/src/main/java/org/olat/admin/user/imp/_content/step0.html
@@ -9,6 +9,12 @@ $r.translate("formatexplanation.part2a")
$r.translate("formatexplanation.part3")
<p />
+$r.translate("formatexplanation.conventions")
+<ul>
+ <li>$r.translateWithPackage("org.olat.user", "form.checkPassword")</li>
+ <li>$r.translateWithPackage("org.olat.user", "form.checkUsername")</li>
+</ul>
+
#b_togglebox_start("o_usermanagement_importexample" "$r.translate('import.example')")
#if($canCreateOLATPassword)
<img alt="$r.translateInAttribute("import.example")" src='$r.staticLink('images/screen/userimport.png')' />
diff --git a/src/main/java/org/olat/admin/user/imp/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/admin/user/imp/_i18n/LocalStrings_de.properties
index 8b67820d419..be5f3532c1a 100644
--- a/src/main/java/org/olat/admin/user/imp/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/admin/user/imp/_i18n/LocalStrings_de.properties
@@ -18,6 +18,7 @@ formatexplanation.part2.cancreatepassword=Benutzername *, Passwort, Sprache{0}.<
formatexplanation.part2.cannotcreatepassword=Benutzername *, Sprache{0}. </li>
formatexplanation.part2a=<li>Folgende Felder sind auszuf\u00FCllen (solche mit * zwingend)\:
formatexplanation.part3=<li>Wenn das Feld "Sprache" leer gelassen wird, so wird die Standardsprache der OLAT-Installation verwendet.</li><li>Orientieren Sie sich in der Excel-Vorlage \u00FCber die Reihenfolge der Angaben und \u00FCber weitere konfigurationsabh\u00E4ngige Spalten. </li></ul>
+formatexplanation.conventions=Richtlinien für Benutzername und Passwort:
import.confirm=Sie m\u00F6chten {0} Benutzer importieren. Davon ist/sind {1} neu, {2} ist/sind bereits in OLAT vorhanden. Klicken Sie auf "Fertigstellen", um {1} neue Benutzer zu importieren.
import.description0=Gef\u00FChrt von einem Wizard k\u00F6nnen Sie mehrere Benutzer auf einmal importieren. Sie ben\u00F6tigen dazu eine Liste mit durch Tabulator separierten Werten.
import.description1=Was Sie w\u00E4hrend des Wizards erwartet\:
diff --git a/src/main/java/org/olat/admin/user/imp/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/admin/user/imp/_i18n/LocalStrings_en.properties
index ff4ae9cef47..12eb5778a33 100644
--- a/src/main/java/org/olat/admin/user/imp/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/admin/user/imp/_i18n/LocalStrings_en.properties
@@ -18,6 +18,7 @@ formatexplanation.part2.cancreatepassword=User name *, password, language{0}. </
formatexplanation.part2.cannotcreatepassword=User name *, language{0}. </li>
formatexplanation.part2a=<li>You have to fill in the following fields (* is mandatory)\:
formatexplanation.part3=<li>If the field "Language" remains blank the default language of the OLAT installation will be used.</li><li>See Excel template for further information on the order of data or other columns that depend on your configuration. </li></ul>
+formatexplanation.conventions=Rules for username and password:
import.confirm=You want to import {0} users. {1} is/are new and {2} already existing. Please click on "Finish" to import {1} new users.
import.description0=A Wizard helps you to import several users at once. All you need is a list with values separated by tabulators.
import.description1=What you can expect when using this Wizard\:
--
GitLab