diff options
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/filelist.js | 4 | ||||
| -rw-r--r-- | apps/files/js/filesummary.js | 6 | ||||
| -rw-r--r-- | apps/files/js/newfilemenu.js | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 0e842cc7a74..98d0f132ad6 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1941,7 +1941,9 @@ // Files.isFileNameValid(filename) throws an exception itself OCA.Files.Files.isFileNameValid(filename); if (self.inList(filename)) { - throw t('files', '{newName} already exists', {newName: filename}); + throw t('files', '{newName} already exists', {newName: filename}, undefined, { + escape: false + }); } } return true; diff --git a/apps/files/js/filesummary.js b/apps/files/js/filesummary.js index 519718cfc82..7545654ec44 100644 --- a/apps/files/js/filesummary.js +++ b/apps/files/js/filesummary.js @@ -23,7 +23,7 @@ var INFO_TEMPLATE = '<span class="info">' + '<span class="dirinfo"></span>' + - '<span class="connector"> and </span>' + + '<span class="connector">{{connectorLabel}}</span>' + '<span class="fileinfo"></span>' + '<span class="hiddeninfo"></span>' + '<span class="filter"></span>' + @@ -203,7 +203,9 @@ if (!this._infoTemplateCompiled) { this._infoTemplateCompiled = Handlebars.compile(INFO_TEMPLATE); } - return this._infoTemplateCompiled(data); + return this._infoTemplateCompiled(_.extend({ + connectorLabel: t('files', '{dirs} and {files}', {dirs: '', files: ''}) + }, data)); }, /** diff --git a/apps/files/js/newfilemenu.js b/apps/files/js/newfilemenu.js index f6cf87a55bf..75c4cdcc0ba 100644 --- a/apps/files/js/newfilemenu.js +++ b/apps/files/js/newfilemenu.js @@ -146,7 +146,9 @@ if (!Files.isFileNameValid(filename)) { // Files.isFileNameValid(filename) throws an exception itself } else if (self.fileList.inList(filename)) { - throw t('files', '{newname} already exists', {newname: filename}); + throw t('files', '{newName} already exists', {newName: filename}, undefined, { + escape: false + }); } else { return true; } |