Remove all uses of $localedir

All users use the .po files directly now, not the .mo files

diff --git a/bin/create_index_pages b/bin/create_index_pages
index 973dff71685af3d51d518fc06a1f7eec67d1da50..6dd32a30b288da3c338d6fd2575e80663c99f889 100755 (executable)
--- a/bin/create_index_pages
+++ b/bin/create_index_pages
@@ -13,7 +13,7 @@ use Compress::Zlib;
 
 use lib './lib';
 
-use Packages::Config qw( $TOPDIR $DBDIR @ARCHIVES @SUITES @LANGUAGES $LOCALES);
+use Packages::Config qw( $TOPDIR $DBDIR @ARCHIVES @SUITES @LANGUAGES );
 use Packages::Template;
 use Packages::I18N::Locale;
 use Packages::Page;

diff --git a/bin/parse-debtags-voc b/bin/parse-debtags-voc
index 7ef06a08144a9e648423d72aed431961cd849e35..4fd49f9e6b2bedb93eb5cec77e57c02e6a871209 100755 (executable)
--- a/bin/parse-debtags-voc
+++ b/bin/parse-debtags-voc
@@ -31,7 +31,7 @@ use URI::Escape;
 
 use Deb::Versions;
 use Packages::Template;
-use Packages::Config qw( $TOPDIR @LANGUAGES $LOCALES);
+use Packages::Config qw( $TOPDIR @LANGUAGES );
 use Packages::I18N::Locale;
 &Packages::Config::init( './' );
 my $debtagsdir = "$TOPDIR/files/debtags";

diff --git a/config.sh.sed.in b/config.sh.sed.in
index 42978b751569c785bfea8df98bcbd89b68e7ed4f..bea71b8dbc2264c52a102e7d46618c7bec9b1aea 100644 (file)
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -11,7 +11,6 @@ filesdir=${topdir}/files
 htmldir=${topdir}/www
 archivedir=${topdir}/archive
 podir=${topdir}/po
-localedir=%TOPDIR%/locale
 staticdir=${topdir}/static
 configdir=${topdir}/conf
 templatedir=${topdir}/templates

diff --git a/cron.d/500update_mo b/cron.d/500update_mo
index 4bdc6252d1a60f118deeb3907873ed9f876a89f2..89f5452b68013e2ace9c8e192ffa1e2260b7198e 100755 (executable)
--- a/cron.d/500update_mo
+++ b/cron.d/500update_mo
@@ -96,18 +96,3 @@ do
       done
   fi
 done
-
-echo
-# Update mo
-#
-test -d ${localedir} || mkdir -p ${localedir}
-for lang in ${polangs}
-do 
-  test -d ${localedir}/${lang}/LC_MESSAGES \
-      || mkdir -p ${localedir}/${lang}/LC_MESSAGES
-  for domain in ${podomains}
-  do
-    echo domain=$domain language=$lang
-    msgfmt --statistics -o ${localedir}/${lang}/LC_MESSAGES/${domain}.mo ${domain}.${lang}.po
-  done
-done

diff --git a/lib/Packages/Config.pm b/lib/Packages/Config.pm
index 96f8b679ccc8c76ec5446abd1f51ee5096a5427b..b4ab33216bfda73aad3c66b38d073f838dd6ec4d 100644 (file)
--- a/lib/Packages/Config.pm
+++ b/lib/Packages/Config.pm
@@ -9,11 +9,11 @@ use Packages::CGI qw( :DEFAULT error );
 our @ISA = qw( Exporter );
 
 our ( $TOPDIR, $DBDIR, $TEMPLATEDIR, $CACHEDIR, $ROOT,
-      @LANGUAGES, @DDTP_LANGUAGES, $LOCALES,
+      @LANGUAGES, @DDTP_LANGUAGES,
       @SUITES, @SECTIONS, @ARCHIVES, @ARCHITECTURES,
       @PRIORITIES, %FTP_SITES );
 our @EXPORT_OK = qw( $TOPDIR $DBDIR $TEMPLATEDIR $CACHEDIR $ROOT
-                    @LANGUAGES @DDTP_LANGUAGES $LOCALES
+                    @LANGUAGES @DDTP_LANGUAGES
                     @SUITES @SECTIONS @ARCHIVES @ARCHITECTURES
                     @PRIORITIES %FTP_SITES  );
 our %EXPORT_TAGS = ( all => [ @EXPORT_OK ] );
@@ -35,7 +35,6 @@ sub init {
            $TEMPLATEDIR = $1 if /^\s*templatedir="?([^\"]*)"?\s*$/o;
            $CACHEDIR = $1 if /^\s*cachedir="?([^\"]*)"?\s*$/o;
            $ROOT = $1 if /^\s*root="?([^\"]*)"?\s*$/o;
-           $LOCALES = $1 if /^\s*localedir="?([^\"]*)"?\s*$/o;
            $FTP_SITES{us} = $1 if /^\s*ftpsite="?([^\"]*)"?\s*$/o;
            $FTP_SITES{$1} = $2 if /^\s*(\w+)_ftpsite="?([^\"]*)"?\s*$/o;
            @LANGUAGES = split(/\s+/, $1) if /^\s*polangs="?([^\"]*)"?\s*$/o;
@@ -46,7 +45,7 @@ sub init {
            @ARCHITECTURES = split(/\s+/, $1) if /^\s*architectures="?([^\"]*)"?\s*$/o;
            @PRIORITIES = split(/\s+/, $1) if /^\s*priorities="?([^\"]*)"?\s*$/o;
        }
-       foreach (($TEMPLATEDIR, $CACHEDIR, $LOCALES)) {
+       foreach (($TEMPLATEDIR, $CACHEDIR)) {
            s/\$\{?topdir\}?/$TOPDIR/g;
        }
        close (C);

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index e9b406f0257064f3da54b0c9b23447750ceaaf00..4d5e16e01ece6bfa5740e5db155cb2b20bb9c8a9 100755 (executable)
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -34,7 +34,7 @@ use I18N::AcceptLanguage;
 use Deb::Versions;
 use Packages::Config qw( $DBDIR $ROOT $TEMPLATEDIR $CACHEDIR
                         @SUITES @SECTIONS @ARCHIVES @ARCHITECTURES @PRIORITIES
-                        @LANGUAGES @DDTP_LANGUAGES $LOCALES );
+                        @LANGUAGES @DDTP_LANGUAGES );
 use Packages::CGI qw( :DEFAULT error get_all_messages );
 use Packages::DB;
 use Packages::Search qw( :all );