aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorJoseph Warner <hardolaf@hardolaf.com>2013-08-24 17:20:01 -0400
committerJoseph Warner <hardolaf@hardolaf.com>2013-08-24 17:20:19 -0400
commitd398ae41c031f70946e82f71599f1821766f3eea (patch)
treea1efd3112dc78369c25cc2b93c2e25393de3e315 /phpBB
parent27ba57747ab46c0507acc3a87e5b73babda436b1 (diff)
downloadforums-d398ae41c031f70946e82f71599f1821766f3eea.tar
forums-d398ae41c031f70946e82f71599f1821766f3eea.tar.gz
forums-d398ae41c031f70946e82f71599f1821766f3eea.tar.bz2
forums-d398ae41c031f70946e82f71599f1821766f3eea.tar.xz
forums-d398ae41c031f70946e82f71599f1821766f3eea.zip
[feature/oauth] Finish cleaning up TODOs
PHPBB3-11673
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/language/en/common.php2
-rw-r--r--phpBB/phpbb/auth/provider/oauth/token_storage.php6
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 7d6c7aa1be..b558b0fad8 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -93,6 +93,8 @@ $lang = array_merge($lang, array(
'AUTH_PROVIDER_OAUTH_SERVICE_BITLY' => 'Bitly',
'AUTH_PROVIDER_OAUTH_SERVICE_FACEBOOK' => 'Facebook',
'AUTH_PROVIDER_OAUTH_SERVICE_GOOGLE' => 'Google',
+ 'AUTH_PROVIDER_OAUTH_TOKEN_ERROR_NOT_STORED' => 'OAuth token not stored.',
+ 'AUTH_PROVIDER_OAUTH_TOKEN_ERROR_INCORRECTLY_STORED' => 'OAuth token incorrectly stored.',
'AVATAR_DISALLOWED_CONTENT' => 'The upload was rejected because the uploaded file was identified as a possible attack vector.',
'AVATAR_DISALLOWED_EXTENSION' => 'This file cannot be displayed because the extension <strong>%s</strong> is not allowed.',
'AVATAR_EMPTY_REMOTE_DATA' => 'The specified avatar could not be uploaded because the remote data appears to be invalid or corrupted.',
diff --git a/phpBB/phpbb/auth/provider/oauth/token_storage.php b/phpBB/phpbb/auth/provider/oauth/token_storage.php
index ff1887fce7..b31ffcd1ab 100644
--- a/phpBB/phpbb/auth/provider/oauth/token_storage.php
+++ b/phpBB/phpbb/auth/provider/oauth/token_storage.php
@@ -245,8 +245,7 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
if (!$row)
{
- // TODO: translate
- throw new TokenNotFoundException('Token not stored');
+ throw new TokenNotFoundException('AUTH_PROVIDER_OAUTH_TOKEN_ERROR_NOT_STORED');
}
$token = $this->json_decode_token($row['oauth_token']);
@@ -255,8 +254,7 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
if (!($token instanceof TokenInterface))
{
$this->clearToken();
- // TODO: translate
- throw new TokenNotFoundException('Token not stored correctly');
+ throw new TokenNotFoundException('AUTH_PROVIDER_OAUTH_TOKEN_ERROR_INCORRECTLY_STORED');
}
$this->cachedToken = $token;