diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-06-28 11:40:32 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-06-28 11:40:32 +0200 |
| commit | cec20d504902894d71b48182f503c6c1f4da1fbc (patch) | |
| tree | f48a385d09ff61d21db9055f58c722c49213424b | |
| parent | 26d097899303a541e95fb922e99f4eb993bb0d3a (diff) | |
| parent | 565f0b281c75e795071215e2c122b06c96fa5c8a (diff) | |
| download | nextcloud-server-cec20d504902894d71b48182f503c6c1f4da1fbc.tar.gz nextcloud-server-cec20d504902894d71b48182f503c6c1f4da1fbc.zip | |
Merge pull request #9020 from owncloud/l10n-external-errors-fix
some strings to localize external mount api responses. fix #8094
| -rw-r--r-- | apps/files_external/ajax/dropbox.php | 7 | ||||
| -rw-r--r-- | apps/files_external/ajax/google.php | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/apps/files_external/ajax/dropbox.php b/apps/files_external/ajax/dropbox.php index 91c465500d0..bbedf8e9cac 100644 --- a/apps/files_external/ajax/dropbox.php +++ b/apps/files_external/ajax/dropbox.php @@ -5,6 +5,7 @@ require_once __DIR__ . '/../3rdparty/Dropbox/autoload.php'; OCP\JSON::checkAppEnabled('files_external'); OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); +$l = OC_L10N::get('files_external'); if (isset($_POST['app_key']) && isset($_POST['app_secret'])) { $oauth = new Dropbox_OAuth_Curl($_POST['app_key'], $_POST['app_secret']); @@ -23,7 +24,7 @@ if (isset($_POST['app_key']) && isset($_POST['app_secret'])) { 'request_token_secret' => $token['token_secret']))); } catch (Exception $exception) { OCP\JSON::error(array('data' => array('message' => - 'Fetching request tokens failed. Verify that your Dropbox app key and secret are correct.') + $l->t('Fetching request tokens failed. Verify that your Dropbox app key and secret are correct.')) )); } break; @@ -36,7 +37,7 @@ if (isset($_POST['app_key']) && isset($_POST['app_secret'])) { 'access_token_secret' => $token['token_secret'])); } catch (Exception $exception) { OCP\JSON::error(array('data' => array('message' => - 'Fetching access tokens failed. Verify that your Dropbox app key and secret are correct.') + $l->t('Fetching access tokens failed. Verify that your Dropbox app key and secret are correct.')) )); } } @@ -44,5 +45,5 @@ if (isset($_POST['app_key']) && isset($_POST['app_secret'])) { } } } else { - OCP\JSON::error(array('data' => array('message' => 'Please provide a valid Dropbox app key and secret.'))); + OCP\JSON::error(array('data' => array('message' => $l->t('Please provide a valid Dropbox app key and secret.')))); } diff --git a/apps/files_external/ajax/google.php b/apps/files_external/ajax/google.php index 2594a1780b3..13e74071846 100644 --- a/apps/files_external/ajax/google.php +++ b/apps/files_external/ajax/google.php @@ -6,6 +6,7 @@ require_once 'Google_Client.php'; OCP\JSON::checkAppEnabled('files_external'); OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); +$l = OC_L10N::get('files_external'); if (isset($_POST['client_id']) && isset($_POST['client_secret']) && isset($_POST['redirect'])) { $client = new Google_Client(); @@ -23,7 +24,7 @@ if (isset($_POST['client_id']) && isset($_POST['client_secret']) && isset($_POST ))); } catch (Exception $exception) { OCP\JSON::error(array('data' => array( - 'message' => 'Step 1 failed. Exception: '.$exception->getMessage() + 'message' => $l->t('Step 1 failed. Exception: %s', array($exception->getMessage())) ))); } } else if ($step == 2 && isset($_POST['code'])) { @@ -34,7 +35,7 @@ if (isset($_POST['client_id']) && isset($_POST['client_secret']) && isset($_POST ))); } catch (Exception $exception) { OCP\JSON::error(array('data' => array( - 'message' => 'Step 2 failed. Exception: '.$exception->getMessage() + 'message' => $l->t('Step 2 failed. Exception: %s', array($exception->getMessage())) ))); } } |