diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-08-14 10:23:19 -0700 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-08-14 10:23:19 -0700 |
| commit | 8f3f47e868805078b92334e087b21f07425e8846 (patch) | |
| tree | 1e4094d9fdadbe76087df00605f571a199de0ae0 /core/js | |
| parent | b3b2b2d64c626f9c6725be979d200c509b080365 (diff) | |
| parent | 400249194726e7cf6fc79d5fe7e92ccca8539244 (diff) | |
| download | nextcloud-server-8f3f47e868805078b92334e087b21f07425e8846.tar.gz nextcloud-server-8f3f47e868805078b92334e087b21f07425e8846.zip | |
Merge pull request #4376 from owncloud/use_plurals
Use plural translations
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/js.js | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/core/js/js.js b/core/js/js.js index 64b5556987d..4dfe4d0e5ee 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -813,15 +813,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'); } |