aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2014-04-07 11:58:32 +0200
committerJörn Friedrich Dreyer <jfd@butonic.de>2014-04-07 11:58:32 +0200
commit779dff31c440c7252e9bab88e89b7864afec7bf2 (patch)
tree2741f41db466b2206484711a9e6d745c4b36866e /core
parentc90b0ac00b9f2ea406346f0500bb91bf8f205501 (diff)
downloadnextcloud-server-779dff31c440c7252e9bab88e89b7864afec7bf2.tar.gz
nextcloud-server-779dff31c440c7252e9bab88e89b7864afec7bf2.zip
translations for oc-dialogs reside in code
Diffstat (limited to 'core')
-rw-r--r--core/js/oc-dialogs.js20
1 files changed, 10 insertions, 10 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 617a8a3152c..4da56f27d27 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -343,7 +343,7 @@ var OCdialogs = {
addConflict(conflicts, original, replacement);
var count = $(dialog_id+ ' .conflict').length;
- var title = n('files',
+ var title = n('core',
'{count} file conflict',
'{count} file conflicts',
count,
@@ -358,17 +358,17 @@ var OCdialogs = {
//create dialog
this._fileexistsshown = true;
$.when(this._getFileExistsTemplate()).then(function($tmpl) {
- var title = t('files','One file conflict');
+ var title = t('core','One file conflict');
var $dlg = $tmpl.octemplate({
dialog_name: dialog_name,
title: title,
type: 'fileexists',
- allnewfiles: t('files','New Files'),
- allexistingfiles: t('files','Already existing files'),
+ allnewfiles: t('core','New Files'),
+ allexistingfiles: t('core','Already existing files'),
- why: t('files','Which files do you want to keep?'),
- what: t('files','If you select both versions, the copied file will have a number added to its name.')
+ why: t('core','Which files do you want to keep?'),
+ what: t('core','If you select both versions, the copied file will have a number added to its name.')
});
$('body').append($dlg);
@@ -433,10 +433,10 @@ var OCdialogs = {
var count = $(dialog_id).find('.conflict .replacement input[type="checkbox"]:checked').length;
if (count === $(dialog_id+ ' .conflict').length) {
$(dialog_id).find('.allnewfiles').prop('checked', true);
- $(dialog_id).find('.allnewfiles + .count').text(t('files','(all selected)'));
+ $(dialog_id).find('.allnewfiles + .count').text(t('core','(all selected)'));
} else if (count > 0) {
$(dialog_id).find('.allnewfiles').prop('checked', false);
- $(dialog_id).find('.allnewfiles + .count').text(t('files','({count} selected)',{count:count}));
+ $(dialog_id).find('.allnewfiles + .count').text(t('core','({count} selected)',{count:count}));
} else {
$(dialog_id).find('.allnewfiles').prop('checked', false);
$(dialog_id).find('.allnewfiles + .count').text('');
@@ -446,10 +446,10 @@ var OCdialogs = {
var count = $(dialog_id).find('.conflict .original input[type="checkbox"]:checked').length;
if (count === $(dialog_id+ ' .conflict').length) {
$(dialog_id).find('.allexistingfiles').prop('checked', true);
- $(dialog_id).find('.allexistingfiles + .count').text(t('files','(all selected)'));
+ $(dialog_id).find('.allexistingfiles + .count').text(t('core','(all selected)'));
} else if (count > 0) {
$(dialog_id).find('.allexistingfiles').prop('checked', false);
- $(dialog_id).find('.allexistingfiles + .count').text(t('files','({count} selected)',{count:count}));
+ $(dialog_id).find('.allexistingfiles + .count').text(t('core','({count} selected)',{count:count}));
} else {
$(dialog_id).find('.allexistingfiles').prop('checked', false);
$(dialog_id).find('.allexistingfiles + .count').text('');