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

Merge pull request #26896 from nextcloud/Valdnet-patch-8 

l10n: Replace the apostrophe with double quotation
This commit is contained in:
Roeland Jago Douma 2021-05-18 08:44:09 +02:00 committed by GitHub
parent ee3dc57cbd 99e6849906
commit 83330b8c4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/encryption/templates/altmail.php
View File

@ -2,7 +2,7 @@
/** @var OC_Theme $theme */ /** @var OC_Theme $theme */
/** @var array $_ */ /** @var array $_ */
print_unescaped($l->t("Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n", [$_['password']])); print_unescaped($l->t("Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password \"%s\".\n\nPlease login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.\n\n", [$_['password']]));
if (isset($_['expiration'])) { if (isset($_['expiration'])) {
print_unescaped($l->t("The share will expire on %s.", [$_['expiration']])); print_unescaped($l->t("The share will expire on %s.", [$_['expiration']]));
print_unescaped("\n\n"); print_unescaped("\n\n");

2
apps/files/js/filesummary.js
View File

@ -248,7 +248,7 @@
$filterInfo.html(''); $filterInfo.html('');
$filterInfo.addClass('hidden'); $filterInfo.addClass('hidden');
} else { } else {
$filterInfo.html(' ' + n('files', 'matches \'{filter}\'', 'match \'{filter}\'', this.summary.totalDirs + this.summary.totalFiles, {filter: this.summary.filter})); $filterInfo.html(' ' + n('files', 'matches "{filter}"', 'match "{filter}"', this.summary.totalDirs + this.summary.totalFiles, {filter: this.summary.filter}));
$filterInfo.removeClass('hidden'); $filterInfo.removeClass('hidden');
} }
}, },

10
apps/files/tests/js/filelistSpec.js
View File

@ -1251,7 +1251,7 @@ describe('OCA.Files.FileList tests', function() {
expect($summary.hasClass('hidden')).toEqual(false); expect($summary.hasClass('hidden')).toEqual(false);
expect($summary.find('.dirinfo').text()).toEqual('1 folder'); expect($summary.find('.dirinfo').text()).toEqual('1 folder');
expect($summary.find('.fileinfo').text()).toEqual('2 files'); expect($summary.find('.fileinfo').text()).toEqual('2 files');
expect($summary.find('.filter').text()).toEqual(" match 'e'"); expect($summary.find('.filter').text()).toEqual(" match \"e\"");
expect($nofilterresults.hasClass('hidden')).toEqual(true); expect($nofilterresults.hasClass('hidden')).toEqual(true);
fileList.setFilter('ee'); fileList.setFilter('ee');
@ -1260,7 +1260,7 @@ describe('OCA.Files.FileList tests', function() {
expect($summary.hasClass('hidden')).toEqual(false); expect($summary.hasClass('hidden')).toEqual(false);
expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(true); expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(true);
expect($summary.find('.fileinfo').text()).toEqual('1 file'); expect($summary.find('.fileinfo').text()).toEqual('1 file');
expect($summary.find('.filter').text()).toEqual(" matches 'ee'"); expect($summary.find('.filter').text()).toEqual(" matches \"ee\"");
expect($nofilterresults.hasClass('hidden')).toEqual(true); expect($nofilterresults.hasClass('hidden')).toEqual(true);
fileList.setFilter('eee'); fileList.setFilter('eee');
@ -1275,7 +1275,7 @@ describe('OCA.Files.FileList tests', function() {
expect($summary.hasClass('hidden')).toEqual(false); expect($summary.hasClass('hidden')).toEqual(false);
expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(true); expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(true);
expect($summary.find('.fileinfo').text()).toEqual('1 file'); expect($summary.find('.fileinfo').text()).toEqual('1 file');
expect($summary.find('.filter').text()).toEqual(" matches 'ee'"); expect($summary.find('.filter').text()).toEqual(" matches \"ee\"");
expect($nofilterresults.hasClass('hidden')).toEqual(true); expect($nofilterresults.hasClass('hidden')).toEqual(true);
fileList.setFilter('e'); fileList.setFilter('e');
@ -1284,7 +1284,7 @@ describe('OCA.Files.FileList tests', function() {
expect($summary.hasClass('hidden')).toEqual(false); expect($summary.hasClass('hidden')).toEqual(false);
expect($summary.find('.dirinfo').text()).toEqual('1 folder'); expect($summary.find('.dirinfo').text()).toEqual('1 folder');
expect($summary.find('.fileinfo').text()).toEqual('2 files'); expect($summary.find('.fileinfo').text()).toEqual('2 files');
expect($summary.find('.filter').text()).toEqual(" match 'e'"); expect($summary.find('.filter').text()).toEqual(" match \"e\"");
expect($nofilterresults.hasClass('hidden')).toEqual(true); expect($nofilterresults.hasClass('hidden')).toEqual(true);
fileList.setFilter(''); fileList.setFilter('');
@ -1305,7 +1305,7 @@ describe('OCA.Files.FileList tests', function() {
expect($summary.hasClass('hidden')).toEqual(false); expect($summary.hasClass('hidden')).toEqual(false);
expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(true); expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(true);
expect($summary.find('.fileinfo').text()).toEqual('1 file'); expect($summary.find('.fileinfo').text()).toEqual('1 file');
expect($summary.find('.filter').text()).toEqual(" matches '63'"); expect($summary.find('.filter').text()).toEqual(" matches \"63\"");
expect($nofilterresults.hasClass('hidden')).toEqual(true); expect($nofilterresults.hasClass('hidden')).toEqual(true);
}); });
it('hides the emptyfiles notice when using filter()', function() { it('hides the emptyfiles notice when using filter()', function() {

6
apps/files/tests/js/filesummarySpec.js
View File

@ -103,7 +103,7 @@ describe('OCA.Files.FileSummary tests', function() {
expect($container.hasClass('hidden')).toEqual(false); expect($container.hasClass('hidden')).toEqual(false);
expect($container.find('.dirinfo').text()).toEqual('5 folders'); expect($container.find('.dirinfo').text()).toEqual('5 folders');
expect($container.find('.fileinfo').text()).toEqual('2 files'); expect($container.find('.fileinfo').text()).toEqual('2 files');
expect($container.find('.filter').text()).toEqual(' match \'foo\''); expect($container.find('.filter').text()).toEqual(' match "foo"');
expect($container.find('.filesize').text()).toEqual('250 KB'); expect($container.find('.filesize').text()).toEqual('250 KB');
}); });
it('hides filtered summary when no files or folders', function() { it('hides filtered summary when no files or folders', function() {
@ -132,7 +132,7 @@ describe('OCA.Files.FileSummary tests', function() {
expect($container.hasClass('hidden')).toEqual(false); expect($container.hasClass('hidden')).toEqual(false);
expect($container.find('.dirinfo').text()).toEqual('6 folders'); expect($container.find('.dirinfo').text()).toEqual('6 folders');
expect($container.find('.fileinfo').text()).toEqual('3 files'); expect($container.find('.fileinfo').text()).toEqual('3 files');
expect($container.find('.filter').text()).toEqual(' match \'foo\''); expect($container.find('.filter').text()).toEqual(' match "foo"');
expect($container.find('.filesize').text()).toEqual('500 KB'); expect($container.find('.filesize').text()).toEqual('500 KB');
expect(s.summary.totalDirs).toEqual(6); expect(s.summary.totalDirs).toEqual(6);
expect(s.summary.totalFiles).toEqual(3); expect(s.summary.totalFiles).toEqual(3);
@ -154,7 +154,7 @@ describe('OCA.Files.FileSummary tests', function() {
expect($container.hasClass('hidden')).toEqual(false); expect($container.hasClass('hidden')).toEqual(false);
expect($container.find('.dirinfo').text()).toEqual('4 folders'); expect($container.find('.dirinfo').text()).toEqual('4 folders');
expect($container.find('.fileinfo').text()).toEqual('1 file'); expect($container.find('.fileinfo').text()).toEqual('1 file');
expect($container.find('.filter').text()).toEqual(' match \'foo\''); expect($container.find('.filter').text()).toEqual(' match "foo"');
expect($container.find('.filesize').text()).toEqual('125 KB'); expect($container.find('.filesize').text()).toEqual('125 KB');
expect(s.summary.totalDirs).toEqual(4); expect(s.summary.totalDirs).toEqual(4);
expect(s.summary.totalFiles).toEqual(1); expect(s.summary.totalFiles).toEqual(1);