From 1ae01c5eb51c50d5cfe5c6a1716231a0e1725741 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 25 Jan 2017 10:21:00 +0100 Subject: [PATCH] Use correct plural implementation for upload estimation Signed-off-by: Joas Schilling --- apps/files/js/file-upload.js | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index b3a59b5424146..508f341f73717 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -1033,11 +1033,10 @@ OC.Uploader.prototype = _.extend({ var timeStringDesktop = ""; var timeStringMobile = ""; if(date.getUTCHours() > 0){ - timeStringDesktop = t('files', '{hours}:{minutes}:{seconds} hour{plural_s} left' , { + timeStringDesktop = n('files', '{hours}:{minutes}:{seconds} hour left', '{hours}:{minutes}:{seconds} hours left', date.getUTCHours(), { hours:date.getUTCHours(), minutes: ('0' + date.getUTCMinutes()).slice(-2), - seconds: ('0' + date.getUTCSeconds()).slice(-2), - plural_s: ( smoothRemainingSeconds === 3600 ? "": "s") // 1 hour = 1*60m*60s = 3600s + seconds: ('0' + date.getUTCSeconds()).slice(-2) }); timeStringMobile = t('files', '{hours}:{minutes}h' , { hours:date.getUTCHours(), @@ -1045,19 +1044,17 @@ OC.Uploader.prototype = _.extend({ seconds: ('0' + date.getUTCSeconds()).slice(-2) }); } else if(date.getUTCMinutes() > 0){ - timeStringDesktop = t('files', '{minutes}:{seconds} minute{plural_s} left' , { + timeStringDesktop = n('files', '{minutes}:{seconds} minute left', '{minutes}:{seconds} minutes left', date.getUTCMinutes(), { minutes: date.getUTCMinutes(), - seconds: ('0' + date.getUTCSeconds()).slice(-2), - plural_s: (smoothRemainingSeconds === 60 ? "": "s") // 1 minute = 1*60s = 60s + seconds: ('0' + date.getUTCSeconds()).slice(-2) }); timeStringMobile = t('files', '{minutes}:{seconds}m' , { minutes: date.getUTCMinutes(), seconds: ('0' + date.getUTCSeconds()).slice(-2) }); } else if(date.getUTCSeconds() > 0){ - timeStringDesktop = t('files', '{seconds} second{plural_s} left' , { - seconds: date.getUTCSeconds(), - plural_s: (smoothRemainingSeconds === 1 ? "": "s") // 1 second = 1s = 1s + timeStringDesktop = n('files', '{seconds} second left', '{seconds} seconds left', date.getUTCSeconds(), { + seconds: date.getUTCSeconds() }); timeStringMobile = t('files', '{seconds}s' , {seconds: date.getUTCSeconds()}); } else {