diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2014-04-11 17:22:13 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2014-04-11 17:22:13 +0200 |
| commit | 10dc1de644cab93d72daf506e645c113d53676a3 (patch) | |
| tree | 0933b25982073386092f47271203cc1c832ccb82 /settings | |
| parent | d67cba973e7037a7c9f48cc3aceec9eff26b4393 (diff) | |
| parent | 286323f7a41a783543a646e7f8c949bb9a402159 (diff) | |
| download | nextcloud-server-10dc1de644cab93d72daf506e645c113d53676a3.tar.gz nextcloud-server-10dc1de644cab93d72daf506e645c113d53676a3.zip | |
Merge pull request #8069 from owncloud/fix-localization-issues-with-file-encrypt-app
Fix some localization issues with file encryption/decryption strings
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/ajax/decryptall.php | 7 | ||||
| -rw-r--r-- | settings/js/personal.js | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/settings/ajax/decryptall.php b/settings/ajax/decryptall.php index 4782a4cfc81..d12df230d41 100644 --- a/settings/ajax/decryptall.php +++ b/settings/ajax/decryptall.php @@ -12,6 +12,7 @@ $params = array('uid' => \OCP\User::getUser(), $view = new OC_FilesystemView('/'); $util = new \OCA\Encryption\Util($view, \OCP\User::getUser()); +$l = \OC_L10N::get('settings'); $result = $util->initEncryption($params); @@ -27,11 +28,11 @@ if ($result !== false) { $util->closeEncryptionSession(); if ($successful === true) { - \OCP\JSON::success(array('data' => array('message' => 'Files decrypted successfully'))); + \OCP\JSON::success(array('data' => array('message' => $l->t('Files decrypted successfully')))); } else { - \OCP\JSON::error(array('data' => array('message' => 'Couldn\'t decrypt your files, please check your owncloud.log or ask your administrator'))); + \OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t decrypt your files, please check your owncloud.log or ask your administrator')))); } } else { - \OCP\JSON::error(array('data' => array('message' => 'Couldn\'t decrypt your files, check your password and try again'))); + \OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t decrypt your files, check your password and try again')))); } diff --git a/settings/js/personal.js b/settings/js/personal.js index dda0c98518f..c1f1ef7466b 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -310,7 +310,7 @@ OC.Encryption.msg={ startDecrypting:function(selector){ var spinner = '<img src="'+ OC.imagePath('core', 'loading-small.gif') +'">'; $(selector) - .html( t('files_encryption', 'Decrypting files... Please wait, this can take some time.') + ' ' + spinner ) + .html( t('settings', 'Decrypting files... Please wait, this can take some time.') + ' ' + spinner ) .removeClass('success') .removeClass('error') .stop(true, true) |