diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2012-10-18 08:09:58 -0700 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2012-10-18 08:09:58 -0700 |
| commit | e4c0bb59e52a2cc7be21cdc4180a7f1aa64b18b5 (patch) | |
| tree | 1a308bbbe6f474b83a581107b3c24dc0a6439a5b /apps/files/js | |
| parent | e307bf31c801b554a44afddd37e8e6f425fab567 (diff) | |
| parent | d8eb62232e2b3003925c87b316b66ed6b39ff100 (diff) | |
| download | nextcloud-server-e4c0bb59e52a2cc7be21cdc4180a7f1aa64b18b5.tar.gz nextcloud-server-e4c0bb59e52a2cc7be21cdc4180a7f1aa64b18b5.zip | |
Merge pull request #39 from scambra/date-l10n-fixes
Date l10n fixes
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/files.js | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 6715e3fec60..549204e8572 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -843,20 +843,19 @@ function relative_modified_date(timestamp) { var diffhours = Math.round(diffminutes/60); var diffdays = Math.round(diffhours/24); var diffmonths = Math.round(diffdays/31); - var diffyears = Math.round(diffdays/365); if(timediff < 60) { return t('files','seconds ago'); } - else if(timediff < 120) { return '1 '+t('files','minute ago'); } - else if(timediff < 3600) { return diffminutes+' '+t('files','minutes ago'); } + else if(timediff < 120) { return t('files','1 minute ago'); } + else if(timediff < 3600) { return t('files','{minutes} minutes ago',{minutes: diffminutes}); } //else if($timediff < 7200) { return '1 hour ago'; } //else if($timediff < 86400) { return $diffhours.' hours ago'; } else if(timediff < 86400) { return t('files','today'); } else if(timediff < 172800) { return t('files','yesterday'); } - else if(timediff < 2678400) { return diffdays+' '+t('files','days ago'); } + else if(timediff < 2678400) { return t('files','{days} days ago',{days: diffdays}); } else if(timediff < 5184000) { return t('files','last month'); } //else if($timediff < 31556926) { return $diffmonths.' months ago'; } else if(timediff < 31556926) { return t('files','months ago'); } else if(timediff < 63113852) { return t('files','last year'); } - else { return diffyears+' '+t('files','years ago'); } + else { return t('files','years ago'); } } function getMimeIcon(mime, ready){ |