diff options
author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2021-05-18 09:44:09 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-18 09:44:09 +0300 |
commit | 83330b8c4ca27b094b4a262dde261a0b767b3f9c (patch) | |
tree | fd35f9d8f74292e35649d0aa1f80df9405623649 | |
parent | ee3dc57cbd9c9cf2f88d97a35f54ed67ab556aa7 (diff) | |
parent | 99e6849906fea1ee3402a8e3ad9dcca356600d70 (diff) |
Merge pull request #26896 from nextcloud/Valdnet-patch-8
l10n: Replace the apostrophe with double quotation
-rw-r--r-- | apps/encryption/templates/altmail.php | 2 | ||||
-rw-r--r-- | apps/files/js/filesummary.js | 2 | ||||
-rw-r--r-- | apps/files/tests/js/filelistSpec.js | 10 | ||||
-rw-r--r-- | apps/files/tests/js/filesummarySpec.js | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/apps/encryption/templates/altmail.php b/apps/encryption/templates/altmail.php index bea416f05fd..b1041454ea8 100644 --- a/apps/encryption/templates/altmail.php +++ b/apps/encryption/templates/altmail.php @@ -2,7 +2,7 @@ /** @var OC_Theme $theme */ /** @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'])) { print_unescaped($l->t("The share will expire on %s.", [$_['expiration']])); print_unescaped("\n\n"); diff --git a/apps/files/js/filesummary.js b/apps/files/js/filesummary.js index 202dd51cd4c..54d038d86c6 100644 --- a/apps/files/js/filesummary.js +++ b/apps/files/js/filesummary.js @@ -248,7 +248,7 @@ $filterInfo.html(''); $filterInfo.addClass('hidden'); } 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'); } }, diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js index 5c75bfb43bf..06dcb0dd469 100644 --- a/apps/files/tests/js/filelistSpec.js +++ b/apps/files/tests/js/filelistSpec.js @@ -1251,7 +1251,7 @@ describe('OCA.Files.FileList tests', function() { expect($summary.hasClass('hidden')).toEqual(false); expect($summary.find('.dirinfo').text()).toEqual('1 folder'); 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); fileList.setFilter('ee'); @@ -1260,7 +1260,7 @@ describe('OCA.Files.FileList tests', function() { expect($summary.hasClass('hidden')).toEqual(false); expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(true); 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); fileList.setFilter('eee'); @@ -1275,7 +1275,7 @@ describe('OCA.Files.FileList tests', function() { expect($summary.hasClass('hidden')).toEqual(false); expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(true); 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); fileList.setFilter('e'); @@ -1284,7 +1284,7 @@ describe('OCA.Files.FileList tests', function() { expect($summary.hasClass('hidden')).toEqual(false); expect($summary.find('.dirinfo').text()).toEqual('1 folder'); 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); fileList.setFilter(''); @@ -1305,7 +1305,7 @@ describe('OCA.Files.FileList tests', function() { expect($summary.hasClass('hidden')).toEqual(false); expect($summary.find('.dirinfo').hasClass('hidden')).toEqual(true); 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); }); it('hides the emptyfiles notice when using filter()', function() { diff --git a/apps/files/tests/js/filesummarySpec.js b/apps/files/tests/js/filesummarySpec.js index f11ad27ed59..8fe0ab2241f 100644 --- a/apps/files/tests/js/filesummarySpec.js +++ b/apps/files/tests/js/filesummarySpec.js @@ -103,7 +103,7 @@ describe('OCA.Files.FileSummary tests', function() { expect($container.hasClass('hidden')).toEqual(false); expect($container.find('.dirinfo').text()).toEqual('5 folders'); 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'); }); 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.find('.dirinfo').text()).toEqual('6 folders'); 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(s.summary.totalDirs).toEqual(6); expect(s.summary.totalFiles).toEqual(3); @@ -154,7 +154,7 @@ describe('OCA.Files.FileSummary tests', function() { expect($container.hasClass('hidden')).toEqual(false); expect($container.find('.dirinfo').text()).toEqual('4 folders'); 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(s.summary.totalDirs).toEqual(4); expect(s.summary.totalFiles).toEqual(1); |