From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Sun, 25 Nov 2007 11:52:26 +0000 (+0100)
Subject: Use the web names for languages instead of locale names
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=a3fd68e78cd0c1eb1dbff6b48accaca5b2b54637;p=deb%2Fpackages.git

Use the web names for languages instead of locale names

i.e. pt-br instead of pt_BR. This is how they are sent by the browsers.
Since the DDTP uses the locale names, we need to transform between the
two forms in synctrans and parse-translations.
---

diff --git a/bin/parse-translations b/bin/parse-translations
index 0958204..3146024 100755
--- a/bin/parse-translations
+++ b/bin/parse-translations
@@ -46,8 +46,9 @@ $/ = "";
 my $fixja = Text::Iconv->new("EUC-JP", "UTF-8");
 
 foreach my $lang (@DDTP_LANGUAGES) {
-    print "Reading Translations for $lang...";
-    open PKG, "zcat $TOPDIR/archive/*/*/*/i18n/Translation-$lang.gz|";
+    (my $locale = $lang) =~ s/^([a-z]{2})-([a-z]{2})$/"$1_".uc($2)/e;
+    print "Reading Translations for $lang ($locale)...";
+    open PKG, "zcat $TOPDIR/archive/*/*/*/i18n/Translation-$locale.gz|";
     my $count = 0;
     while (<PKG>) {
 	next if /^\s*$/;
@@ -64,12 +65,13 @@ foreach my $lang (@DDTP_LANGUAGES) {
 	# Skip double descriptions
 	next if exists($descriptions{$data{"description-md5"}}{$lang});
 	# some weirdnesses in the files
-	next unless defined $data{"description-".lc($lang)};
+	next unless defined $data{"description-".lc($locale)};
 	if ($lang eq 'ja') {
 	    my $fixed = $fixja->convert($data{"description-ja"});
 	    $data{"description-ja"} = $fixed if $fixed;
 	}
-	$descriptions{$data{"description-md5"}}{$lang} = $data{"description-".lc($lang)};
+	$descriptions{$data{"description-md5"}}{$lang} =
+	    $data{"description-".lc($locale)};
 	$count++;
     }
     print "($count)\n";
diff --git a/config.sh.sed.in b/config.sh.sed.in
index bea71b8..6c2bf7c 100644
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -37,7 +37,7 @@ root=""
 # Architectures
 #
 polangs="de fi fr hu ja nl sv uk"
-ddtplangs="ca cs da de eo es fi fr go hu it ja km_KH ko nl pl pt pt_BR ru sk sv uk zh zh_CN zh_TW"
+ddtplangs="ca cs da de eo es fi fr go hu it ja km-kh ko nl pl pt pt-br ru sk sv uk zh zh-cn zh-tw"
 archives="us security amd64 gnuab backports volatile"
 sections="main contrib non-free"
 parts="$sections"
diff --git a/cron.d/120synctrans b/cron.d/120synctrans
index 115b59f..437aa92 100755
--- a/cron.d/120synctrans
+++ b/cron.d/120synctrans
@@ -19,9 +19,10 @@ then
 	  test -d us/${dist}/${part}/i18n || mkdir -p us/${dist}/${part}/i18n
 	  for lang in $ddtplangs
 	  do
-	    echo retrieve translated Descs $dist/$part/$lang
+	    locale=$(echo $lang|perl -p -e 's/^([a-z]{2})-([a-z]{2})$/"$1_".uc($2)/e')
+	    echo "retrieve translated Descs $dist/$part/$lang ($locale)"
             (cd us/${dist}/${part}/i18n &&
-                wget -q -N ${ddtp_ftpsite}/dists/${dist}/${part}/i18n/Translation-$lang.gz)
+                wget -q -N ${ddtp_ftpsite}/dists/${dist}/${part}/i18n/Translation-$locale.gz)
 	  done
 	done
     done