diff options
| author | Craig Andrews <candrews@integralblue.com> | 2010-04-18 19:21:15 -0400 |
|---|---|---|
| committer | Craig Andrews <candrews@integralblue.com> | 2010-04-18 19:21:15 -0400 |
| commit | 39392e03a71d94d6b984033b994b417edfc2d8d6 (patch) | |
| tree | cb3ae36fc9a20a4cd884e271ef36dcce28f109c8 /lib/apiauth.php | |
| parent | 727ea5a5163249eb40fa0c4b2c63054fc997473b (diff) | |
| parent | 23bad16bba52a09f0cea3d2c40e6cf91e2945e37 (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
actions/confirmaddress.php
actions/imsettings.php
Diffstat (limited to 'lib/apiauth.php')
| -rw-r--r-- | lib/apiauth.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/apiauth.php b/lib/apiauth.php index e78de618e..d6ad7e021 100644 --- a/lib/apiauth.php +++ b/lib/apiauth.php @@ -91,6 +91,7 @@ class ApiAuthAction extends ApiAction if ($this->isReadOnly($args) == false) { if ($this->access != self::READ_WRITE) { + // TRANS: Client error 401. $msg = _('API resource requires read-write access, ' . 'but you only have read access.'); $this->clientError($msg, 401, $this->format); @@ -273,8 +274,8 @@ class ApiAuthAction extends ApiAction list($proxy, $ip) = common_client_ip(); - $msg = sprintf(_('Failed API auth attempt, nickname = %1$s, ' . - 'proxy = %2$s, ip = %3$s'), + $msg = sprintf( 'Failed API auth attempt, nickname = %1$s, ' . + 'proxy = %2$s, ip = %3$s', $this->auth_user_nickname, $proxy, $ip); |