aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files/js')
-rw-r--r--apps/files/js/filelist.js5
-rw-r--r--apps/files/js/files.js12
2 files changed, 5 insertions, 12 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 3a6b118ec9c..536becad49a 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -453,13 +453,14 @@ $(document).ready(function(){
var currentUploads = parseInt(uploadtext.attr('currentUploads'));
currentUploads += 1;
uploadtext.attr('currentUploads', currentUploads);
+ var translatedText = n('files', 'Uploading %n file', 'Uploading %n files', currentUploads);
if(currentUploads === 1) {
var img = OC.imagePath('core', 'loading.gif');
data.context.find('td.filename').attr('style','background-image:url('+img+')');
- uploadtext.text(t('files', '1 file uploading'));
+ uploadtext.text(translatedText);
uploadtext.show();
} else {
- uploadtext.text(currentUploads + ' ' + t('files', 'files uploading'));
+ uploadtext.text(translatedText);
}
} else {
// add as stand-alone row to filelist
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 7b01a5202da..3178ff65af8 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -762,21 +762,13 @@ function procesSelection(){
$('#headerSize').text(humanFileSize(totalSize));
var selection='';
if(selectedFolders.length>0){
- if(selectedFolders.length==1){
- selection+=t('files','1 folder');
- }else{
- selection+=t('files','{count} folders',{count: selectedFolders.length});
- }
+ selection += n('files', '%n folder', '%n folders', selectedFolders.length);
if(selectedFiles.length>0){
selection+=' & ';
}
}
if(selectedFiles.length>0){
- if(selectedFiles.length==1){
- selection+=t('files','1 file');
- }else{
- selection+=t('files','{count} files',{count: selectedFiles.length});
- }
+ selection += n('files', '%n file', '%n files', selectedFiles.length);
}
$('#headerName>span.name').text(selection);
$('#modified').text('');