OO-2452: wording and more focus

src/main/java/org/olat/core/commons/services/sms/ui/_i18n/LocalStrings_de.properties

@@ -16,10 +16,10 @@ reset.password=Password zur\u00FCcksetzen
 service=Dienst
 sms.phone.number=Telephon Mobil
 sms.phone.number.hint=+41 12 345 67 89
-sms.phone.number.example=Sie m\u00FCssen Ihre Telefonnummer in internationalem Format geben (+41 12 345 67 89).
+sms.phone.number.example=Sie m\u00FCssen Ihre Telefonnummer im internationalen Format angeben (+41 12 345 67 89).
 sms.token=Ihr Token ist {0}
 sms.token.number=Token
-sms.token.number.explain=Bitte geben Sie den 6 stellige Nummer ein dass Sie per SMS bekommen haben.
+sms.token.number.explain=Geben Sie den Best\u00E4tigungscode ein, den Sie per SMS erhalten haben. Falls Sie nach 1 Minute noch keine SMS erhalten haben, berprfen Sie bitte, ob Sie das korrekte internationale Nummernformat verwendet haben.
 table.header.month=Monat
 table.header.numOfMessages=SMS
 table.header.year=Jahr

src/main/java/org/olat/core/commons/services/sms/ui/_i18n/LocalStrings_en.properties

@@ -16,10 +16,10 @@ reset.password=Reset password
 service=Service
 sms.phone.number=Mobile telefon
 sms.phone.number.hint=+41 12 345 67 89
-sms.phone.number.example=You need to enter you phone number in the international format (e.g. +41 12 345 67 89).
+sms.phone.number.example=You need to enter your phone number in the international format (e.g. +41 12 345 67 89).
 sms.token=Your token is {0}
 sms.token.number=Code
-sms.token.number.explain=Please enter the 6 digit number that you received by SMS.
+sms.token.number.explain=Please enter the 6 digit number that you received by SMS. If you don't receive a SMS after 1 minute, please make sure you used the correct international number format.
 table.header.month=Month
 table.header.numOfMessages=SMS
 table.header.year=Year

src/main/java/org/olat/registration/ConfirmTokenController.java

@@ -57,6 +57,7 @@ public class ConfirmTokenController extends FormBasicController {
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		tokenEl = uifactory.addTextElement("token", "pw.change.confirm.token", 32, "", formLayout);
+		tokenEl.setFocus(true);
 		
 		FormLayoutContainer buttonsCont = FormLayoutContainer.createButtonLayout("buttons", getTranslator());
 		formLayout.add(buttonsCont);

src/main/java/org/olat/registration/EmailOrUsernameFormController.java

@@ -52,6 +52,7 @@ public class EmailOrUsernameFormController extends FormBasicController {
 	/**
 	 * @see org.olat.core.gui.components.form.flexible.impl.FormBasicController#doDispose()
 	 */
+	@Override
 	protected void doDispose() {
 	// nothing to do
 	}
@@ -59,6 +60,7 @@ public class EmailOrUsernameFormController extends FormBasicController {
 	/**
 	 * @see org.olat.core.gui.components.form.flexible.impl.FormBasicController#formOK(org.olat.core.gui.UserRequest)
 	 */
+	@Override
 	protected void formOK(UserRequest ureq) {
 		fireEvent(ureq, Event.DONE_EVENT);
 	}
@@ -80,6 +82,7 @@ public class EmailOrUsernameFormController extends FormBasicController {
 		emailOrUsername = uifactory.addTextElement("emailOrUsername", "email.or.username", -1, initialEmail, formLayout);
 		emailOrUsername.setMandatory(true);
 		emailOrUsername.setNotEmptyCheck("email.or.username.maynotbeempty");
+		emailOrUsername.setFocus(true);
 		
 		final FormLayoutContainer buttonLayout = FormLayoutContainer.createButtonLayout("button_layout", getTranslator());
 		flc.add(buttonLayout);

src/main/java/org/olat/registration/PwChangeForm.java

@@ -93,7 +93,7 @@ public class PwChangeForm extends FormBasicController {
 		// validate that both passwords are the same
 		boolean newDoesMatch = newpass1.getValue().equals(newpass2.getValue());
 		if (!newDoesMatch) {
-				newpass2.setErrorKey("form.password.error.nomatch", null);
+			newpass2.setErrorKey("form.password.error.nomatch", null);
 		}
 		return newIsValid && newDoesMatch;
 	}

src/main/java/org/olat/user/propertyhandlers/_i18n/LocalStrings_de.properties

@@ -326,7 +326,7 @@ form.name.region=Region / Kanton
 form.name.region.error.empty=Das Feld "Region / Kanton" darf nicht leer sein.
 form.name.skype=Skype ID
 form.name.skype.error.empty=Das Feld "Skype ID" darf nicht leer sein.
-form.name.smsTelMobile=SMS Telephon Mobil
+form.name.smsTelMobile=SMS Telefon Mobil
 form.name.socialSecurityNumber=Sozialversicherungsnummer
 form.name.street=Strasse
 form.name.street.error.empty=Das Feld "Strasse" darf nicht leer sein.

src/main/java/org/olat/user/propertyhandlers/ui/_i18n/LocalStrings_de.properties

@@ -34,16 +34,17 @@ upc.reset.config.baks=BAKS
 upc.defaulttranslation=Standard\u00FCbersetzung
 sms.title={0} \u00E4ndern
 sms.send=SMS Authentifizierung starten
-sms.phone.hint=Diese Nummer ist f\u00FCr SMS-Passwort zur\u00FCcksetzen.
-sms.phone.number.changed=Ihre Telefonummer wurde erforgreich gepr\u00FCft. Sie knnen jetzt Ihr Profil speichern.
+sms.phone.hint=\u00DCber diese Nummer kann das Passwort per SMS zur\u00FCckgesetzt werden.
+sms.phone.number.changed=Ihre Nummer wurde erfolgreich \u00FCberpr\u00FCft.<br>Bitte speichern Sie Ihr Profil, um den Prozess abzuschliessen.
 sms.phone.number.example=$org.olat.core.commons.services.sms.ui\:sms.phone.number.example
 sms.change.number.title=Nummer \u00E4ndern
 sms.change.number.hint=+41 12 345 67 89
-sms.change.number.descr=Die Nummer muss best\u00E4tigt werden. W\u00E4hlen Sie den untenstehenden Button um die SMS Best\u00E4tigungscode zu schicken:
+sms.change.number.descr=Die Nummer muss best\u00E4tigt werden. W\u00E4hlen Sie den unten stehenden Button, um einen SMS Code zu schicken:
 sms.phone.not.available=Kein Nummer vorhanden
-sms.change.confirm.descr=Geben Sie den Best\u00E4tigungscode ein, den Sie per SMS erhalten haben:
+sms.change.confirm.descr=$org.olat.core.commons.services.sms.ui\:sms.token.number.explain
 sms.change.confirm.token=SMS Best\u00E4tigungscode
 sms.change.confirm=SMS Code \u00FCberpr\u00FCfen
 sms.token=Ihr Best\u00E4tigungscode ist {0}
 error.sms.change.confirm.token=Invalid
-error.phone.invalid=Nummer ist nicht g\u00FCltig
+error.phone.invalid=Nummer ist nicht g\u00FCltig
\ No newline at end of file
+

src/main/java/org/olat/user/propertyhandlers/ui/_i18n/LocalStrings_en.properties

@@ -2,14 +2,14 @@
 error.phone.invalid=The number is not valid.
 error.sms.change.confirm.token=The code is not valid.
 sms.change.confirm=Enter the SMS code
-sms.change.confirm.descr=Enter the 6 digit number you received per SMS\:
+sms.change.confirm.descr=$org.olat.core.commons.services.sms.ui\:sms.token.number.explain
 sms.change.confirm.token=SMS confirmation code
 sms.change.number.descr=The number need a confirmation. Please, choose the button below to send a confirmation code by SMS\:
 sms.change.number.hint=+41 12 345 67 89
 sms.change.number.title=Change the number
 sms.phone.hint=the number is to reset your password per SMS.
 sms.phone.number.example=$org.olat.core.commons.services.sms.ui\:sms.phone.number.example
-sms.phone.number.changed=You phone was successfully checked. You can now save your profil.
+sms.phone.number.changed=Your number has been checked successfully.<br>Please save your profile to finish the process.
 sms.phone.not.available=Number not available
 sms.send=Start authentication by SMS
 sms.title=Edit {0}