aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/Controllers/extensionController.php30
-rw-r--r--app/i18n/en/admin.php5
-rw-r--r--app/i18n/en/feedback.php8
-rw-r--r--app/i18n/en/gen.php7
-rw-r--r--app/i18n/fr/admin.php5
-rw-r--r--app/i18n/fr/feedback.php8
-rw-r--r--app/i18n/fr/gen.php7
-rw-r--r--app/views/extension/index.phtml8
8 files changed, 64 insertions, 14 deletions
diff --git a/app/Controllers/extensionController.php b/app/Controllers/extensionController.php
index 543398b05..35b001094 100644
--- a/app/Controllers/extensionController.php
+++ b/app/Controllers/extensionController.php
@@ -45,11 +45,13 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
$ext = Minz_ExtensionManager::find_extension($ext_name);
if (is_null($ext)) {
- Minz_Request::bad('feedback.extensions.not_found', $url_redirect);
+ Minz_Request::bad(_t('feedback.extensions.not_found', $ext_name),
+ $url_redirect);
}
if ($ext->is_enabled()) {
- Minz_Request::bad('feedback.extensions.already_enabled', $url_redirect);
+ Minz_Request::bad(_t('feedback.extensions.already_enabled', $ext_name),
+ $url_redirect);
}
if ($ext->getType() === 'system' && FreshRSS_Auth::hasAccess('admin')) {
@@ -58,16 +60,19 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
Minz_Configuration::addExtension($ext_name);
Minz_Configuration::writeFile();
- Minz_Request::good('feedback.extensions.enabled', $url_redirect);
+ Minz_Request::good(_t('feedback.extensions.enabled', $ext_name),
+ $url_redirect);
} elseif ($ext->getType() === 'user') {
$ext->install();
FreshRSS_Context::$conf->addExtension($ext_name);
FreshRSS_Context::$conf->save();
- Minz_Request::good('feedback.extensions.enabled', $url_redirect);
+ Minz_Request::good(_t('feedback.extensions.enabled', $ext_name),
+ $url_redirect);
} else {
- Minz_Request::bad('feedback.extensions.no_access', $url_redirect);
+ Minz_Request::bad(_t('feedback.extensions.no_access', $ext_name),
+ $url_redirect);
}
}
@@ -90,11 +95,13 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
$ext = Minz_ExtensionManager::find_extension($ext_name);
if (is_null($ext)) {
- Minz_Request::bad('feedback.extensions.not_found', $url_redirect);
+ Minz_Request::bad(_t('feedback.extensions.not_found', $ext_name),
+ $url_redirect);
}
if (!$ext->is_enabled()) {
- Minz_Request::bad('feedback.extensions.not_enabled', $url_redirect);
+ Minz_Request::bad(_t('feedback.extensions.not_enabled', $ext_name),
+ $url_redirect);
}
if ($ext->getType() === 'system' && FreshRSS_Auth::hasAccess('admin')) {
@@ -103,16 +110,19 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
Minz_Configuration::removeExtension($ext_name);
Minz_Configuration::writeFile();
- Minz_Request::good('feedback.extensions.disabled', $url_redirect);
+ Minz_Request::good(_t('feedback.extensions.disabled', $ext_name),
+ $url_redirect);
} elseif ($ext->getType() === 'user') {
$ext->uninstall();
FreshRSS_Context::$conf->removeExtension($ext_name);
FreshRSS_Context::$conf->save();
- Minz_Request::good('feedback.extensions.disabled', $url_redirect);
+ Minz_Request::good(_t('feedback.extensions.disabled', $ext_name),
+ $url_redirect);
} else {
- Minz_Request::bad('feedback.extensions.no_access', $url_redirect);
+ Minz_Request::bad(_t('feedback.extensions.no_access', $ext_name),
+ $url_redirect);
}
}
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index 74f01ae06..d73775d96 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -86,6 +86,11 @@ return array(
'ok' => 'You have ZIP extension.',
),
),
+ 'extensions' => array(
+ 'empty_list' => 'There is no installed extension',
+ 'system' => 'System extension (you have no rights on it)',
+ 'title' => 'Extensions',
+ ),
'users' => array(
'articles_and_size' => '%s articles (%s)',
),
diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php
index b3866f1dc..df1dc5725 100644
--- a/app/i18n/en/feedback.php
+++ b/app/i18n/en/feedback.php
@@ -1,6 +1,14 @@
<?php
return array(
+ 'extensions' => array(
+ 'already_enabled' => '%s is already enabled',
+ 'disabled' => '%s is now disabled',
+ 'enabled' => '%s is now enabled',
+ 'no_access' => 'You have no access on %s',
+ 'not_enabled' => '%s is not enabled yet',
+ 'not_found' => '%s does not exist',
+ ),
'login' => array(
'error' => 'Login is invalid',
'success' => 'You are connected',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 9e06357bc..ba5f0c86d 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -190,10 +190,17 @@ return array(
'freshrss_installation' => 'Installation · FreshRSS',
'fri' => 'Fri',
'g+' => 'Google+',
+ 'actions' => array(
+ 'disable' => 'Disable',
+ 'enable' => 'Enable',
+ 'manage' => 'Manage',
+ 'remove' => 'Remove',
+ ),
'menu' => array(
'admin' => 'Administration',
'authentication' => 'Authentication',
'check_install' => 'Installation checking',
+ 'extensions' => 'Extensions',
'user_management' => 'Manage users',
'user_profile' => 'Profile',
),
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index ad1fae6c0..e46a5a7b0 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -86,6 +86,11 @@ return array(
'ok' => 'Vous disposez de l\'extension ZIP.',
),
),
+ 'extensions' => array(
+ 'empty_list' => 'Il n’y a aucune extension installée.',
+ 'system' => 'Extension système (vous n’avez aucun droit dessus)',
+ 'title' => 'Extensions',
+ ),
'users' => array(
'articles_and_size' => '%s articles (%s)',
),
diff --git a/app/i18n/fr/feedback.php b/app/i18n/fr/feedback.php
index f4bb7cccf..7d3ab9db7 100644
--- a/app/i18n/fr/feedback.php
+++ b/app/i18n/fr/feedback.php
@@ -1,6 +1,14 @@
<?php
return array(
+ 'extensions' => array(
+ 'already_enabled' => '%s est déjà activée',
+ 'disabled' => '%s est désormais désactivée',
+ 'enabled' => '%s est désormais activée',
+ 'no_access' => 'Vous n’avez aucun accès sur %s',
+ 'not_enabled' => '%s n’est pas encore activée',
+ 'not_found' => '%s n’existe pas',
+ ),
'login' => array(
'error' => 'L’identifiant est invalide !',
'success' => 'Vous êtes désormais connecté',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 0b2395bd0..44d8fb837 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -191,10 +191,17 @@ return array(
'freshrss_installation' => 'Installation · FreshRSS',
'fri' => 'ven.',
'g+' => 'Google+',
+ 'actions' => array(
+ 'disable' => 'Désactiver',
+ 'enable' => 'Activer',
+ 'manage' => 'Gérer',
+ 'remove' => 'Supprimer',
+ ),
'menu' => array(
'admin' => 'Administration',
'authentication' => 'Authentification',
'check_install' => 'Vérification de l’installation',
+ 'extensions' => 'Extensions',
'user_management' => 'Gestion des utilisateurs',
'user_profile' => 'Profil',
),
diff --git a/app/views/extension/index.phtml b/app/views/extension/index.phtml
index 142ee4bc2..d34a84452 100644
--- a/app/views/extension/index.phtml
+++ b/app/views/extension/index.phtml
@@ -13,14 +13,14 @@
<?php if ($ext->getType() === 'user' || FreshRSS_Auth::hasAccess('admin')) { ?>
<?php $name_encoded = urlencode($ext->getName()); ?>
<div class="stick">
- <a class="btn open-slider" href="<?php echo _url('extension', 'configure', 'e', $name_encoded); ?>"><?php echo _i('configure'); ?> <?php echo _t('admin.extensions.manage'); ?></a>
+ <a class="btn open-slider" href="<?php echo _url('extension', 'configure', 'e', $name_encoded); ?>"><?php echo _i('configure'); ?> <?php echo _t('gen.actions.manage'); ?></a>
<?php if ($ext->is_enabled()) { ?>
- <button class="btn active" form="form-extension" formaction="<?php echo _url('extension', 'disable', 'e', $name_encoded); ?>"><?php echo _t('admin.extensions.disable'); ?></button>
+ <button class="btn active" form="form-extension" formaction="<?php echo _url('extension', 'disable', 'e', $name_encoded); ?>"><?php echo _t('gen.actions.disable'); ?></button>
<?php } else { ?>
- <button class="btn" form="form-extension" formaction="<?php echo _url('extension', 'enable', 'e', $name_encoded); ?>"><?php echo _t('admin.extensions.enable'); ?></button>
+ <button class="btn" form="form-extension" formaction="<?php echo _url('extension', 'enable', 'e', $name_encoded); ?>"><?php echo _t('gen.actions.enable'); ?></button>
<?php } ?>
<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
- <button class="btn btn-attention confirm" form="form-extension" formaction="<?php echo _url('extension', 'remove', 'e', $name_encoded); ?>"><?php echo _t('admin.extensions.remove'); ?></button>
+ <button class="btn btn-attention confirm" form="form-extension" formaction="<?php echo _url('extension', 'remove', 'e', $name_encoded); ?>"><?php echo _t('gen.actions.remove'); ?></button>
<?php } ?>
</div>
<?php } else { ?>
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-10 13:18:50 +0000