From 7d01342babcd3ce699d05bcceac2690ced110562 Mon Sep 17 00:00:00 2001 From: Alessandro Cosentino Date: Tue, 13 Nov 2012 19:32:26 -0500 Subject: [PATCH] fix translation issues with previous commit --- core/js/js.js | 6 +++--- lib/template.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/js/js.js b/core/js/js.js index cb6b48b095..164fab80ed 100644 --- 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 48224130fa..a10cabf593 100644 --- 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'); } }