fix translation issues with previous commit

diff --git a/core/js/js.js b/core/js/js.js
index cb6b48b095e73521557b4abf5494c50b1c9ceae1..164fab80ed4af4efb4b7815d69dd7a0de0412100 100644 (file)
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -688,13 +688,13 @@ function relative_modified_date(timestamp) {
        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 '1 hour ago'; }
-       else if($timediff < 86400) { return $diffhours.' hours ago'; }
+       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 < 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 < 5184000) { return t('core','last month'); }
-       else if($timediff < 31556926) { return $diffmonths.' months ago'; }
+       else if(timediff < 31556926) { return t('core','{months} months ago',{months: 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.php b/lib/template.php
index 48224130fa8f810c87dcbb4e1d431935b8d7e06e..a10cabf5931d16f1cc790b36ffa24e5b8734c9de 100644 (file)
--- a/lib/template.php
+++ b/lib/template.php
@@ -103,13 +103,13 @@ function relative_modified_date($timestamp) {
        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 '1 hour ago'; }
-       else if($timediff < 86400) { return $diffhours.' hours ago'; }
+       else if($timediff < 7200) { return $l->t('1 hour ago'); }
+       else if($timediff < 86400) { return $l->t('%d 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 < 5184000) { return $l->t('last month'); }
-       else if((date('n')-$diffmonths) > 0) { return $l->t('months ago'); }
+       else if((date('n')-$diffmonths) > 0) { return $l->t('%d months ago', $diffmonths); }
        else if($timediff < 63113852) { return $l->t('last year'); }
        else { return $l->t('years ago'); }
 }