Password format on profile and manage user pages

Related to https://github.com/FreshRSS/FreshRSS/commit/ec75139939780810f43f4e85fbf37de2409fe584
See https://github.com/FreshRSS/FreshRSS/issues/769

9 files changed, 9 insertions, 1 deletions

diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php
index 597c653ff..bcd0fcc61 100644
--- a/app/i18n/de/admin.php
+++ b/app/i18n/de/admin.php
@@ -161,6 +161,7 @@ return array(
 		'email_persona' => 'Anmelde-E-Mail-Adresse<br /><small>(für <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'language' => 'Sprache',
 		'password_form' => 'Passwort<br /><small>(für die Anmeldemethode per Webformular)</small>',
+		'password_format' => 'mindestens 7 Zeichen',
 		'title' => 'Benutzer verwalten',
 		'user_list' => 'Liste der Benutzer',
 		'username' => 'Nutzername',
diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php
index 46816c25b..64c2c0945 100644
--- a/app/i18n/de/conf.php
+++ b/app/i18n/de/conf.php
@@ -75,6 +75,7 @@ return array(
 		'email_persona' => 'Anmelde-E-Mail-Adresse<br /><small>(für <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'password_api' => 'Passwort-API<br /><small>(z. B. für mobile Anwendungen)</small>',
 		'password_form' => 'Passwort<br /><small>(für die Anmeldemethode per Webformular)</small>',
+		'password_format' => 'mindestens 7 Zeichen',
 		'title' => 'Profil',
 	),
 	'reading' => array(
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index 947d0e6c7..d2fcd3e82 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -161,6 +161,7 @@ return array(
 		'email_persona' => 'Login mail address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'language' => 'Language',
 		'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
+		'password_format' => 'At least 7 characters',
 		'title' => 'Manage users',
 		'user_list' => 'List of users',
 		'username' => 'Username',
diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php
index 13efb650b..308c45d2c 100644
--- a/app/i18n/en/conf.php
+++ b/app/i18n/en/conf.php
@@ -75,6 +75,7 @@ return array(
 		'email_persona' => 'Login mail address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'password_api' => 'Password API<br /><small>(e.g., for mobile apps)</small>',
 		'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
+		'password_format' => 'At least 7 characters',
 		'title' => 'Profile',
 	),
 	'reading' => array(
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index 980f1fccf..b740bd0d2 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -161,6 +161,7 @@ return array(
 		'email_persona' => 'Adresse courriel de connexion<br /><small>(pour <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'language' => 'Langue',
 		'password_form' => 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
+		'password_format' => '7 caractères minimum',
 		'title' => 'Gestion des utilisateurs',
 		'user_list' => 'Liste des utilisateurs',
 		'username' => 'Nom d’utilisateur',
diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.php
index e91aeb66a..d38445b99 100644
--- a/app/i18n/fr/conf.php
+++ b/app/i18n/fr/conf.php
@@ -75,6 +75,7 @@ return array(
 		'email_persona' => 'Adresse courriel de connexion<br /><small>(pour <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
 		'password_api' => 'Mot de passe API<br /><small>(ex. : pour applis mobiles)</small>',
 		'password_form' => 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
+		'password_format' => '7 caractères minimum',
 		'title' => 'Profil',
 	),
 	'reading' => array(
diff --git a/app/i18n/fr/install.php b/app/i18n/fr/install.php
index 1aa4854ef..245a20c56 100644
--- a/app/i18n/fr/install.php
+++ b/app/i18n/fr/install.php
@@ -12,7 +12,7 @@ return array(
 		'http' => 'HTTP (pour utilisateurs avancés avec HTTPS)',
 		'none' => 'Aucune (dangereux)',
 		'password_form' => 'Mot de passe<br /><small>(pour connexion par formulaire)</small>',
-		'password_format' => 'Minimum 7 caractères',
+		'password_format' => '7 caractères minimum',
 		'persona' => 'Mozilla Persona (moderne, requiert JavaScript)',
 		'type' => 'Méthode d’authentification',
 	),
diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml
index 11562093e..fe1b6618b 100644
--- a/app/views/user/manage.phtml
+++ b/app/views/user/manage.phtml
@@ -32,6 +32,7 @@
 					<input type="password" id="new_user_passwordPlain" name="new_user_passwordPlain" autocomplete="off" pattern=".{7,}" />
 					<a class="btn toggle-password" data-toggle="new_user_passwordPlain"><?php echo _i('key'); ?></a>
 				</div>
+				<?php echo _i('help'); ?> <?php echo _t('admin.user.password_format'); ?>
 				<noscript><b><?php echo _t('gen.js.should_be_activated'); ?></b></noscript>
 			</div>
 		</div>
diff --git a/app/views/user/profile.phtml b/app/views/user/profile.phtml
index 4e61664bc..c44202edd 100644
--- a/app/views/user/profile.phtml
+++ b/app/views/user/profile.phtml
@@ -24,6 +24,7 @@
 					<input type="password" id="passwordPlain" name="passwordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/>
 					<a class="btn toggle-password" data-toggle="passwordPlain"><?php echo _i('key'); ?></a>
 				</div>
+				<?php echo _i('help'); ?> <?php echo _t('conf.profile.password_format'); ?>
 				<noscript><b><?php echo _t('gen.js.should_be_activated'); ?></b></noscript>
 			</div>
 		</div>