DoShow.pm, html/search.tmpl: Improve msgids that were hard to localize.

[deb/packages.git] / lib / Packages / I18N / Locale.pm

diff --git a/lib/Packages/I18N/Locale.pm b/lib/Packages/I18N/Locale.pm
index 10fc3cc46e8e8f9554c36140b152c45badc1334c..fd987586020433cdf80680c4262f9950774d3f71 100644 (file)
--- a/lib/Packages/I18N/Locale.pm
+++ b/lib/Packages/I18N/Locale.pm
@@ -7,8 +7,10 @@ use Exporter;
 use Locale::gettext;
 
 our @ISA = qw( Exporter );
-our @EXPORT = qw( get_locale get_charset _g _ N_ );
-
+# the reason we have both _g and _ is simply that there
+# seem to be some situations where Perl doesn't handle _
+# correctly. If in doubt use _g
+our @EXPORT = qw( get_locale get_charset _g N_ );
 
 my %lang2loc = ( en => "en_US",
                 cs => "cs_CZ",
@@ -19,12 +21,9 @@ my %lang2loc = ( en => "en_US",
                 default => "en_US",
                 );
 
-# most of them can probably changed to UTF-8 in Sarge
-# as there are more available UTF-8 locales then
+# this can probably be removed now that all locales are available in UTF-8
 my %lang2charset = (
                    default => 'UTF-8',
-                   ja => 'EUC-JP',
-                   uk => 'KOI8-U',
                    );
 
 sub get_locale {
@@ -50,7 +49,11 @@ sub get_charset {
     return $lang2charset{$lang} || $lang2charset{default};
 }
 
-sub _ { return gettext( $_[0] ) }
+sub tt_gettext {
+    my ($str, @args) = @_;
+    return dgettext( 'templates', $str ) unless @args;
+    return sprintf(dgettext( 'templates', $str ), @args);
+}
 sub _g { return gettext( $_[0] ) }
 sub N_ { return $_[0] }