summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorChristoph Wurst <ChristophWurst@users.noreply.github.com>2016-10-03 10:41:20 +0200
committerGitHub <noreply@github.com>2016-10-03 10:41:20 +0200
commit407232b77246c43460f7dc271f743905a8921e30 (patch)
tree14c7fcb8e2fbbc1d3e9ebc979b95877e72230b92 /apps/files
parent07a1be2e06361d5c88eca53acb790e1dc499bdb1 (diff)
parent7de4c809eff92ea37d4badb1e3342975a4b362f8 (diff)
downloadnextcloud-server-407232b77246c43460f7dc271f743905a8921e30.tar.gz
nextcloud-server-407232b77246c43460f7dc271f743905a8921e30.zip
Merge pull request #1547 from nextcloud/files-translate-filesummary
Translate file summary connector (#26221)
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/js/filesummary.js6
1 files changed, 4 insertions, 2 deletions
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));
},
/**