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/errorController.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/errorController.php')
| -rw-r--r-- | app/Controllers/errorController.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/Controllers/errorController.php b/app/Controllers/errorController.php index 6c080bea8..06fa186cf 100644 --- a/app/Controllers/errorController.php +++ b/app/Controllers/errorController.php @@ -37,11 +37,11 @@ class FreshRSS_error_Controller extends Minz_ActionController { if ($this->view->errorMessage == '') { switch($code_int) { case 403: - $this->view->errorMessage = _t('access_denied'); + $this->view->errorMessage = _t('feedback.access.denied'); break; case 404: default: - $this->view->errorMessage = _t('page_not_found'); + $this->view->errorMessage = _t('feedback.access.not_found'); break; } } |