Use plural translations

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index b858e2580ee16b9e340f47abceda963ecec68477..e0c72295702b13de2127ba970dbbf7691bed23b3 100644 (file)
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -452,13 +452,14 @@ $(document).ready(function(){
                                var currentUploads = parseInt(uploadtext.attr('currentUploads'));
                                currentUploads += 1;
                                uploadtext.attr('currentUploads', currentUploads);
+                               var translatedText = n('files', '%n file uploading', '%n files uploading', 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 3fad3fae7d39ed34b063541c43da59a92fea96ee..53fc25f41b0d24ffc9085bd91453a52052357469 100644 (file)
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -759,21 +759,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('');
@@ -852,4 +844,4 @@ function checkTrashStatus() {
                        $("input[type=button][id=trash]").removeAttr("disabled");
                }
        });
-}
\ No newline at end of file
+}

diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index c3c958b07a77ef9e17f497bd018725ff561a003c..b14a7240cbe5d0c211b9665492d302136b8e6428 100644 (file)
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -188,21 +188,13 @@ function processSelection(){
                $('.selectedActions').show();
                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('');

diff --git a/core/js/js.js b/core/js/js.js
index 1d1711383f77aa5d62883d59e1fe8c6565b82d0b..0fc4bab80a7b168c73df60c98cee34adffad43f0 100644 (file)
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -812,15 +812,13 @@ function relative_modified_date(timestamp) {
        var diffdays = Math.round(diffhours/24);
        var diffmonths = Math.round(diffdays/31);
        if(timediff < 60) { return t('core','seconds ago'); }
-       else if(timediff < 120) { return t('core','1 minute ago'); }
-       else if(timediff < 3600) { return t('core','{minutes} minutes ago',{minutes: diffminutes}); }
-       else if(timediff < 7200) { return t('core','1 hour ago'); }
-       else if(timediff < 86400) { return t('core','{hours} hours ago',{hours: diffhours}); }
+       else if(timediff < 3600) { return n('core','%n minute ago', '%n minutes ago', diffminutes); }
+       else if(timediff < 86400) { return n('core', '%n hour ago', '%n hours ago', diffhours); }
        else if(timediff < 86400) { return t('core','today'); }
        else if(timediff < 172800) { return t('core','yesterday'); }
-       else if(timediff < 2678400) { return t('core','{days} days ago',{days: diffdays}); }
+       else if(timediff < 2678400) { return n('core', '%n day ago', '%n days ago', diffdays); }
        else if(timediff < 5184000) { return t('core','last month'); }
-       else if(timediff < 31556926) { return t('core','{months} months ago',{months: diffmonths}); }
+       else if(timediff < 31556926) { return n('core', '%n month ago', '%n months ago', diffmonths); }
        //else if(timediff < 31556926) { return t('core','months ago'); }
        else if(timediff < 63113852) { return t('core','last year'); }
        else { return t('core','years ago'); }

diff --git a/lib/template/functions.php b/lib/template/functions.php
index 2d43cae1c0cc2cfce87c6c610471eecc051ff124..717e197c1cb1b73466b31041e58d9d0fbb65fc40 100644 (file)
--- a/lib/template/functions.php
+++ b/lib/template/functions.php
@@ -78,15 +78,13 @@ function relative_modified_date($timestamp) {
        $diffmonths = round($diffdays/31);
 
        if($timediff < 60) { return $l->t('seconds ago'); }
-       else if($timediff < 120) { return $l->t('1 minute ago'); }
-       else if($timediff < 3600) { return $l->t('%d minutes ago', $diffminutes); }
-       else if($timediff < 7200) { return $l->t('1 hour ago'); }
-       else if($timediff < 86400) { return $l->t('%d hours ago', $diffhours); }
+       else if($timediff < 3600) { return $l->n('%n minute ago', '%n minutes ago', $diffminutes); }
+       else if($timediff < 86400) { return $l->n('%n hour ago', '%n hours ago', $diffhours); }
        else if((date('G')-$diffhours) > 0) { return $l->t('today'); }
        else if((date('G')-$diffhours) > -24) { return $l->t('yesterday'); }
-       else if($timediff < 2678400) { return $l->t('%d days ago', $diffdays); }
+       else if($timediff < 2678400) { return $l->n('%n day go', '%n days ago', $diffdays); }
        else if($timediff < 5184000) { return $l->t('last month'); }
-       else if((date('n')-$diffmonths) > 0) { return $l->t('%d months ago', $diffmonths); }
+       else if((date('n')-$diffmonths) > 0) { return $l->n('%n month ago', '%n months ago', $diffmonths); }
        else if($timediff < 63113852) { return $l->t('last year'); }
        else { return $l->t('years ago'); }
 }