aboutsummaryrefslogtreecommitdiffstats
path: root/core/js
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2013-09-19 11:25:41 +0200
committerJörn Friedrich Dreyer <jfd@butonic.de>2013-09-19 11:25:41 +0200
commita6933efce358db5930c9e6bf516171baa81f8472 (patch)
tree6952a07da43e8f90eadb9704c2ae0f884fd3f778 /core/js
parent89ed0007c021f27d1a867682005e0c36bcad433a (diff)
downloadnextcloud-server-a6933efce358db5930c9e6bf516171baa81f8472.tar.gz
nextcloud-server-a6933efce358db5930c9e6bf516171baa81f8472.zip
use n to translate title
Diffstat (limited to 'core/js')
-rw-r--r--core/js/oc-dialogs.js8
1 files changed, 7 insertions, 1 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index d661a871a5f..d6453d2d56c 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