Add user language display

When managing users, I've added the language they selected to be able
to communicate with them with the selected language (if I know it).
It could be useful when managing a community or a paid service.

app/Controllers/userController.php

@@ -535,10 +535,14 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 		$entryDAO = FreshRSS_Factory::createEntryDao($username);
 		$databaseDAO = FreshRSS_Factory::createDatabaseDAO($username);
 
+		$userConfiguration = get_user_configuration($username);
+
 		return array(
 			'feed_count' => $feedDAO->count(),
 			'article_count' => $entryDAO->count(),
 			'database_size' => $databaseDAO->size(),
+			'language' => $userConfiguration->language,
+			'mail_login' => $userConfiguration->mail_login,
 		);
 	}
 }

app/i18n/cz/admin.php

@@ -188,6 +188,7 @@ return array(
 		'create' => 'Vytvořit nového uživatele',
 		'database_size' => 'Database size',	// TODO - Translation
 		'delete_users' => 'Delete user',	// TODO - Translation
+		'email' => 'Email address',	// TODO - Translation
 		'feed_count' => 'Feeds',	// TODO - Translation
 		'language' => 'Jazyk',
 		'list' => 'User list',	// TODO - Translation

app/i18n/de/admin.php

@@ -188,6 +188,7 @@ return array(
 		'create' => 'Neuen Benutzer erstellen',
 		'database_size' => 'Database size',	// TODO - Translation
 		'delete_users' => 'Lösche Benutzer',
+		'email' => 'Email address',	// TODO - Translation
 		'feed_count' => 'Feeds',	// TODO - Translation
 		'language' => 'Sprache',
 		'list' => 'User list',	// TODO - Translation

app/i18n/en/admin.php

@@ -188,6 +188,7 @@ return array(
 		'create' => 'Create new user',
 		'database_size' => 'Database size',
 		'delete_users' => 'Delete user',
+		'email' => 'Email address',
 		'feed_count' => 'Feeds',
 		'language' => 'Language',
 		'list' => 'User list',

app/i18n/es/admin.php

@@ -188,6 +188,7 @@ return array(
 		'create' => 'Crear nuevo usuario',
 		'database_size' => 'Database size',	// TODO - Translation
 		'delete_users' => 'Delete user',	// TODO - Translation
+		'email' => 'Email address',	// TODO - Translation
 		'feed_count' => 'Feeds',	// TODO - Translation
 		'language' => 'Idioma',
 		'list' => 'User list',	// TODO - Translation

app/i18n/fr/admin.php

@@ -183,11 +183,12 @@ return array(
 	),
 	'user' => array(
 		'articles_and_size' => '%s articles (%s)',
-		'article_count' => 'Articles',	// TODO - Translation
+		'article_count' => 'Articles',
 		'back_to_manage' => '← Revenir à la liste des utilisateurs',
 		'create' => 'Créer un nouvel utilisateur',
 		'database_size' => 'Volumétrie',
 		'delete_users' => 'Supprimer un utilisateur',
+		'email' => 'Adresse email',
 		'feed_count' => 'Flux',
 		'language' => 'Langue',
 		'list' => 'Liste des utilisateurs',

app/i18n/he/admin.php

@@ -188,6 +188,7 @@ return array(
 		'create' => 'יצירת משתמש חדש',
 		'database_size' => 'Database size',	// TODO - Translation
 		'delete_users' => 'Delete user',	// TODO - Translation
+		'email' => 'Email address',	// TODO - Translation
 		'feed_count' => 'Feeds',	// TODO - Translation
 		'language' => 'שפה',
 		'list' => 'User list',	// TODO - Translation

app/i18n/it/admin.php

@@ -188,6 +188,7 @@ return array(
 		'create' => 'Crea nuovo utente',
 		'database_size' => 'Database size',	// TODO - Translation
 		'delete_users' => 'Delete user',	// TODO - Translation
+		'email' => 'Email address',	// TODO - Translation
 		'feed_count' => 'Feeds',	// TODO - Translation
 		'language' => 'Lingua',
 		'list' => 'User list',	// TODO - Translation

app/i18n/kr/admin.php

@@ -188,6 +188,7 @@ return array(
 		'create' => '새 사용자 생성',
 		'database_size' => 'Database size',	// TODO - Translation
 		'delete_users' => '사용자 삭제',
+		'email' => 'Email address',	// TODO - Translation
 		'feed_count' => 'Feeds',	// TODO - Translation
 		'language' => '언어',
 		'list' => 'User list',	// TODO - Translation

app/i18n/nl/admin.php

@@ -188,6 +188,7 @@ return array(
 		'create' => 'Creëer nieuwe gebruiker',
 		'database_size' => 'Database size',	// TODO - Translation
 		'delete_users' => 'Verwijder gebruiker',
+		'email' => 'Email address',	// TODO - Translation
 		'feed_count' => 'Feeds',	// TODO - Translation
 		'language' => 'Taal',
 		'list' => 'User list',	// TODO - Translation

app/i18n/oc/admin.php

@@ -188,6 +188,7 @@ return array(
 		'create' => 'Crear un nòu utilizaire',
 		'database_size' => 'Database size',	// TODO - Translation
 		'delete_users' => 'Suprimir un utilizaire',
+		'email' => 'Email address',	// TODO - Translation
 		'feed_count' => 'Feeds',	// TODO - Translation
 		'language' => 'Lenga',
 		'list' => 'User list',	// TODO - Translation

app/i18n/pt-br/admin.php

@@ -188,6 +188,7 @@ return array(
 		'create' => 'Criar novo usuário',
 		'database_size' => 'Database size',	// TODO - Translation
 		'delete_users' => 'Delete user',	// TODO - Translation
+		'email' => 'Email address',	// TODO - Translation
 		'feed_count' => 'Feeds',	// TODO - Translation
 		'language' => 'Idioma',
 		'list' => 'User list',	// TODO - Translation

app/i18n/ru/admin.php

@@ -188,6 +188,7 @@ return array(
 		'create' => 'Создать нового пользователя',
 		'database_size' => 'Database size',	// TODO - Translation
 		'delete_users' => 'Delete user',	// TODO - Translation
+		'email' => 'Email address',	// TODO - Translation
 		'feed_count' => 'Feeds',	// TODO - Translation
 		'language' => 'Язык',
 		'list' => 'User list',	// TODO - Translation

app/i18n/sk/admin.php

@@ -188,6 +188,7 @@ return array(
 		'create' => 'Vytvoriť nového používateľa',
 		'database_size' => 'Database size',	// TODO - Translation
 		'delete_users' => 'Zmazať používateľa',
+		'email' => 'Email address',	// TODO - Translation
 		'feed_count' => 'Feeds',	// TODO - Translation
 		'language' => 'Jazyk',
 		'list' => 'User list',	// TODO - Translation

app/i18n/tr/admin.php

@@ -188,6 +188,7 @@ return array(
 		'create' => 'Yeni kullanıcı oluştur',
 		'database_size' => 'Database size',	// TODO - Translation
 		'delete_users' => 'Delete user',	// TODO - Translation
+		'email' => 'Email address',	// TODO - Translation
 		'feed_count' => 'Feeds',	// TODO - Translation
 		'language' => 'Dil',
 		'list' => 'User list',	// TODO - Translation

app/i18n/zh-cn/admin.php

@@ -188,6 +188,7 @@ return array(
 		'create' => '创建新用户',
 		'database_size' => 'Database size',	// TODO - Translation
 		'delete_users' => '删除用户',
+		'email' => 'Email address',	// TODO - Translation
 		'feed_count' => 'Feeds',	// TODO - Translation
 		'language' => '语言',
 		'list' => 'User list',	// TODO - Translation

app/views/user/details.phtml

@@ -7,6 +7,20 @@
     <form method="post" action="<?= _url('user', 'manage', 'username', $this->username); ?>">
         <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken(); ?>" />
 
+        <div class="form-group">
+            <label class="group-name"><?= _t('admin.user.email') ?></label>
+            <div class="group-controls">
+                <?= $this->details['mail_login'] ?>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label class="group-name"><?= _t('admin.user.language') ?></label>
+            <div class="group-controls">
+                <?= _t("gen.lang.{$this->details['language']}") ?>
+            </div>
+        </div>
+
         <div class="form-group">
             <label class="group-name"><?= _t('admin.user.feed_count') ?></label>
             <div class="group-controls">

app/views/user/manage.phtml

@@ -62,6 +62,8 @@
 		<thead>
 			<tr>
 				<th><?= _t('admin.user.username') ?></th>
+				<th><?= _t('admin.user.email') ?></th>
+				<th><?= _t('admin.user.language') ?></th>
 				<th><?= _t('admin.user.feed_count') ?></th>
 				<th><?= _t('admin.user.article_count') ?></th>
 				<th><?= _t('admin.user.database_size') ?></th>
@@ -72,6 +74,8 @@
 			<?php foreach ($this->users as $username => $values) : ?>
 				<tr>
 					<td><?= $username ?></td>
+					<td><?= $values['mail_login'] ?></td>
+					<td><?= _t("gen.lang.{$values['language']}") ?></td>
 					<td><?= format_number($values['feed_count']) ?></td>
 					<td><?= format_number($values['article_count']) ?></td>
 					<td><?= format_bytes($values['database_size']) ?></td>

cli/i18n/ignore/fr.php

@@ -3,6 +3,7 @@
 return array(
 	'admin.extensions.title',
 	'admin.stats.number_entries',
+	'admin.user.article_count',
 	'admin.user.articles_and_size',
 	'conf.display.width.large',
 	'conf.sharing.blogotext',