Move some VNDB::L10N stuff to VNDB::Func + intern VNDB::Func

11 files changed, 36 insertions, 41 deletions

diff --git a/lib/VNDB/Handler/Affiliates.pm b/lib/VNDB/Handler/Affiliates.pm
index b180adeb..efba6b18 100644
--- a/lib/VNDB/Handler/Affiliates.pm
+++ b/lib/VNDB/Handler/Affiliates.pm
@@ -70,7 +70,7 @@ sub list {
          td class => 'tc2', $l->{version} || '<default>';
          td class => 'tc3', $l->{hidden} ? 'YES' : 'no';
          td class => 'tc4', $l->{priority};
-         td class => 'tc5', sprintf '%s / %s', $l->{price}, $l->{lastfetch} ? $self->{l10n}->age($l->{lastfetch}) : '-';
+         td class => 'tc5', sprintf '%s / %s', $l->{price}, $l->{lastfetch} ? fmtage($l->{lastfetch}) : '-';
          td class => 'tc6';
           a href => $l->{url}, 'link';
           txt ' | ';
diff --git a/lib/VNDB/Handler/Discussions.pm b/lib/VNDB/Handler/Discussions.pm
index b95bab92..c2dea192 100644
--- a/lib/VNDB/Handler/Discussions.pm
+++ b/lib/VNDB/Handler/Discussions.pm
@@ -71,7 +71,7 @@ sub thread {
         if(!$_->{hidden}) {
           lit ' '.mt "_thread_byuser", $_;
           br;
-          lit $self->{l10n}->date($_->{date}, 'full');
+          txt fmtdate $_->{date}, 'full';
         }
        end;
        td class => 'tc2';
@@ -300,7 +300,7 @@ sub edit {
                          '_postedit_edit';
   $self->htmlHeader(title => $title, noindex => 1);
   $self->htmlForm({ frm => $frm, action => $url }, 'postedit' => [$title,
-    [ static => label => mt('_postedit_form_username'), content => $self->{l10n}->userstr($p ? ($p->{uid}, $p->{username}) : ($self->authInfo->{id}, $self->authInfo->{username})) ],
+    [ static => label => mt('_postedit_form_username'), content => fmtuser($p ? ($p->{uid}, $p->{username}) : ($self->authInfo->{id}, $self->authInfo->{username})) ],
     !$tid || $num == 1 ? (
       [ input  => short => 'title', name => mt('_postedit_form_title') ],
       [ input  => short => 'boards',  name => mt('_postedit_form_boards') ],
@@ -559,8 +559,8 @@ sub search {
         Tr;
          td class => 'tc1_1'; a href => $link, 't'.$l->{tid}; end;
          td class => 'tc1_2'; a href => $link, '.'.$l->{num}; end;
-         td class => 'tc2', $self->{l10n}->date($l->{date});
-         td class => 'tc3'; lit $self->{l10n}->userstr($l->{uid}, $l->{username}); end;
+         td class => 'tc2', fmtdate $l->{date};
+         td class => 'tc3'; lit fmtuser $l->{uid}, $l->{username}; end;
          td class => 'tc4';
           div class => 'title';
            a href => $link, $l->{title};
@@ -618,14 +618,12 @@ sub _threadlist {
        end;
        td class => 'tc2', $o->{count}-1;
        td class => 'tc3';
-        lit $self->{l10n}->userstr($o->{fuid}, $o->{fusername});
+        lit fmtuser $o->{fuid}, $o->{fusername};
        end;
        td class => 'tc4';
-        lit $self->{l10n}->userstr($o->{luid}, $o->{lusername});
+        lit fmtuser $o->{luid}, $o->{lusername};
         lit ' @ ';
-        a href => "/t$o->{id}.$o->{count}";
-         lit $self->{l10n}->date($o->{ldate}, 'full');
-        end;
+        a href => "/t$o->{id}.$o->{count}", fmtdate $o->{ldate}, 'full';
        end;
       end 'tr';
     }
diff --git a/lib/VNDB/Handler/Misc.pm b/lib/VNDB/Handler/Misc.pm
index 95bfe155..a6f6401b 100644
--- a/lib/VNDB/Handler/Misc.pm
+++ b/lib/VNDB/Handler/Misc.pm
@@ -147,7 +147,7 @@ sub homepage {
      ul;
       for (@$upcoming) {
         li;
-         lit $self->{l10n}->datestr($_->{released});
+         lit fmtdatestr $_->{released};
          txt ' ';
          cssicon $_, $self->{platforms}{$_} for (@{$_->{platforms}});
          cssicon "lang $_", $self->{languages}{$_} for (@{$_->{languages}});
@@ -167,7 +167,7 @@ sub homepage {
      ul;
       for (@$justrel) {
         li;
-         lit $self->{l10n}->datestr($_->{released});
+         lit fmtdatestr $_->{released};
          txt ' ';
          cssicon $_, $self->{platforms}{$_} for (@{$_->{platforms}});
          cssicon "lang $_", $self->{languages} for (@{$_->{languages}});
diff --git a/lib/VNDB/Handler/Producers.pm b/lib/VNDB/Handler/Producers.pm
index 13dd40b0..a8bf371f 100644
--- a/lib/VNDB/Handler/Producers.pm
+++ b/lib/VNDB/Handler/Producers.pm
@@ -151,7 +151,7 @@ sub _releases {
     for my $v (@vn) {
       Tr class => 'vn';
        td colspan => 6;
-        i; lit $self->{l10n}->datestr($vn{$v->{vid}}[0]{released}); end;
+        i; lit fmtdatestr $vn{$v->{vid}}[0]{released}; end;
         a href => "/v$v->{vid}", title => $v->{original}, $v->{title};
         span '('.join(', ',
            (grep($_->{developer}, @{$vn{$v->{vid}}}) ? mt '_prodpage_dev' : ()),
@@ -161,7 +161,7 @@ sub _releases {
       end;
       for my $rel (@{$vn{$v->{vid}}}) {
         Tr class => 'rel';
-         td class => 'tc1'; lit $self->{l10n}->datestr($rel->{released}); end;
+         td class => 'tc1'; lit fmtdatestr $rel->{released}; end;
          td class => 'tc2', $rel->{minage} < 0 ? '' : minage $rel->{minage};
          td class => 'tc3';
           for (sort @{$rel->{platforms}}) {
diff --git a/lib/VNDB/Handler/Releases.pm b/lib/VNDB/Handler/Releases.pm
index fd05c069..531c878e 100644
--- a/lib/VNDB/Handler/Releases.pm
+++ b/lib/VNDB/Handler/Releases.pm
@@ -51,7 +51,7 @@ sub page {
       [ catalog    => serialize => sub { $_[0]||mt '_revision_empty' } ],
       [ languages  => join => ', ', split => sub { map $self->{languages}{$_}, @{$_[0]} } ],
       [ 'website' ],
-      [ released   => htmlize   => sub { $self->{l10n}->datestr($_[0]) } ],
+      [ released   => htmlize   => \&fmtdatestr ],
       [ minage     => serialize => \&minage ],
       [ notes      => diff => qr/[ ,\n\.]/ ],
       [ platforms  => join => ', ', split => sub { map $self->{platforms}{$_}, @{$_[0]} } ],
@@ -182,7 +182,7 @@ sub _infotable {
    Tr;
     td mt '_relinfo_released';
     td;
-     lit $self->{l10n}->datestr($r->{released});
+     lit fmtdatestr $r->{released};
     end;
    end;
 
@@ -520,7 +520,7 @@ sub browse {
       my($s, $n, $l) = @_;
       Tr;
        td class => 'tc1';
-        lit $self->{l10n}->datestr($l->{released});
+        lit fmtdatestr $l->{released};
        end;
        td class => 'tc2', $l->{minage} < 0 ? '' : minage $l->{minage};
        td class => 'tc3';
diff --git a/lib/VNDB/Handler/Staff.pm b/lib/VNDB/Handler/Staff.pm
index a6d59cbf..d4de2bf9 100644
--- a/lib/VNDB/Handler/Staff.pm
+++ b/lib/VNDB/Handler/Staff.pm
@@ -138,7 +138,7 @@ sub _roles {
       my($r, $n, $l) = @_;
       Tr;
        td class => 'tc1'; a href => "/v$l->{vid}", title => $l->{t_original}||$l->{title}, shorten $l->{title}, 60; end;
-       td class => 'tc2'; lit $self->{l10n}->datestr($l->{c_released}); end;
+       td class => 'tc2'; lit fmtdatestr $l->{c_released}; end;
        td class => 'tc3', $self->{staff_roles}{$l->{role}};
        td class => 'tc4', title => $l->{original}||$l->{name}, $l->{name};
        td class => 'tc5', $l->{note};
@@ -167,7 +167,7 @@ sub _cast {
       my($r, $n, $l) = @_;
       Tr;
        td class => 'tc1'; a href => "/v$l->{vid}", title => $l->{t_original}||$l->{title}, shorten $l->{title}, 60; end;
-       td class => 'tc2'; lit $self->{l10n}->datestr($l->{c_released}); end;
+       td class => 'tc2'; lit fmtdatestr $l->{c_released}; end;
        td class => 'tc3'; a href => "/c$l->{cid}", title => $l->{c_original}, $l->{c_name}; end;
        td class => 'tc4', title => $l->{original}||$l->{name}, $l->{name};
        td class => 'tc5', $l->{note};
diff --git a/lib/VNDB/Handler/Tags.pm b/lib/VNDB/Handler/Tags.pm
index 3e6a37d1..bb6dd2d4 100644
--- a/lib/VNDB/Handler/Tags.pm
+++ b/lib/VNDB/Handler/Tags.pm
@@ -227,7 +227,7 @@ sub tagedit {
     [ input    => short => 'name',     name => mt '_tagedit_frm_name' ],
     $self->authCan('tagmod') ? (
       $tag ?
-        [ static   => label => mt('_tagedit_frm_by'), content => $self->{l10n}->userstr($t->{addedby}, $t->{username}) ] : (),
+        [ static   => label => mt('_tagedit_frm_by'), content => fmtuser($t->{addedby}, $t->{username}) ] : (),
       [ select   => short => 'state',    name => mt('_tagedit_frm_state'), options => [
         map [$_, mt '_tagedit_frm_state'.$_], 0..2 ] ],
       [ checkbox => short => 'meta',     name => mt '_tagedit_frm_meta' ],
@@ -328,7 +328,7 @@ sub taglist {
       row => sub {
         my($s, $n, $l) = @_;
         Tr;
-         td class => 'tc1', $self->{l10n}->age($l->{added});
+         td class => 'tc1', fmtage $l->{added};
          td class => 'tc3';
           a href => "/g$l->{id}", $l->{name};
           if($f->{t} == -1) {
@@ -434,9 +434,7 @@ sub taglinks {
     row      => sub {
       my($s, $n, $l) = @_;
       Tr;
-       td class => 'tc1';
-        lit $self->{l10n}->date($l->{date});
-       end;
+       td class => 'tc1', fmtdate $l->{date};
        td class => 'tc2';
         a href => $url->(u=>$l->{uid}), class => 'setfil', '> ' if !$f->{u};
         a href => "/u$l->{uid}", $l->{username};
@@ -642,7 +640,7 @@ sub tagindex {
      ul;
       for (@$r) {
         li;
-         txt $self->{l10n}->age($_->{added});
+         txt fmtage $_->{added};
          txt ' ';
          a href => "/g$_->{id}", $_->{name};
         end;
@@ -673,7 +671,7 @@ sub tagindex {
       li mt '_tagidx_queue_empty' if !@$r;
       for (@$r) {
         li;
-         txt $self->{l10n}->age($_->{added});
+         txt fmtage $_->{added};
          txt ' ';
          a href => "/g$_->{id}", $_->{name};
         end;
diff --git a/lib/VNDB/Handler/Traits.pm b/lib/VNDB/Handler/Traits.pm
index 8d689581..4b106fa2 100644
--- a/lib/VNDB/Handler/Traits.pm
+++ b/lib/VNDB/Handler/Traits.pm
@@ -215,7 +215,7 @@ sub traitedit {
     [ input    => short => 'name',     name => mt '_traite_frm_name' ],
     $self->authCan('tagmod') ? (
       $t ?
-        [ static   => label => mt('_traite_frm_by'), content => $self->{l10n}->userstr($t->{addedby}, $t->{username}) ] : (),
+        [ static   => label => mt('_traite_frm_by'), content => fmtuser($t->{addedby}, $t->{username}) ] : (),
       [ select   => short => 'state',    name => mt('_traite_frm_state'), options => [
         map [$_, mt '_traite_frm_state'.$_], 0..2 ] ],
       [ checkbox => short => 'meta',     name => mt '_traite_frm_meta' ]
@@ -302,7 +302,7 @@ sub traitlist {
       row => sub {
         my($s, $n, $l) = @_;
         Tr;
-         td class => 'tc1', $self->{l10n}->age($l->{added});
+         td class => 'tc1', fmtage $l->{added};
          td class => 'tc3';
           if($l->{group}) {
             b class => 'grayedout', $l->{groupname}.' / ';
@@ -347,7 +347,7 @@ sub traitindex {
      ul;
       for (@$r) {
         li;
-         txt $self->{l10n}->age($_->{added});
+         txt fmtage $_->{added};
          txt ' ';
          b class => 'grayedout', $_->{groupname}.' / ' if $_->{group};
          a href => "/i$_->{id}", $_->{name};
@@ -379,7 +379,7 @@ sub traitindex {
       li mt '_traiti_queue_empty' if !@$r;
       for (@$r) {
         li;
-         txt $self->{l10n}->age($_->{added});
+         txt fmtage $_->{added};
          txt ' ';
          b class => 'grayedout', $_->{groupname}.' / ' if $_->{group};
          a href => "/i$_->{id}", $_->{name};
diff --git a/lib/VNDB/Handler/ULists.pm b/lib/VNDB/Handler/ULists.pm
index 9a54e852..a19be8e9 100644
--- a/lib/VNDB/Handler/ULists.pm
+++ b/lib/VNDB/Handler/ULists.pm
@@ -190,7 +190,7 @@ sub votelist {
       Tr;
        td class => 'tc1';
         input type => 'checkbox', name => 'vid', value => $l->{vid} if $own;
-        txt ' '.$self->{l10n}->date($l->{date});
+        txt ' '.fmtdate $l->{date};
        end;
        td class => 'tc2', fmtvote $l->{vote};
        td class => 'tc3';
@@ -299,7 +299,7 @@ sub wishlist {
         a href => "/v$i->{vid}", title => $i->{original}||$i->{title}, ' '.shorten $i->{title}, 70;
        end;
        td class => 'tc2', $self->{wishlist_status}[$i->{wstat}];
-       td class => 'tc3', $self->{l10n}->date($i->{added}, 'compact');
+       td class => 'tc3', fmtdate $i->{added}, 'compact';
       end;
     },
     $own ? (footer => sub {
@@ -471,7 +471,7 @@ sub _vnlist_browse {
           input type => 'checkbox', name => 'rid', value => $_->{rid} if $own;
          end;
          td class => 'tc3';
-          lit $self->{l10n}->datestr($_->{released});
+          lit fmtdatestr $_->{released};
          end;
          td class => 'tc4';
           cssicon "lang $_", $self->{languages}{$_} for @{$_->{languages}};
diff --git a/lib/VNDB/Handler/Users.pm b/lib/VNDB/Handler/Users.pm
index e7fd9a4f..8c72ba82 100644
--- a/lib/VNDB/Handler/Users.pm
+++ b/lib/VNDB/Handler/Users.pm
@@ -54,7 +54,7 @@ sub userpage {
 
     Tr;
      td mt '_userpage_registered';
-     td $self->{l10n}->date($u->{registered});
+     td fmtdate $u->{registered};
     end;
 
     Tr;
@@ -504,7 +504,7 @@ sub posts {
       Tr;
        td class => 'tc1'; a href => "/t$l->{tid}.$l->{num}", 't'.$l->{tid}; end;
        td class => 'tc2'; a href => "/t$l->{tid}.$l->{num}", '.'.$l->{num}; end;
-       td class => 'tc3', $self->{l10n}->date($l->{date});
+       td class => 'tc3', fmtdate $l->{date};
        td class => 'tc4';
         a href => "/t$l->{tid}.$l->{num}", $l->{title};
         b class => 'grayedout'; lit bb2html $l->{msg}, 150; end;
@@ -613,7 +613,7 @@ sub list {
        td class => 'tc1';
         a href => '/u'.$l->{id}, $l->{username};
        end;
-       td class => 'tc2', $self->{l10n}->date($l->{registered});
+       td class => 'tc2', fmtdate $l->{registered};
        td class => 'tc3'.($l->{hide_list} && $self->authCan('usermod') ? ' linethrough' : '');
         lit $l->{hide_list} && !$self->authCan('usermod') ? '-' : !$l->{c_votes} ? 0 :
           qq|<a href="/u$l->{id}/votes">$l->{c_votes}</a>|;
@@ -714,7 +714,7 @@ sub notifies {
           input type => 'checkbox', name => 'notifysel', value => "$l->{id}";
          end;
          td class => 'tc2', mt "_usern_type_$l->{ntype}";
-         td class => 'tc3', $self->{l10n}->age($l->{date});
+         td class => 'tc3', fmtage $l->{date};
          td class => 'tc4';
           a href => "/u$uid/notify/$l->{id}", "$l->{ltype}$l->{iid}".($l->{subid}?".$l->{subid}":'');
          end;
diff --git a/lib/VNDB/Handler/VNPage.pm b/lib/VNDB/Handler/VNPage.pm
index 055e2831..89cd9940 100644
--- a/lib/VNDB/Handler/VNPage.pm
+++ b/lib/VNDB/Handler/VNPage.pm
@@ -161,7 +161,7 @@ my @rel_cols = (
     column_string => '_relinfo_released',
     button_string => '_relinfo_released',
     default       => 1,
-    draw          => sub { lit $TUWF::OBJ->{l10n}->datestr($_[0]{released}) },
+    draw          => sub { lit fmtdatestr $_[0]{released} },
   }, { # Age rating
     id            => 'min',
     sort_field    => 'minage',
@@ -718,7 +718,6 @@ sub _affiliate_links {
   return if !@$links;
 
   $links = [ sort { $b->{priority}||$self->{affiliates}[$b->{affiliate}]{default_prio} <=> $a->{priority}||$self->{affiliates}[$a->{affiliate}]{default_prio} } @$links ];
-  my $en = VNDB::L10N->get_handle('en');
 
   Tr id => 'buynow';
    td 'Available at';
@@ -736,7 +735,7 @@ sub _affiliate_links {
          || $version;
        txt " at $f->{name}";
        abbr class => 'pricenote', title =>
-           $link->{lastfetch} ? sprintf('Last updated: %s.', $en->age($link->{lastfetch})) : '', " for $link->{price}"
+           $link->{lastfetch} ? sprintf('Last updated: %s.', fmtage($link->{lastfetch})) : '', " for $link->{price}"
          if $link->{price};
        txt ' »';
       end;
@@ -779,7 +778,7 @@ sub _releases {
       end;
       for my $rel (grep grep($_ eq $l, @{$_->{languages}}), @$r) {
         Tr;
-         td class => 'tc1'; lit $self->{l10n}->datestr($rel->{released}); end;
+         td class => 'tc1'; lit fmtdatestr $rel->{released}; end;
          td class => 'tc2', $rel->{minage} < 0 ? '' : minage $rel->{minage};
          td class => 'tc3';
           for (sort @{$rel->{platforms}}) {