Make the po location configurable

diff --git a/bin/create_index_pages b/bin/create_index_pages
index 6dd32a30b288da3c338d6fd2575e80663c99f889..6d08d60c554020364d22b462a80c8fa610ea5388 100755 (executable)
--- a/bin/create_index_pages
+++ b/bin/create_index_pages
@@ -20,6 +20,7 @@ use Packages::Page;
 use Packages::SrcPage;
 use Packages::Sections;
 &Packages::Config::init( './' );
+&Packages::I18N::Locale::load( "$TOPDIR/po" );
 
 my $wwwdir = "$TOPDIR/www";
 

diff --git a/bin/parse-debtags-voc b/bin/parse-debtags-voc
index 4fd49f9e6b2bedb93eb5cec77e57c02e6a871209..be251781a89616dafd66b880f84473a15675ca88 100755 (executable)
--- a/bin/parse-debtags-voc
+++ b/bin/parse-debtags-voc
@@ -34,6 +34,7 @@ use Packages::Template;
 use Packages::Config qw( $TOPDIR @LANGUAGES );
 use Packages::I18N::Locale;
 &Packages::Config::init( './' );
+&Packages::I18N::Locale::load( "$TOPDIR/po" );
 my $debtagsdir = "$TOPDIR/files/debtags";
 my $wwwdir = "$TOPDIR/www/about";
 my $voc_file = "$debtagsdir/vocabulary";

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index 4d5e16e01ece6bfa5740e5db155cb2b20bb9c8a9..9d80f68e1d7c681bf5e193b74f3eb8405015a9e8 100755 (executable)
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -91,6 +91,7 @@ sub do_dispatch {
     my $homedir = dirname($ENV{SCRIPT_FILENAME}).'/../';
     &Packages::Config::init( $homedir );
     &Packages::DB::init();
+    &Packages::I18N::Locale::load( "$homedir/po" );
 
     my $acc = I18N::AcceptLanguage->new();
     my %all_langs = map { $_ => 1 } (@LANGUAGES, @DDTP_LANGUAGES);

diff --git a/lib/Packages/DoDownload.pm b/lib/Packages/DoDownload.pm
index 566195a7c629144395992e62cdf0f4b6bbb89d5f..d999b9a042d6d06853c4ab9652e1bf4e68d9cf07 100644 (file)
--- a/lib/Packages/DoDownload.pm
+++ b/lib/Packages/DoDownload.pm
@@ -10,7 +10,6 @@ use Benchmark ':hireswallclock';
 use Exporter;
 
 use Deb::Versions;
-use Packages::I18N::Locale;
 use Packages::Search qw( :all );
 use Packages::Config qw( $DBDIR @SUITES @ARCHIVES @SECTIONS @ARCHITECTURES );
 use Packages::CGI;

diff --git a/lib/Packages/DoFilelist.pm b/lib/Packages/DoFilelist.pm
index 188cfb8bd6e59acedfc5e3dc1daeeb25dadad7f3..ee092e3163ccc1e7afbea4be8eb7a4779925db07 100644 (file)
--- a/lib/Packages/DoFilelist.pm
+++ b/lib/Packages/DoFilelist.pm
@@ -10,7 +10,6 @@ use Exporter;
 use Deb::Versions;
 use Packages::Config qw( $DBDIR $ROOT @SUITES @ARCHIVES @SECTIONS
                         @ARCHITECTURES %FTP_SITES );
-use Packages::I18N::Locale;
 use Packages::CGI;
 use Packages::DB;
 use Packages::Search qw( :all );

diff --git a/lib/Packages/DoIndex.pm b/lib/Packages/DoIndex.pm
index 164e594884d5c35021aeb55741af60f410d1ab1d..a0cae2baf2f435cff7fa59f1f698d1d2ee19894c 100644 (file)
--- a/lib/Packages/DoIndex.pm
+++ b/lib/Packages/DoIndex.pm
@@ -8,7 +8,6 @@ use Exporter;
 
 use Deb::Versions;
 use Packages::Config qw( $TOPDIR );
-use Packages::I18N::Locale;
 use Packages::CGI;
 
 our @ISA = qw( Exporter );

diff --git a/lib/Packages/DoNewPkg.pm b/lib/Packages/DoNewPkg.pm
index 66a0bfe7b3863076109d476d82da8959f3d6aa2f..44960896ec23061af29edf30453ab0237166e01a 100644 (file)
--- a/lib/Packages/DoNewPkg.pm
+++ b/lib/Packages/DoNewPkg.pm
@@ -9,7 +9,6 @@ use Exporter;
 our @ISA = qw( Exporter );
 our @EXPORT = qw( do_newpkg );
 
-use Packages::I18N::Locale;
 use Packages::Search qw( :all );
 use Packages::CGI;
 use Packages::DB;

diff --git a/lib/Packages/DoSearch.pm b/lib/Packages/DoSearch.pm
index 1aa67f1d327bf3f10a5e7da9730a628320862f8b..9fa8d3daad5db7423de408e7d99ca0df98e8ee76 100644 (file)
--- a/lib/Packages/DoSearch.pm
+++ b/lib/Packages/DoSearch.pm
@@ -10,7 +10,6 @@ our @ISA = qw( Exporter );
 our @EXPORT = qw( do_search );
 
 use Deb::Versions;
-use Packages::I18N::Locale;
 use Packages::Search qw( :all );
 use Packages::CGI qw( :DEFAULT );
 use Packages::DB;

diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index 5d6174c734d5f5ba0d0a395ffda1daaec3a877a5..1d41c3a98c964d6ab235527a06936bffb7a12c39 100644 (file)
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -14,7 +14,6 @@ use Deb::Versions;
 use Packages::Config qw( $DBDIR @SUITES @ARCHIVES @SECTIONS
                         @ARCHITECTURES %FTP_SITES
                         @LANGUAGES @DDTP_LANGUAGES);
-use Packages::I18N::Locale;
 use Packages::CGI qw( :DEFAULT make_url make_search_url );
 use Packages::DB;
 use Packages::Search qw( :all );

diff --git a/lib/Packages/I18N/Locale.pm b/lib/Packages/I18N/Locale.pm
index 3b4ecc606d7c3dea3eaf47de4fa58258ddbe8707..c65c9b70d3f6a6f5ed7dab8bdf4349adae91e8a5 100644 (file)
--- a/lib/Packages/I18N/Locale.pm
+++ b/lib/Packages/I18N/Locale.pm
@@ -4,25 +4,31 @@ use strict;
 use warnings;
 
 use base 'Locale::Maketext';
-use Locale::Maketext::Lexicon {
-    'en' => [Gettext => '/home/djpig/debian/www.d.o/packages/po/pdo.pot',
-            Gettext => '/home/djpig/debian/www.d.o/packages/po/templates.pot',
-            Gettext => '/home/djpig/debian/www.d.o/packages/po/langs.pot',
-            Gettext => '/home/djpig/debian/www.d.o/packages/po/sections.pot',
-            Gettext => '/home/djpig/debian/www.d.o/packages/po/debtags.pot'],
-    '*' => [Gettext => '/home/djpig/debian/www.d.o/packages/po/pdo.*.po',
-           Gettext => '/home/djpig/debian/www.d.o/packages/po/templates.*.po',
-           Gettext => '/home/djpig/debian/www.d.o/packages/po/langs.*.po',
-           Gettext => '/home/djpig/debian/www.d.o/packages/po/sections.*.po',
-           Gettext => '/home/djpig/debian/www.d.o/packages/po/debtags.*.po'],
-    _auto   => 1,
-    _style  => 'gettext',
-};
+use Locale::Maketext::Lexicon;
 
 use base 'Exporter';
 
 our @EXPORT = qw( N_ );
 
+sub load {
+    my ($podir) = @_;
+
+    Locale::Maketext::Lexicon->import( {
+       'en' => [Gettext => "$podir/pdo.pot",
+                Gettext => "$podir/templates.pot",
+                Gettext => "$podir/langs.pot",
+                Gettext => "$podir/sections.pot",
+                Gettext => "$podir/debtags.pot"],
+       '*' => [Gettext => "$podir/pdo.*.po",
+               Gettext => "$podir/templates.*.po",
+               Gettext => "$podir/langs.*.po",
+               Gettext => "$podir/sections.*.po",
+               Gettext => "$podir/debtags.*.po"],
+       _auto   => 1,
+       _style  => 'gettext',
+                                      } );
+}
+
 sub N_ { return $_[0]; }
 
 sub g {