From 7de4c809eff92ea37d4badb1e3342975a4b362f8 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 27 Sep 2016 09:56:43 +0200
Subject: [PATCH] Translate file summary connector (#26221)

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
---
 apps/files/js/filesummary.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/files/js/filesummary.js b/apps/files/js/filesummary.js
index 519718cfc8..7545654ec4 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));
 		},
 
 		/**