From e38ba1f7cf25c0f08d2ae75b72fc53cbe6d96f2c Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Sun, 25 Sep 2011 16:52:25 +0000 Subject: [PATCH] users/password.php, edit-admin.php, edit-mailbox.php, *.lang: - rename $PALANG['pPasswordTooShort'] to $PALANG['password_too_short'] *.lang: - add $PALANG['password_no_characters'] and $PALANG['password_no_digits'] (will be used by my next commit) git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1191 a1433add-5e2c-0410-b055-b7f2511e0802 --- edit-admin.php | 2 +- edit-mailbox.php | 2 +- languages/bg.lang | 4 +++- languages/ca.lang | 4 +++- languages/cn.lang | 4 +++- languages/cs.lang | 4 +++- languages/da.lang | 4 +++- languages/de.lang | 4 +++- languages/en.lang | 4 +++- languages/es.lang | 4 +++- languages/et.lang | 4 +++- languages/eu.lang | 4 +++- languages/fi.lang | 4 +++- languages/fo.lang | 4 +++- languages/fr.lang | 4 +++- languages/hr.lang | 4 +++- languages/hu.lang | 4 +++- languages/is.lang | 4 +++- languages/it.lang | 4 +++- languages/ja.lang | 4 +++- languages/lt.lang | 4 +++- languages/mk.lang | 4 +++- languages/nb.lang | 4 +++- languages/nl.lang | 4 +++- languages/nn.lang | 4 +++- languages/pl.lang | 4 +++- languages/pt-br.lang | 4 +++- languages/ru.lang | 4 +++- languages/sk.lang | 4 +++- languages/sl.lang | 4 +++- languages/sv.lang | 4 +++- languages/tr.lang | 4 +++- languages/tw.lang | 4 +++- users/password.php | 2 +- 34 files changed, 96 insertions(+), 34 deletions(-) diff --git a/edit-admin.php b/edit-admin.php index 3a988734..83eb9447 100644 --- a/edit-admin.php +++ b/edit-admin.php @@ -83,7 +83,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") } else { $error = 1; - $pAdminEdit_admin_password_text_error = sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length']); + $pAdminEdit_admin_password_text_error = sprintf($PALANG['password_too_short'], $CONF['min_password_length']); } } else { diff --git a/edit-mailbox.php b/edit-mailbox.php index 0b58d04d..2f5a5e40 100644 --- a/edit-mailbox.php +++ b/edit-mailbox.php @@ -97,7 +97,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") if($fPassword == $fPassword2) { if ($fPassword != "") { if($min_length > 0 && strlen($fPassword) < $min_length) { - $mailbox_password_text_error = sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length']); + $mailbox_password_text_error = sprintf($PALANG['password_too_short'], $CONF['min_password_length']); $error = 1; } $formvars['password'] = pacrypt($fPassword); diff --git a/languages/bg.lang b/languages/bg.lang index bbc99a00..a905956b 100644 --- a/languages/bg.lang +++ b/languages/bg.lang @@ -386,7 +386,9 @@ $PALANG['pBroadcast_error_empty'] = 'Полетата Име, Заглавие $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX -$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX diff --git a/languages/ca.lang b/languages/ca.lang index 1a3b4eac..18c53e3a 100644 --- a/languages/ca.lang +++ b/languages/ca.lang @@ -385,7 +385,9 @@ $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX -$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX diff --git a/languages/cn.lang b/languages/cn.lang index 103c3c6f..68115c0e 100644 --- a/languages/cn.lang +++ b/languages/cn.lang @@ -385,7 +385,9 @@ $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX -$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX diff --git a/languages/cs.lang b/languages/cs.lang index 9203e73e..c5dd1364 100644 --- a/languages/cs.lang +++ b/languages/cs.lang @@ -397,7 +397,9 @@ $PALANG['pBroadcast_error_empty'] = 'Pole Od, Předmět a Zpráva by neměly bý $PALANG['pStatus_undeliverable'] = 'možná NEDORUČITELNÉ '; $PALANG['pStatus_custom'] = 'Doručeno do '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; -$PALANG['pPasswordTooShort'] = "Heslo je příliš krátké - je vyžadováno minimálně %s znaků"; +$PALANG['password_too_short'] = "Heslo je příliš krátké - je vyžadováno minimálně %s znaků"; +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX diff --git a/languages/da.lang b/languages/da.lang index eb016723..f2902fbc 100644 --- a/languages/da.lang +++ b/languages/da.lang @@ -396,7 +396,9 @@ $PALANG['pStatus_undeliverable'] = 'kan måske ikke leveres '; $PALANG['pStatus_custom'] = 'Leveres til '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; -$PALANG['pPasswordTooShort'] = "Adgangskoden er for kort - mindst %s tegn kræves"; +$PALANG['password_too_short'] = "Adgangskoden er for kort - mindst %s tegn kræves"; +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX diff --git a/languages/de.lang b/languages/de.lang index 45eedbb8..554780d4 100644 --- a/languages/de.lang +++ b/languages/de.lang @@ -396,7 +396,9 @@ $PALANG['pStatus_undeliverable'] = 'möglicherweise UNZUSTELLBAR '; $PALANG['pStatus_custom'] = 'Zustellung an '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; -$PALANG['pPasswordTooShort'] = "Das Passwort ist zu kurz - mindestens %s Zeichen benötigt"; +$PALANG['password_too_short'] = "Das Passwort ist zu kurz - mindestens %s Zeichen benötigt"; +$PALANG['password_no_characters'] = "Ihr Passwort muss mindestens %s Buchstaben enthalten."; +$PALANG['password_no_digits'] = "Ihr Passwort muss mindestens %s Ziffer(n) enthalten."; $PALANG['pInvalidDomainRegex'] = "Ungültiger Domainname %s - Überprüfung per RegEx fehlgeschlagen"; $PALANG['pInvalidDomainDNS'] = "Ungültige Domain %s - nicht per DNS auflösbar"; $PALANG['pInvalidMailRegex'] = "Ungültige Mailadresse - Überprüfung per RegEx fehlgeschlagen"; diff --git a/languages/en.lang b/languages/en.lang index 2740ca69..f4228dd2 100644 --- a/languages/en.lang +++ b/languages/en.lang @@ -397,7 +397,9 @@ $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; $PALANG['pStatus_custom'] = 'Delivers to '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; -$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # usage: flash_error(sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length'])); +$PALANG['password_too_short'] = "Password is too short - requires %s characters"; +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; diff --git a/languages/es.lang b/languages/es.lang index a70e4551..a9328569 100644 --- a/languages/es.lang +++ b/languages/es.lang @@ -387,7 +387,9 @@ $PALANG['pBroadcast_error_empty'] = '¡Los campos Nombre, Asunto y Mensaje no pu $PALANG['pStatus_undeliverable'] = 'posiblemente NO SE ENTREGÓ'; $PALANG['pStatus_custom'] = 'Enviado a '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX -$PALANG['pPasswordTooShort'] = "La contraseña es demasiado corta - se necesitan %s caracteres"; +$PALANG['password_too_short'] = "La contraseña es demasiado corta - se necesitan %s caracteres"; +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "El nombre de dominio %s es inválido, no se ajusta a la expresión regular"; $PALANG['pInvalidDomainDNS'] = "El dominio %s no es válido, y/o no tiene resolución DNS"; $PALANG['pInvalidMailRegex'] = "La dirección de email no es válidas, no se ajusta a la expresión regular"; diff --git a/languages/et.lang b/languages/et.lang index 4399b826..dae4b4cf 100644 --- a/languages/et.lang +++ b/languages/et.lang @@ -389,7 +389,9 @@ $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX -$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX diff --git a/languages/eu.lang b/languages/eu.lang index 60980f4e..458ad86c 100644 --- a/languages/eu.lang +++ b/languages/eu.lang @@ -384,7 +384,9 @@ $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX -$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX diff --git a/languages/fi.lang b/languages/fi.lang index 2572c894..227deed2 100644 --- a/languages/fi.lang +++ b/languages/fi.lang @@ -385,7 +385,9 @@ $PALANG['pBroadcast_error_empty'] = 'Nimi, Aihe tai Viesti kenttien ei pidä oll $PALANG['pStatus_undeliverable'] = 'ehkä ei voida toimittaa '; $PALANG['pStatus_custom'] = 'Toimittaa osoiteeseen '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; -$PALANG['pPasswordTooShort'] = "Salasana on liian lyhyt, vaaditaan %s merkkiä"; +$PALANG['password_too_short'] = "Salasana on liian lyhyt, vaaditaan %s merkkiä"; +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "Virheellinen domain nimi %s, ei läpäise regexp testiä"; $PALANG['pInvalidDomainDNS'] = "Virheellinen domain %s ja/tai ei löydy nimipalvelimista"; $PALANG['pInvalidMailRegex'] = "Virheellinen sähköpostiosoite, ei läpäise regexp testiä"; diff --git a/languages/fo.lang b/languages/fo.lang index d76f1d32..ec71d00c 100644 --- a/languages/fo.lang +++ b/languages/fo.lang @@ -390,7 +390,9 @@ $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX -$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX diff --git a/languages/fr.lang b/languages/fr.lang index 586e0221..ee8da2d9 100644 --- a/languages/fr.lang +++ b/languages/fr.lang @@ -387,7 +387,9 @@ $PALANG['pBroadcast_error_empty'] = 'Les champs Nom, Sujet et Message ne peuvent $PALANG['pStatus_undeliverable'] = 'Non délivrable '; $PALANG['pStatus_custom'] = 'Délivré à '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; -$PALANG['pPasswordTooShort'] = "Mot de passe trop court. - %s caractères minimum"; +$PALANG['password_too_short'] = "Mot de passe trop court. - %s caractères minimum"; +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "Nom de Domaine Invalide %s, vérification regexp impossible"; $PALANG['pInvalidDomainDNS'] = "Domaine Invalide %s, et/ou non resolvable via les DNS"; $PALANG['pInvalidMailRegex'] = "Adresse email invalide, vérification regexp impossible"; diff --git a/languages/hr.lang b/languages/hr.lang index 4897f6c7..3784ca52 100644 --- a/languages/hr.lang +++ b/languages/hr.lang @@ -383,7 +383,9 @@ $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX -$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX diff --git a/languages/hu.lang b/languages/hu.lang index eee155d4..7d16a4fd 100644 --- a/languages/hu.lang +++ b/languages/hu.lang @@ -397,7 +397,9 @@ $PALANG['pStatus_undeliverable'] = 'lehet hogy nem kézbesíthető '; $PALANG['pStatus_custom'] = 'Ide kézbesítődik '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; -$PALANG['pPasswordTooShort'] = "A Jelszó túl rövid - legalább %s karakter szükséges"; +$PALANG['password_too_short'] = "A Jelszó túl rövid - legalább %s karakter szükséges"; +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX diff --git a/languages/is.lang b/languages/is.lang index 6a4dade8..d07c6c06 100644 --- a/languages/is.lang +++ b/languages/is.lang @@ -384,7 +384,9 @@ $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX -$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX diff --git a/languages/it.lang b/languages/it.lang index 3235e063..b23e1efe 100644 --- a/languages/it.lang +++ b/languages/it.lang @@ -386,7 +386,9 @@ $PALANG['pBroadcast_error_empty'] = 'Nome, oggetto e testo del messaggio non pos $PALANG['pStatus_undeliverable'] = 'presumibilmente NON CONSEGNABILE '; $PALANG['pStatus_custom'] = 'In consegna a '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; -$PALANG['pPasswordTooShort'] = "Password troppo breve - minimo %s caratteri"; +$PALANG['password_too_short'] = "Password troppo breve - minimo %s caratteri"; +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX diff --git a/languages/ja.lang b/languages/ja.lang index 95fee80c..850dbe8b 100644 --- a/languages/ja.lang +++ b/languages/ja.lang @@ -395,7 +395,9 @@ $PALANG['pStatus_undeliverable'] = 'おそらく配送不可能 '; $PALANG['pStatus_custom'] = '配送先 '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; -$PALANG['pPasswordTooShort'] = "パスワードが短すぎます。最低 %s 文字必要です。"; # usage: flash_error(sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length'])); +$PALANG['password_too_short'] = "パスワードが短すぎます。最低 %s 文字必要です。"; +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX diff --git a/languages/lt.lang b/languages/lt.lang index c147fd6c..7dc55739 100644 --- a/languages/lt.lang +++ b/languages/lt.lang @@ -385,7 +385,9 @@ $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX -$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX diff --git a/languages/mk.lang b/languages/mk.lang index 3b9f0041..ba5c5af6 100644 --- a/languages/mk.lang +++ b/languages/mk.lang @@ -386,7 +386,9 @@ $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX -$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX diff --git a/languages/nb.lang b/languages/nb.lang index c41e6bb7..333aa213 100644 --- a/languages/nb.lang +++ b/languages/nb.lang @@ -385,7 +385,9 @@ $PALANG['pBroadcast_error_empty'] = 'Feltene Ditt navn, Emne og Melding kan ikke $PALANG['pStatus_undeliverable'] = 'kan kanskje IKKE LEVERES '; $PALANG['pStatus_custom'] = 'Leverer til '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; -$PALANG['pPasswordTooShort'] = "Passordet er for kort - det må inneholde minst %s tegn"; +$PALANG['password_too_short'] = "Passordet er for kort - det må inneholde minst %s tegn"; +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "Ugyldig domenenavn %s, regexp-validering feilet"; $PALANG['pInvalidDomainDNS'] = "Ugyldig domene %s, og/eller finnes ikke i DNS"; $PALANG['pInvalidMailRegex'] = "Ugyldig e-postadresse, regexp-validering feilet"; diff --git a/languages/nl.lang b/languages/nl.lang index 567c75fa..31415fb7 100644 --- a/languages/nl.lang +++ b/languages/nl.lang @@ -387,7 +387,9 @@ $PALANG['pBroadcast_error_empty'] = 'De velden Naam, Onderwerp en Bericht mogen $PALANG['pStatus_undeliverable'] = 'Misschien niet af te leveren '; $PALANG['pStatus_custom'] = 'Bezorgen op '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; -$PALANG['pPasswordTooShort'] = "Wachtwoord is te kort - moet minimaal %s karakters bevatten"; +$PALANG['password_too_short'] = "Wachtwoord is te kort - moet minimaal %s karakters bevatten"; +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "Ongeldig domein naam %s"; $PALANG['pInvalidDomainDNS'] = "Ongeldig domein %s"; $PALANG['pInvalidMailRegex'] = "Ongeldig email adres"; diff --git a/languages/nn.lang b/languages/nn.lang index a7b3d4b4..6ff55508 100644 --- a/languages/nn.lang +++ b/languages/nn.lang @@ -382,7 +382,9 @@ $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX -$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX diff --git a/languages/pl.lang b/languages/pl.lang index 65c0a12a..4d4ca055 100644 --- a/languages/pl.lang +++ b/languages/pl.lang @@ -391,7 +391,9 @@ $PALANG['pBroadcast_error_empty'] = 'Pola Nazwa, Temat i Wiadomość nie powinny $PALANG['pStatus_undeliverable'] = 'może być NIEDOSTARCZALNA '; $PALANG['pStatus_custom'] = 'Dostarczyć do '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; -$PALANG['pPasswordTooShort'] = 'Hasło jest za krótkie - musi mieć minimum %s znaków'; +$PALANG['password_too_short'] = 'Hasło jest za krótkie - musi mieć minimum %s znaków'; +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = 'Nieprawidłowa nazwa domeny %s'; $PALANG['pInvalidDomainDNS'] = 'Nieprawidłowa domena %s, nie wykrywana w DNS'; $PALANG['pInvalidMailRegex'] = 'Nieprawidłowy adres email'; diff --git a/languages/pt-br.lang b/languages/pt-br.lang index aaa6ba95..03c9633e 100644 --- a/languages/pt-br.lang +++ b/languages/pt-br.lang @@ -397,7 +397,9 @@ $PALANG['pStatus_undeliverable'] = 'talvez NÃO-ENTREGÁVEL '; $PALANG['pStatus_custom'] = 'Envia para '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; -$PALANG['pPasswordTooShort'] = "Senha muito curta - requer %s caracteres"; # uso: flash_error(sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length'])); +$PALANG['password_too_short'] = "Senha muito curta - requer %s caracteres"; +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "Nome de domínio inválido %s, falhou checagem por expressão regular"; $PALANG['pInvalidDomainDNS'] = "Domínio inválido %s, e/ou não pôde ser resolvido por DNS"; $PALANG['pInvalidMailRegex'] = "Endereço de email inválido, falhou checagem por expressão regular"; diff --git a/languages/ru.lang b/languages/ru.lang index 3b10110e..0915464a 100644 --- a/languages/ru.lang +++ b/languages/ru.lang @@ -397,7 +397,9 @@ $PALANG['pStatus_undeliverable'] = 'возможно НЕ ДОСТАВЛЕНО ' $PALANG['pStatus_custom'] = 'Доставляется для '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; -$PALANG['pPasswordTooShort'] = "Пароль слишком короткий - требуется %s символов"; +$PALANG['password_too_short'] = "Пароль слишком короткий - требуется %s символов"; +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "Некорректное имя домена %s, не соответствует регулярному выражению"; $PALANG['pInvalidDomainDNS'] = "Некорректный домен %s, и/или не обнаруживается в DNS"; $PALANG['pInvalidMailRegex'] = "Некорректный адрес e-mail, не соответствует регулярному выражению"; diff --git a/languages/sk.lang b/languages/sk.lang index d0194f98..c8aa3761 100644 --- a/languages/sk.lang +++ b/languages/sk.lang @@ -386,7 +386,9 @@ $PALANG['pBroadcast_error_empty'] = 'Polie Vaše meno, Predmet a Obsah nemôžu $PALANG['pStatus_undeliverable'] = 'možno NEDORUČITEĽNÉ '; $PALANG['pStatus_custom'] = 'Doručuje sa na '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; -$PALANG['pPasswordTooShort'] = "Heslo je príliš krátke - musí mať aspoň %s znakov"; +$PALANG['password_too_short'] = "Heslo je príliš krátke - musí mať aspoň %s znakov"; +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "Neplatný názov domény %s"; $PALANG['pInvalidDomainDNS'] = "Neplatná doména %s alebo neexistuje jej DNS záznam"; $PALANG['pInvalidMailRegex'] = "Neplatná emailová adresa"; diff --git a/languages/sl.lang b/languages/sl.lang index d3e39328..b443f488 100644 --- a/languages/sl.lang +++ b/languages/sl.lang @@ -385,7 +385,9 @@ $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX -$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX diff --git a/languages/sv.lang b/languages/sv.lang index 6fb9dc0b..c624a14a 100644 --- a/languages/sv.lang +++ b/languages/sv.lang @@ -387,7 +387,9 @@ $PALANG['pBroadcast_error_empty'] = 'Fälten namn, ämne och meddelande skall in $PALANG['pStatus_undeliverable'] = 'kanske misslyckades leverera '; $PALANG['pStatus_custom'] = 'Levereras till '; $PALANG['pStatus_popimap'] = 'POP/IMAP '; -$PALANG['pPasswordTooShort'] = "För kort lösenord - ett lösenord på %s tecken krävs"; +$PALANG['password_too_short'] = "För kort lösenord - ett lösenord på %s tecken krävs"; +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX diff --git a/languages/tr.lang b/languages/tr.lang index 357acf69..a93a9db7 100644 --- a/languages/tr.lang +++ b/languages/tr.lang @@ -385,7 +385,9 @@ $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX -$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX diff --git a/languages/tw.lang b/languages/tw.lang index e09f9f65..14e4a344 100644 --- a/languages/tw.lang +++ b/languages/tw.lang @@ -385,7 +385,9 @@ $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should $PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX $PALANG['pStatus_custom'] = 'Delivers to '; # XXX $PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX -$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_too_short'] = "Password is too short - requires %s characters"; # XXX +$PALANG['password_no_characters'] = "Your password must contain at least %s character(s)."; # XXX +$PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX $PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX diff --git a/users/password.php b/users/password.php index 9829dd8d..d1401406 100644 --- a/users/password.php +++ b/users/password.php @@ -49,7 +49,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") $error = 0; if(strlen($fPassword) < $CONF['min_password_length']) { $error += 1; - flash_error(sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length'])); + flash_error(sprintf($PALANG['password_too_short'], $CONF['min_password_length'])); } if(!MailboxHandler::login($username, $fPassword_current)) { $error += 1;