From b38dd6f31add4bdad10aa246cb277d17f43b211a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Duval?= Date: Mon, 14 Oct 2019 10:16:38 +0000 Subject: [PATCH 1/8] Update htdocs/code.js --- htdocs/code.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/code.js b/htdocs/code.js index 727c07a..75bcbfc 100644 --- a/htdocs/code.js +++ b/htdocs/code.js @@ -179,8 +179,10 @@ $(document).ready(function() document.getElementById('btn').disabled = true; var isInError = false; var username = $("#username").val().trim(); - if( !/^[A-Za-z0-9_\-\.]{3,30}$/.test(username)) { - var message = getStr('error_invalid_username'); + if( !/^[a-z0-9_\-\.]{3,30}$/.test(username)) { + if (/^[A-Za-z0-9_\-\.]{3,30}$/.test(username)) + var message = getStr('error_invalid_username_upcase'); else + var message = getStr('error_invalid_username'); message = message.replace("@@@username@@@",username); showError('unet',message,'usernamerror'); isInError = true; -- GitLab From 107f2d750216ad00381ef718e1ea0457f716ce71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Duval?= Date: Mon, 14 Oct 2019 10:20:51 +0000 Subject: [PATCH 2/8] Update htdocs/code.js --- htdocs/code.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/htdocs/code.js b/htdocs/code.js index 75bcbfc..437c76d 100644 --- a/htdocs/code.js +++ b/htdocs/code.js @@ -180,9 +180,7 @@ $(document).ready(function() var isInError = false; var username = $("#username").val().trim(); if( !/^[a-z0-9_\-\.]{3,30}$/.test(username)) { - if (/^[A-Za-z0-9_\-\.]{3,30}$/.test(username)) - var message = getStr('error_invalid_username_upcase'); else - var message = getStr('error_invalid_username'); + var message = getStr('error_invalid_username'); message = message.replace("@@@username@@@",username); showError('unet',message,'usernamerror'); isInError = true; -- GitLab From 7e63e746260270eb3ed79b3df5dfe7dcbd9b4b19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Duval?= Date: Tue, 15 Oct 2019 14:55:49 +0000 Subject: [PATCH 3/8] Update de.strings --- htdocs/langs/de.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/de.strings b/htdocs/langs/de.strings index c355f1b..e5ecfbd 100644 --- a/htdocs/langs/de.strings +++ b/htdocs/langs/de.strings @@ -9,7 +9,7 @@ form_placeholder_username_short ===== max.mustermann form_label_password ===== Passwort eingeben form_label_repassword ===== Passwort wiederholen form_label_button ===== Los! -error_invalid_username ===== Ungültiger Benutzername "@@@username@@@".
Länge: 3 bis 30, erlaubte Zeichen: a-z, A-Z ,0-9, _, -, . +error_invalid_username ===== Ungültiger Benutzername "@@@username@@@".
Länge: 3 bis 30, erlaubte Zeichen: a-z,0-9, _, -, . error_invalid_displayname ===== Ungültiger Anzeigename "@@@username@@@".
Länge: 3 bis 30 error_incorrect_pw_length ===== Falsche Passwortlänge. Länge: 5 bis 32 error_pw_mismatch ===== Die Passwörter stimmen nicht überein -- GitLab From 8e02a98cb16a7329dde522ee67e0d25cdc9bdf6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Duval?= Date: Tue, 15 Oct 2019 14:56:14 +0000 Subject: [PATCH 4/8] Update es.strings --- htdocs/langs/es.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/es.strings b/htdocs/langs/es.strings index 0bc627c..0c6443f 100644 --- a/htdocs/langs/es.strings +++ b/htdocs/langs/es.strings @@ -9,7 +9,7 @@ form_placeholder_username_short ===== john.doe form_label_password ===== Ingresar contraseña form_label_repassword ===== Repite contraseña form_label_button ===== ¡Vamós! -error_invalid_username ===== Nombre de usuario inválido "@@username@@@". Longitud: de 3 a 30, caracteres permitidos: a-z, A-Z, 0-9, _, -, . +error_invalid_username ===== Nombre de usuario inválido "@@username@@@". Longitud: de 3 a 30, caracteres permitidos: a-z, 0-9, _, -, . error_invalid_displayname ===== Visualización de Nombre inválida "@@@username@@@".
Longitud: de 3 a 30 error_incorrect_pw_length ===== Longitud de contraseña incorrecta: la longitud requerida es de 5 a 32 error_pw_mismatch ===== Las contraseñas no coinciden -- GitLab From 70d083a79bdd84f718af708a720c9be67798ef68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Duval?= Date: Tue, 15 Oct 2019 14:56:42 +0000 Subject: [PATCH 5/8] Update de.strings --- htdocs/langs/de.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/de.strings b/htdocs/langs/de.strings index e5ecfbd..29ac85f 100644 --- a/htdocs/langs/de.strings +++ b/htdocs/langs/de.strings @@ -9,7 +9,7 @@ form_placeholder_username_short ===== max.mustermann form_label_password ===== Passwort eingeben form_label_repassword ===== Passwort wiederholen form_label_button ===== Los! -error_invalid_username ===== Ungültiger Benutzername "@@@username@@@".
Länge: 3 bis 30, erlaubte Zeichen: a-z,0-9, _, -, . +error_invalid_username ===== Ungültiger Benutzername "@@@username@@@".
Länge: 3 bis 30, erlaubte Zeichen: a-z, 0-9, _, -, . error_invalid_displayname ===== Ungültiger Anzeigename "@@@username@@@".
Länge: 3 bis 30 error_incorrect_pw_length ===== Falsche Passwortlänge. Länge: 5 bis 32 error_pw_mismatch ===== Die Passwörter stimmen nicht überein -- GitLab From 618d7c1be9586f672965b3edda86135ba8058138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Duval?= Date: Tue, 15 Oct 2019 14:57:00 +0000 Subject: [PATCH 6/8] Update en.strings --- htdocs/langs/en.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/en.strings b/htdocs/langs/en.strings index f7e3e5b..50aaa62 100644 --- a/htdocs/langs/en.strings +++ b/htdocs/langs/en.strings @@ -9,7 +9,7 @@ form_placeholder_username_short ===== john.doe form_label_password ===== Enter password form_label_repassword ===== Repeat password form_label_button ===== Go! -error_invalid_username ===== Invalid username "@@@username@@@".
Length: 3 to 30, allowed chars: a-z,0-9, _, -, . +error_invalid_username ===== Invalid username "@@@username@@@".
Length: 3 to 30, allowed chars: a-z, 0-9, _, -, . error_invalid_displayname ===== Invalid display name "@@@username@@@".
Length: 3 to 30 error_incorrect_pw_length ===== Incorrect password length: Required length is 5 to 32 error_pw_mismatch ===== Passwords do not match -- GitLab From 5349dde4b75f34eb534ff82bf4c81b04bf7bf9fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Duval?= Date: Tue, 15 Oct 2019 14:57:29 +0000 Subject: [PATCH 7/8] Update fr.strings --- htdocs/langs/fr.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/fr.strings b/htdocs/langs/fr.strings index d6bce26..18f707d 100644 --- a/htdocs/langs/fr.strings +++ b/htdocs/langs/fr.strings @@ -9,7 +9,7 @@ form_placeholder_username_short ===== jean.dupont form_label_password ===== Entrez votre mot de passe form_label_repassword ===== Répétez votre mot de passe form_label_button ===== Valider ! -error_invalid_username ===== Nom d’utilisateur invalide "@@@username@@@".
Longueur : 3 à 30, caractères autorisés: a-z, A-Z ,0-9, _, -, . +error_invalid_username ===== Nom d’utilisateur invalide "@@@username@@@".
Longueur : 3 à 30, caractères autorisés: a-z, 0-9, _, -, . error_invalid_displayname ===== Nom d’affichage invalide "@@@username@@@".
Longueur : 3 à 30 error_incorrect_pw_length ===== Longueur de mot de passe incorrecte : Requiert une longueur de 5 à 32 caractères error_pw_mismatch ===== Les mots de passes ne sont pas identiques -- GitLab From da195272701347b9683c9a249f160f322d4fb061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Duval?= Date: Tue, 15 Oct 2019 14:57:58 +0000 Subject: [PATCH 8/8] Update it.strings --- htdocs/langs/it.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/it.strings b/htdocs/langs/it.strings index d53853c..9df2067 100644 --- a/htdocs/langs/it.strings +++ b/htdocs/langs/it.strings @@ -9,7 +9,7 @@ form_placeholder_username_short ===== mario.rossi form_label_password ===== Inserisci la password form_label_repassword ===== Ripeti la password form_label_button ===== Crea! -error_invalid_username ===== Nome utente "@@@username@@@" non valido.
Lunghezza: da 3 a 30, caratteri consentiti: a-z, A-Z ,0-9, _, -, . +error_invalid_username ===== Nome utente "@@@username@@@" non valido.
Lunghezza: da 3 a 30, caratteri consentiti: a-z, 0-9, _, -, . error_invalid_displayname ===== Nome visualizzato "@@@username@@@" non valido.
Lunghezza: da 3 a 30 error_incorrect_pw_length ===== Password non valida: si richiede una lunghezza compresa tra 5 e 32 error_pw_mismatch ===== Le password non combaciano -- GitLab