L10N: Generalized age() for all languages by using maketext() internally

This way the translators can TL/improve their own translation of the age
display, instead of asking me to fix it.

2 files changed, 35 insertions, 19 deletions

diff --git a/data/lang.txt b/data/lang.txt
index 306ff2d9..22f0073d 100644
--- a/data/lang.txt
+++ b/data/lang.txt
@@ -100,6 +100,37 @@ ends with ']'. The following options are supported:
 # data/global.pl - used in many places
 
 
+# Age display
+
+:_age_years
+en : [_1] [quant,_1,year,years] ago
+ru : [_1] [quant,_1,год,года,лет] назад
+
+:_age_months
+en : [_1] [quant,_1,month,months] ago
+ru : [_1] [quant,_1,месяц,месяца,месяцев] назад
+
+:_age_weeks
+en : [_1] [quant,_1,week,weeks] ago
+ru : [_1] [quant,_1,неделя,недели,недель] назад
+
+:_age_days
+en : [_1] [quant,_1,day,days] ago
+ru : [_1] [quant,_1,день,дня,дней] назад
+
+:_age_hours
+en : [_1] [quant,_1,hour,hours] ago
+ru : [_1] [quant,_1,час,часа,часов] назад
+
+:_age_min
+en : [_1] min ago
+ru : [_1] [quant,_1,минута,минуты,минут] назад
+
+:_age_sec
+en : [_1] sec ago
+ru : [_1] [quant,_1,секунда,секунды,секунд] назад
+
+
 # user ranks
 
 :_urank_0
diff --git a/lib/VNDB/L10N.pm b/lib/VNDB/L10N.pm
index c2423f53..e19302ed 100644
--- a/lib/VNDB/L10N.pm
+++ b/lib/VNDB/L10N.pm
@@ -58,8 +58,9 @@ use warnings;
   # Argument: unix timestamp
   # Returns: age
   sub age {
-    my $a = time-$_[1];
-    return sprintf '%d %s ago',
+    my($self, $time) = @_;
+    my $a = time-$time;
+    my @f =
       $a > 60*60*24*365*2       ? ( $a/60/60/24/365,      'years'  ) :
       $a > 60*60*24*(365/12)*2  ? ( $a/60/60/24/(365/12), 'months' ) :
       $a > 60*60*24*7*2         ? ( $a/60/60/24/7,        'weeks'  ) :
@@ -67,6 +68,7 @@ use warnings;
       $a > 60*60*2              ? ( $a/60/60,             'hours'  ) :
       $a > 60*2                 ? ( $a/60,                'min'    ) :
                                   ( $a,                   'sec'    );
+    return $self->maketext("_age_$f[1]", int $f[0]);
   }
 
   # argument: unix timestamp and optional format (compact/full)
@@ -135,23 +137,6 @@ use warnings;
     return $couple if ($num % 10) >= 2 && ($num % 10) <= 4 && !(($num % 100) >= 12 && ($num % 100) <= 14);
     return $lots;
   }
-
-  sub age {
-    my $self = shift;
-    my $a = time-shift;
-    use utf8;
-    my @l = (
-      $a > 60*60*24*365*2       ? ( $a/60/60/24/365,      'год',     'года',    'лет'     ) :
-      $a > 60*60*24*(365/12)*2  ? ( $a/60/60/24/(365/12), 'месяц',   'месяца',  'месяцев' ) :
-      $a > 60*60*24*7*2         ? ( $a/60/60/24/7,        'неделя',  'недели',  'недель'  ) :
-      $a > 60*60*24*2           ? ( $a/60/60/24,          'день',    'дня',     'дней'    ) :
-      $a > 60*60*2              ? ( $a/60/60,             'час',     'часа',    'часов'   ) :
-      $a > 60*2                 ? ( $a/60,                'минута',  'минуты',  'минут'   ) :
-                                  ( $a,                   'секунда', 'секунды', 'секунд'  )
-    );
-    return sprintf '%d %s назад', $l[0], $self->quant(@l);
-  }
-
 }