Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105>2010-05-31 15:57:21 +0400
committermatt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105>2010-05-31 15:57:21 +0400
commite81511ecee369cf46fd9ac540c70c9fb7094a26b (patch)
tree1e3866be2c114306df3722f670e929e1d3fa051c /plugins/Login
parent8f3767d8b61c257b86f45f53f72b602028986718 (diff)
Fixes #1351 All error messages displayed to screen/API should not be translated. Thanks JulienM for patch!
I simply refactored the 'you must be have %s access [...]' messages by putting the admin/view/superuser as a parameter in the string
Diffstat (limited to 'plugins/Login')
-rw-r--r--plugins/Login/Controller.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php
index 0c9b8c427e..800a16f192 100644
--- a/plugins/Login/Controller.php
+++ b/plugins/Login/Controller.php
@@ -110,13 +110,13 @@ class Piwik_Login_Controller extends Piwik_Controller
$password = Piwik_Common::getRequestVar('password', null, 'string');
if(strlen($password) != 32)
{
- throw new Exception("The password parameter is expected to be a MD5 hash of the password.");
+ throw new Exception(Piwik_TranslateException('Login_ExceptionPasswordMD5HashExpected'));
}
$login = Piwik_Common::getRequestVar('login', null, 'string');
if($login == Zend_Registry::get('config')->superuser->login)
- {
- throw new Exception("The Super User cannot be authenticated using the 'logme' mechanism.");
+ {
+ throw new Exception(Piwik_TranslateException('Login_ExceptionInvalidSuperUserAuthenticationMethod', array("logme")));
}
$currentUrl = 'index.php';