From a6933efce358db5930c9e6bf516171baa81f8472 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Thu, 19 Sep 2013 11:25:41 +0200
Subject: [PATCH] use n to translate title
---
core/js/oc-dialogs.js | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index d661a871a5..d6453d2d56 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -342,7 +342,13 @@ var OCdialogs = {
var conflicts = $(dialog_id+ ' .conflicts');
addConflict(conflicts, original, replacement);
- var title = t('files','{count} file conflicts',{count:$(dialog_id+ ' .conflict').length});
+ var count = $(dialog_id+ ' .conflict').length;
+ var title = n('files',
+ 'One file conflict',
+ '{count} file conflicts',
+ count,
+ {count:count}
+ );
$(dialog_id).parent().children('.oc-dialog-title').text(title);
//recalculate dimensions
--
GitLab