aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/Controllers/userController.php4
-rw-r--r--app/i18n/cz/admin.php1
-rw-r--r--app/i18n/de/admin.php1
-rw-r--r--app/i18n/en/admin.php1
-rwxr-xr-xapp/i18n/es/admin.php1
-rw-r--r--app/i18n/fr/admin.php3
-rw-r--r--app/i18n/he/admin.php1
-rw-r--r--app/i18n/it/admin.php1
-rw-r--r--app/i18n/kr/admin.php1
-rw-r--r--app/i18n/nl/admin.php1
-rw-r--r--app/i18n/oc/admin.php1
-rw-r--r--app/i18n/pt-br/admin.php1
-rw-r--r--app/i18n/ru/admin.php1
-rw-r--r--app/i18n/sk/admin.php1
-rw-r--r--app/i18n/tr/admin.php1
-rw-r--r--app/i18n/zh-cn/admin.php1
-rw-r--r--app/views/user/details.phtml14
-rw-r--r--app/views/user/manage.phtml4
18 files changed, 38 insertions, 1 deletions
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index 3a48e65e3..7d3c010c4 100644
--- a/app/Controllers/userController.php
+++ b/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,
);
}
}
diff --git a/app/i18n/cz/admin.php b/app/i18n/cz/admin.php
index 047fb2d9a..18f7520a7 100644
--- a/app/i18n/cz/admin.php
+++ b/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
diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php
index 729f6a761..443a9b380 100644
--- a/app/i18n/de/admin.php
+++ b/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
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index 812e0293a..497a7051c 100644
--- a/app/i18n/en/admin.php
+++ b/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',
diff --git a/app/i18n/es/admin.php b/app/i18n/es/admin.php
index 5a9a3ab81..a8dcac86e 100755
--- a/app/i18n/es/admin.php
+++ b/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
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index 7bea14f35..2cf6adc89 100644
--- a/app/i18n/fr/admin.php
+++ b/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',
diff --git a/app/i18n/he/admin.php b/app/i18n/he/admin.php
index 4e83a178f..55ee9fc5d 100644
--- a/app/i18n/he/admin.php
+++ b/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
diff --git a/app/i18n/it/admin.php b/app/i18n/it/admin.php
index 6b1cf1198..7a0f2e47e 100644
--- a/app/i18n/it/admin.php
+++ b/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
diff --git a/app/i18n/kr/admin.php b/app/i18n/kr/admin.php
index e18da9b13..9c41430eb 100644
--- a/app/i18n/kr/admin.php
+++ b/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
diff --git a/app/i18n/nl/admin.php b/app/i18n/nl/admin.php
index f690dff33..b6ffee16a 100644
--- a/app/i18n/nl/admin.php
+++ b/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
diff --git a/app/i18n/oc/admin.php b/app/i18n/oc/admin.php
index e0f69eb65..f27014fca 100644
--- a/app/i18n/oc/admin.php
+++ b/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
diff --git a/app/i18n/pt-br/admin.php b/app/i18n/pt-br/admin.php
index e3cc752f6..83639c01b 100644
--- a/app/i18n/pt-br/admin.php
+++ b/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
diff --git a/app/i18n/ru/admin.php b/app/i18n/ru/admin.php
index 8c69a9425..3fcf151dd 100644
--- a/app/i18n/ru/admin.php
+++ b/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
diff --git a/app/i18n/sk/admin.php b/app/i18n/sk/admin.php
index 053999033..1e06c40b9 100644
--- a/app/i18n/sk/admin.php
+++ b/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
diff --git a/app/i18n/tr/admin.php b/app/i18n/tr/admin.php
index 36aace7b6..bb097d5e8 100644
--- a/app/i18n/tr/admin.php
+++ b/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
diff --git a/app/i18n/zh-cn/admin.php b/app/i18n/zh-cn/admin.php
index 1d7b97f38..84541e402 100644
--- a/app/i18n/zh-cn/admin.php
+++ b/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
diff --git a/app/views/user/details.phtml b/app/views/user/details.phtml
index 2e37be872..7a4687184 100644
--- a/app/views/user/details.phtml
+++ b/app/views/user/details.phtml
@@ -8,6 +8,20 @@
<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">
<?= format_number($this->details['feed_count']) ?>
diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml
index e5d5717fa..951544248 100644
--- a/app/views/user/manage.phtml
+++ b/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>
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-10 12:17:37 +0000