diff options
| author | Zach Copley <zach@status.net> | 2010-01-28 00:43:24 +0000 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-01-28 00:43:24 +0000 |
| commit | 9589985e29455e41ef915ff15b679fe2a01644a0 (patch) | |
| tree | 8742a1b126835bc8c4ec2ed94edf49cb91ffb38f /actions | |
| parent | dac2231aaa612abaaf14f32f64f8d10bf5be789f (diff) | |
| parent | fcc48155ed96bbc100db483863221dc548a22c7c (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/apioauthauthorize.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php index fa074c4e7..eebc926ee 100644 --- a/actions/apioauthauthorize.php +++ b/actions/apioauthauthorize.php @@ -167,7 +167,7 @@ class ApiOauthAuthorizeAction extends ApiOauthAction if (!$result) { common_log_db_error($appUser, 'DELETE', __FILE__); - throw new ServerException(_('DB error deleting OAuth app user.')); + throw new ServerException(_('Database error deleting OAuth application user.')); return; } } @@ -193,7 +193,7 @@ class ApiOauthAuthorizeAction extends ApiOauthAction if (!$result) { common_log_db_error($appUser, 'INSERT', __FILE__); - throw new ServerException(_('DB error inserting OAuth app user.')); + throw new ServerException(_('Database error inserting OAuth application user.')); return; } @@ -303,8 +303,8 @@ class ApiOauthAuthorizeAction extends ApiOauthAction $access = ($this->app->access_type & Oauth_application::$writeAccess) ? 'access and update' : 'access'; - $msg = _("The application <strong>%s</strong> by <strong>%s</strong> would like " . - "the ability to <strong>%s</strong> your account data."); + $msg = _("The application <strong>%1$s</strong> by <strong>%2$s</strong> would like " . + "the ability to <strong>%3$s</strong> your account data."); $this->raw(sprintf($msg, $this->app->name, |