Merge branch 'master' of github.com:owncloud/core into vcategories_db

1 files changed, 8 insertions, 8 deletions

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 777a5ec647e..6715e3fec60 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -262,7 +262,7 @@ $(document).ready(function() {
 									uploadtext.text(t('files', '1 file uploading'));
 									uploadtext.show();
 								} else {
-									uploadtext.text(currentUploads + ' ' + t('files', 'files uploading'));
+									uploadtext.text(t('files', '{count} files uploading', {count: currentUploads}));
 								}
 							}
 						}
@@ -307,7 +307,7 @@ $(document).ready(function() {
 												uploadtext.text('');
 												uploadtext.hide();
 											} else {
-												uploadtext.text(currentUploads + ' ' + t('files', 'files uploading'));
+												uploadtext.text(t('files', '{count} files uploading', {count: currentUploads}));
 											}
 										})
 								.error(function(jqXHR, textStatus, errorThrown) {
@@ -322,7 +322,7 @@ $(document).ready(function() {
 											uploadtext.text('');
 											uploadtext.hide();
 										} else {
-											uploadtext.text(currentUploads + ' ' + t('files', 'files uploading'));
+											uploadtext.text(t('files', '{count} files uploading', {count: currentUploads}));
 										}
 										$('#notification').hide();
 										$('#notification').text(t('files', 'Upload cancelled.'));
@@ -678,7 +678,7 @@ function scanFiles(force,dir){
 	var scannerEventSource=new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force:force,dir:dir});
 	scanFiles.cancel=scannerEventSource.close.bind(scannerEventSource);
 	scannerEventSource.listen('scanning',function(data){
-		$('#scan-count').text(data.count + ' ' + t('files', 'files scanned'));
+		$('#scan-count').text(t('files', '{count} files scanned', {count: data.count}));
 		$('#scan-current').text(data.file+'/');
 	});
 	scannerEventSource.listen('success',function(success){
@@ -788,9 +788,9 @@ function procesSelection(){
 		var selection='';
 		if(selectedFolders.length>0){
 			if(selectedFolders.length==1){
-				selection+='1 '+t('files','folder');
+				selection+=t('files','1 folder');
 			}else{
-				selection+=selectedFolders.length+' '+t('files','folders');
+				selection+=t('files','{count} folders',{count: selectedFolders.length});
 			}
 			if(selectedFiles.length>0){
 				selection+=' & ';
@@ -798,9 +798,9 @@ function procesSelection(){
 		}
 		if(selectedFiles.length>0){
 			if(selectedFiles.length==1){
-				selection+='1 '+t('files','file');
+				selection+=t('files','1 file');
 			}else{
-				selection+=selectedFiles.length+' '+t('files','files');
+				selection+=t('files','{count} files',{count: selectedFiles.length});
 			}
 		}
 		$('#headerName>span.name').text(selection);