From de2e221aca0639c45cfe30f049ec71a493b17a5c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Jul 2015 22:04:33 +0200
Subject: Fix translations

See https://github.com/FreshRSS/FreshRSS/issues/679
---
 app/i18n/fr/gen.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'app/i18n/fr/gen.php')

diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index c81e57bf7..3336b6a03 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -21,12 +21,17 @@ return array(
 		'truncate' => 'Supprimer tous les articles',
 	),
 	'auth' => array(
+		'email' => 'Adresse courriel',
 		'keep_logged_in' => 'Rester connecté <small>(1 mois)</small>',
 		'login' => 'Connexion',
 		'login_persona' => 'Connexion avec Persona',
 		'login_persona_problem' => 'Problème de connexion à Persona ?',
 		'logout' => 'Déconnexion',
 		'password' => 'Mot de passe',
+		'registration' => array(
+			'_' => 'Nouveau compte',
+			'ask' => 'Créer un compte ?',
+		),
 		'reset' => 'Réinitialisation de l’authentification',
 		'username' => 'Nom d’utilisateur',
 		'username_admin' => 'Nom d’utilisateur administrateur',
-- 
cgit v1.2.3


From 669c41114f60a5a31253bed766f52e1840e00599 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Jul 2015 22:28:21 +0200
Subject: Show indications for username and password formats

See https://github.com/FreshRSS/FreshRSS/issues/679
---
 app/i18n/cz/gen.php           | 12 +++++++++---
 app/i18n/de/gen.php           | 12 +++++++++---
 app/i18n/en/gen.php           | 12 +++++++++---
 app/i18n/fr/gen.php           | 12 +++++++++---
 app/views/auth/register.phtml |  9 ++-------
 app/views/auth/reset.phtml    |  2 +-
 6 files changed, 39 insertions(+), 20 deletions(-)

(limited to 'app/i18n/fr/gen.php')

diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index 13e0db261..a89bf6b49 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -27,14 +27,20 @@ return array(
 		'login_persona' => 'Přihlášení pomocí Persona',
 		'login_persona_problem' => 'Problém s připojením k Persona?',
 		'logout' => 'Odhlášení',
-		'password' => 'Heslo',
+		'password' =>  array(
+			'_' => 'Heslo',
+			'format' => '<small>Alespoň 7 znaků</small>',
+		),
 		'registration' => array(
 			'_' => 'New account',  // TODO: translate
 			'ask' => 'Create an account?',  // TODO: translate
 		),
 		'reset' => 'Reset přihlášení',
-		'username' => 'Uživatel',
-		'username_admin' => 'Název administrátorského účtu',
+		'username' => array(
+			'_' => 'Uživatel',
+			'admin' => 'Název administrátorského účtu',
+			'format' => '<small>maximálně 16 alfanumerických znaků</small>',
+		),
 		'will_reset' => 'Přihlašovací systém bude vyresetován: místo sytému Persona bude použito přihlášení formulářem.',
 	),
 	'date' => array(
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index 9682a4a21..d6fcfe1e4 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -27,14 +27,20 @@ return array(
 		'login_persona' => 'Anmelden mit Persona',
 		'login_persona_problem' => 'Verbindungsproblem mit Persona?',
 		'logout' => 'Abmelden',
-		'password' => 'Passwort',
+		'password' => array(
+			'_' => 'Passwort',
+			'format' => '<small>mindestens 7 Zeichen</small>',
+		),
 		'registration' => array(
 			'_' => 'New account',  // TODO: translate
 			'ask' => 'Create an account?',  // TODO: translate
 		),
 		'reset' => 'Zurücksetzen der Authentifizierung',
-		'username' => 'Nutzername',
-		'username_admin' => 'Administrator-Nutzername',
+		'username' => array(
+			'_' => 'Nutzername',
+			'admin' => 'Administrator-Nutzername',
+			'format' => '<small>maximal 16 alphanumerische Zeichen</small>',
+		),
 		'will_reset' => 'Authentifikationssystem wird zurückgesetzt: ein Formular wird anstelle von Persona benutzt.',
 	),
 	'date' => array(
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index ac55a1a3b..063322cbf 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -27,14 +27,20 @@ return array(
 		'login_persona' => 'Login with Persona',
 		'login_persona_problem' => 'Connection problem with Persona?',
 		'logout' => 'Logout',
-		'password' => 'Password',
+		'password' => array(
+			'_' => 'Password',
+			'format' => '<small>At least 7 characters</small>',
+		),
 		'registration' => array(
 			'_' => 'New account',
 			'ask' => 'Create an account?',
 		),
 		'reset' => 'Authentication reset',
-		'username' => 'Username',
-		'username_admin' => 'Administrator username',
+		'username' => array(
+			'_' => 'Username',
+			'admin' => 'Administrator username',
+			'format' => '<small>maximum 16 alphanumeric characters</small>',
+		),
 		'will_reset' => 'Authentication system will be reset: a form will be used instead of Persona.',
 	),
 	'date' => array(
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 3336b6a03..5abc7a27b 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -27,14 +27,20 @@ return array(
 		'login_persona' => 'Connexion avec Persona',
 		'login_persona_problem' => 'Problème de connexion à Persona ?',
 		'logout' => 'Déconnexion',
-		'password' => 'Mot de passe',
+		'password' => array(
+			'_' => 'Mot de passe',
+			'format' => '<small>7 caractères minimum</small>',
+		),
 		'registration' => array(
 			'_' => 'Nouveau compte',
 			'ask' => 'Créer un compte ?',
 		),
 		'reset' => 'Réinitialisation de l’authentification',
-		'username' => 'Nom d’utilisateur',
-		'username_admin' => 'Nom d’utilisateur administrateur',
+		'username' => array(
+			'_' => 'Nom d’utilisateur',
+			'admin' => 'Nom d’utilisateur administrateur',
+			'format' => '<small>16 caractères alphanumériques maximum</small>',
+		),
 		'will_reset' => 'Le système d’authentification va être réinitialisé : un formulaire sera utilisé à la place de Persona.',
 	),
 	'date' => array(
diff --git a/app/views/auth/register.phtml b/app/views/auth/register.phtml
index ada654b15..306679601 100644
--- a/app/views/auth/register.phtml
+++ b/app/views/auth/register.phtml
@@ -1,19 +1,14 @@
-<?php
-    /* TODO list
-     *   - Show help for username and password formats
-    */
-?>
 <div class="prompt">
     <h1><?php echo _t('gen.auth.registration'); ?></h1>
 
     <form method="post" action="<?php echo _url('user', 'create'); ?>">
         <div>
-            <label class="group-name" for="new_user_name"><?php echo _t('gen.auth.username'); ?></label>
+            <label class="group-name" for="new_user_name"><?php echo _t('gen.auth.username'), '<br />', _i('help'), ' ', _t('gen.auth.username.format'); ?></label>
             <input id="new_user_name" name="new_user_name" type="text" size="16" required="required" maxlength="16" autocomplete="off" pattern="[0-9a-zA-Z]{1,16}" />
         </div>
 
         <div>
-            <label class="group-name" for="new_user_passwordPlain"><?php echo _t('gen.auth.password'); ?></label>
+            <label class="group-name" for="new_user_passwordPlain"><?php echo _t('gen.auth.password'), '<br />', _i('help'), ' ', _t('gen.auth.password.format'); ?></label>
             <div class="stick">
                 <input type="password" id="new_user_passwordPlain" name="new_user_passwordPlain" required="required" autocomplete="off" pattern=".{7,}" />
                 <a class="btn toggle-password" data-toggle="new_user_passwordPlain"><?php echo _i('key'); ?></a>
diff --git a/app/views/auth/reset.phtml b/app/views/auth/reset.phtml
index 6e9816ad3..9c820c7c8 100644
--- a/app/views/auth/reset.phtml
+++ b/app/views/auth/reset.phtml
@@ -16,7 +16,7 @@
 		</p>
 
 		<div>
-			<label for="username"><?php echo _t('gen.auth.username_admin'); ?></label>
+			<label for="username"><?php echo _t('gen.auth.username.admin'); ?></label>
 			<input type="text" id="username" name="username" size="16" required="required" maxlength="16" pattern="[0-9a-zA-Z]{1,16}" autofocus="autofocus" />
 		</div>
 		<div>
-- 
cgit v1.2.3


From f0a1b26584787e173c8c9cd1a5fea27bb3044f1c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Jul 2015 23:06:46 +0200
Subject: Add title to the account creation page

See https://github.com/FreshRSS/FreshRSS/issues/679
---
 app/Controllers/authController.php | 2 ++
 app/i18n/cz/gen.php                | 1 +
 app/i18n/de/gen.php                | 1 +
 app/i18n/en/gen.php                | 1 +
 app/i18n/fr/gen.php                | 1 +
 5 files changed, 6 insertions(+)

(limited to 'app/i18n/fr/gen.php')

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index 223282afb..aff184263 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -354,5 +354,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
 		if (max_registrations_reached()) {
 			Minz_Error::error(403);
 		}
+
+		Minz_View::prependTitle(_t('gen.auth.registration.title') . ' · ');
 	}
 }
diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index a89bf6b49..53127998f 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -34,6 +34,7 @@ return array(
 		'registration' => array(
 			'_' => 'New account',  // TODO: translate
 			'ask' => 'Create an account?',  // TODO: translate
+			'title' => 'Account creation',  // TODO: translate
 		),
 		'reset' => 'Reset přihlášení',
 		'username' => array(
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index d6fcfe1e4..f8f4823a6 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -34,6 +34,7 @@ return array(
 		'registration' => array(
 			'_' => 'New account',  // TODO: translate
 			'ask' => 'Create an account?',  // TODO: translate
+			'title' => 'Account creation',  // TODO: translate
 		),
 		'reset' => 'Zurücksetzen der Authentifizierung',
 		'username' => array(
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 063322cbf..1feb8d6ac 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -34,6 +34,7 @@ return array(
 		'registration' => array(
 			'_' => 'New account',
 			'ask' => 'Create an account?',
+			'title' => 'Account creation',
 		),
 		'reset' => 'Authentication reset',
 		'username' => array(
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 5abc7a27b..67d278be4 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -34,6 +34,7 @@ return array(
 		'registration' => array(
 			'_' => 'Nouveau compte',
 			'ask' => 'Créer un compte ?',
+			'title' => 'Création de compte',
 		),
 		'reset' => 'Réinitialisation de l’authentification',
 		'username' => array(
-- 
cgit v1.2.3