mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8633 from nextcloud/rakekniven-i18n-fix 

Improved translation strings
This commit is contained in:
Morris Jobke 2018-03-11 19:33:26 +01:00 committed by GitHub
parent 2c503ccdee f4bcf2db60
commit 15c099df4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_external/js/settings.js
View File

@ -1143,7 +1143,7 @@ MountConfigListView.prototype = _.extend({
}
var storage = new this._storageConfigClass(configId);
OC.dialogs.confirm(t('files_external', 'Are you sure you want to delete this external storage', {
OC.dialogs.confirm(t('files_external', 'Are you sure you want to delete this external storage?', {
storage: this.mountPoint
}), t('files_external', 'Delete storage?'), function(confirm) {
if (confirm) {

2
apps/theming/lib/Controller/ThemingController.php
View File

@ -221,7 +221,7 @@ class ThemingController extends Controller {
UPLOAD_ERR_OK => $this->l10n->t('There is no error, the file uploaded with success'),
UPLOAD_ERR_INI_SIZE => $this->l10n->t('The uploaded file exceeds the upload_max_filesize directive in php.ini'),
UPLOAD_ERR_FORM_SIZE => $this->l10n->t('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'),
UPLOAD_ERR_PARTIAL => $this->l10n->t('The uploaded file was only partially uploaded'),
UPLOAD_ERR_PARTIAL => $this->l10n->t('The file was only partially uploaded'),
UPLOAD_ERR_NO_FILE => $this->l10n->t('No file was uploaded'),
UPLOAD_ERR_NO_TMP_DIR => $this->l10n->t('Missing a temporary folder'),
UPLOAD_ERR_CANT_WRITE => $this->l10n->t('Failed to write file to disk.'),

2
apps/theming/tests/Controller/ThemingControllerTest.php
View File

@ -526,7 +526,7 @@ class ThemingControllerTest extends TestCase {
return [
[UPLOAD_ERR_INI_SIZE, 'The uploaded file exceeds the upload_max_filesize directive in php.ini'],
[UPLOAD_ERR_FORM_SIZE, 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'],
[UPLOAD_ERR_PARTIAL, 'The uploaded file was only partially uploaded'],
[UPLOAD_ERR_PARTIAL, 'The file was only partially uploaded'],
[UPLOAD_ERR_NO_FILE, 'No file was uploaded'],
[UPLOAD_ERR_NO_TMP_DIR, 'Missing a temporary folder'],
[UPLOAD_ERR_CANT_WRITE, 'Failed to write file to disk.'],

9
apps/user_ldap/js/wizard/wizardTabElementary.js
View File

@ -286,7 +286,14 @@ OCA = OCA || {};
} else if(objectsFound > 1000) {
message = t('user_ldap', 'More than 1,000 directory entries available.');
} else {
message = t('user_ldap', objectsFound + ' entries available within the provided Base DN');
message = n(
'user_ldap',
'{objectsFound} entry available within the provided Base DN',
'{objectsFound} entries available within the provided Base DN',
objectsFound,
{
objectsFound: objectsFound
});
}
} else {
message = view.overrideErrorMessage(payload.data.message);