diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-12-17 21:41:33 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-12-17 21:41:33 +0100 |
| commit | 0b898678003b154fde1abd57da27e9246606085f (patch) | |
| tree | 87e7c5575cc9a269b3807a58499db52854d48e47 /app/Controllers/entryController.php | |
| parent | 930026df2159b027bc035f4ed15c39a43eb0e9fe (diff) | |
| parent | 875b8a72f97429c4e4df6d292daf4261fb7a45bd (diff) | |
Merge branch 'dev' into 252-extensions
Conflicts:
app/i18n/en/admin.php
app/i18n/en/feedback.php
app/i18n/en/gen.php
app/i18n/fr/admin.php
app/i18n/fr/feedback.php
app/i18n/fr/gen.php
app/views/index/normal.phtml
Diffstat (limited to 'app/Controllers/entryController.php')
| -rwxr-xr-x | app/Controllers/entryController.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php index b4beed619..aae08c413 100755 --- a/app/Controllers/entryController.php +++ b/app/Controllers/entryController.php @@ -34,8 +34,6 @@ class FreshRSS_entry_Controller extends Minz_ActionController { * - nextGet (default: $get) * - idMax (default: 0) * - is_read (default: true) - * - * @todo nextGet system should not be present here... or should be? */ public function readAction() { $id = Minz_Request::param('id'); @@ -85,7 +83,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController { } if (!$this->ajax) { - Minz_Request::good(_t('feeds_marked_read'), array( + Minz_Request::good(_t('feedback.sub.feed.marked_read'), array( 'c' => 'index', 'a' => 'index', 'params' => $params, @@ -144,7 +142,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController { $feedDAO->updateCachedValues(); invalidateHttpCache(); - Minz_Request::good(_t('optimization_complete'), $url_redirect); + Minz_Request::good(_t('feedback.admin.optimization_complete'), $url_redirect); } /** @@ -185,7 +183,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController { $feedDAO->updateCachedValues(); invalidateHttpCache(); - Minz_Request::good(_t('purge_completed', $nb_total), array( + Minz_Request::good(_t('feedback.sub.purge_completed', $nb_total), array( 'c' => 'configure', 'a' => 'archiving' )); |