From c5a4668c88cd754073d47913efbbd43a4b7ed16b Mon Sep 17 00:00:00 2001 From: Valdnet <47037905+Valdnet@users.noreply.github.com> Date: Thu, 6 May 2021 14:45:33 +0200 Subject: [PATCH 1/4] l10n: Replace the apostrophe with double quotation Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com> --- apps/files/js/filesummary.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files/js/filesummary.js b/apps/files/js/filesummary.js index 202dd51cd4..54d038d86c 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'); } }, From 2349df4ca5e3038f72aadd78445b4868da08e61a Mon Sep 17 00:00:00 2001 From: Valdnet <47037905+Valdnet@users.noreply.github.com> Date: Thu, 6 May 2021 14:55:35 +0200 Subject: [PATCH 2/4] l10n: Replace the apostrophe with double quotation Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com> --- apps/encryption/templates/altmail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/encryption/templates/altmail.php b/apps/encryption/templates/altmail.php index bea416f05f..b1041454ea 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"); From 73a616101b63a321d56d756ae138fe0733c782e3 Mon Sep 17 00:00:00 2001 From: Valdnet <47037905+Valdnet@users.noreply.github.com> Date: Mon, 10 May 2021 09:19:50 +0200 Subject: [PATCH 3/4] Change the values in the test --- apps/files/tests/js/filelistSpec.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js index 5c75bfb43b..06dcb0dd46 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() { From 99e6849906fea1ee3402a8e3ad9dcca356600d70 Mon Sep 17 00:00:00 2001 From: Valdnet <47037905+Valdnet@users.noreply.github.com> Date: Mon, 10 May 2021 09:22:39 +0200 Subject: [PATCH 4/4] Change the values in test Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com> --- apps/files/tests/js/filesummarySpec.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/files/tests/js/filesummarySpec.js b/apps/files/tests/js/filesummarySpec.js index f11ad27ed5..8fe0ab2241 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);