[Debian-l10n-commits] r2862 - in /dl10n/trunk: Changelog dl10n-html dl10n-spider doc/dl10n-spider_add-new-language.txt lib/Debian/L10n/BTS.pm lib/Debian/L10n/Html.pm lib/Debian/L10n/Spider.pm lib/Debian/L10n/Utils.pm
nekral-guest at users.alioth.debian.org
nekral-guest at users.alioth.debian.org
Sun Feb 12 14:25:39 UTC 2012
Author: nekral-guest
Date: Sun Feb 12 14:25:39 2012
New Revision: 2862
URL: http://svn.debian.org/wsvn/?sc=1&rev=2862
Log:
* dl10n-html, doc/dl10n-spider_add-new-language.txt,
lib/Debian/L10n/Html.pm: simplify the process for adding new
languages. Rely on the lists from lib/Debian/L10n/Utils.pm.
* lib/Debian/L10n/Utils.pm: Document the difference between
%LanguageList and %Language.
* dl10n-html: Execute for all languages when no language arguments
are provided.
* dl10n-spider: Fix synopsis. Language argument is optional.
* lib/Debian/L10n/BTS.pm, lib/Debian/L10n/Spider.pm: Indicate the
db name (i.e. language) when reporting BTS issues.
Modified:
dl10n/trunk/Changelog
dl10n/trunk/dl10n-html
dl10n/trunk/dl10n-spider
dl10n/trunk/doc/dl10n-spider_add-new-language.txt
dl10n/trunk/lib/Debian/L10n/BTS.pm
dl10n/trunk/lib/Debian/L10n/Html.pm
dl10n/trunk/lib/Debian/L10n/Spider.pm
dl10n/trunk/lib/Debian/L10n/Utils.pm
Modified: dl10n/trunk/Changelog
URL: http://svn.debian.org/wsvn/dl10n/trunk/Changelog?rev=2862&op=diff
==============================================================================
--- dl10n/trunk/Changelog (original)
+++ dl10n/trunk/Changelog Sun Feb 12 14:25:39 2012
@@ -1,3 +1,16 @@
+2012-02-12 Nicolas François <nicolas.francois at centraliens.net>
+
+ * dl10n-html, doc/dl10n-spider_add-new-language.txt,
+ lib/Debian/L10n/Html.pm: simplify the process for adding new
+ languages. Rely on the lists from lib/Debian/L10n/Utils.pm.
+ * lib/Debian/L10n/Utils.pm: Document the difference between
+ %LanguageList and %Language.
+ * dl10n-html: Execute for all languages when no language arguments
+ are provided.
+ * dl10n-spider: Fix synopsis. Language argument is optional.
+ * lib/Debian/L10n/BTS.pm, lib/Debian/L10n/Spider.pm: Indicate the
+ db name (i.e. language) when reporting BTS issues.
+
2012-02-12 Nicolas François <nicolas.francois at centraliens.net>
* lib/Debian/Pkg/Tar.pm: files with type 2 are links. They are not
Modified: dl10n/trunk/dl10n-html
URL: http://svn.debian.org/wsvn/dl10n/trunk/dl10n-html?rev=2862&op=diff
==============================================================================
--- dl10n/trunk/dl10n-html (original)
+++ dl10n/trunk/dl10n-html Sun Feb 12 14:25:39 2012
@@ -10,7 +10,7 @@
=head1 SYNOPSIS
-dl10n-spider [options] lang+
+dl10n-spider [options] [lang]+
=head1 DESCRIPTION
@@ -27,6 +27,7 @@
use Getopt::Long; #to parse the args
use LWP::UserAgent;
use Debian::L10n::Html;
+use Debian::L10n::Utils;
use File::Path;
use POSIX qw(strftime);
@@ -41,30 +42,6 @@
my $cmdline_month = undef;
my $cmdline_msg = undef;
my $cmdline_file = undef;
-
-my %Language = (
- ar => 'arabic',
- ca => 'catalan',
- cs => 'czech',
- da => 'danish',
- de => 'german',
- en => 'english',
- es => 'spanish',
- fr => 'french',
- gl => 'galician',
- id => 'indonesian',
- it => 'italian',
- nl => 'dutch',
-# pt => 'portuguese',
- pt_BR => 'brazilian',
- ro => 'romanian',
- ru => 'russian',
- sk => 'slovak',
- sv => 'swedish',
- tr => 'turkish',
- all => 'all',
- );
-
=head1 Command line option parsing
@@ -171,8 +148,11 @@
}
-my $lang = $ARGV[0];
-my $language = $Language{$lang};
+my @langs = @ARGV;
+ at langs = keys %Debian::L10n::Utils::Language unless @langs;
+
+foreach my $lang (@langs) {
+my $language = $Debian::L10n::Utils::Language{$lang};
Html::html($cmdline_file, $lang);
@@ -234,7 +214,7 @@
my @files = readdir D;
closedir D;
mkpath ("html/include", 02775) or die "Cannot create include directory\n" unless (-d "html/include");
- mkpath ("html/$Language{$lang}", 02775) or die "Cannot create $Language{$lang} directory\n" unless (-d "html/$Language{$lang}");
+ mkpath ("html/$Debian::L10n::Utils::Language{$lang}", 02775) or die "Cannot create $Debian::L10n::Utils::Language{$lang} directory\n" unless (-d "html/$Debian::L10n::Utils::Language{$lang}");
foreach (grep (/^$lang\./, @files)) {
next unless /\.inc$/;
@@ -245,13 +225,14 @@
open I, ">html/include/$_.inc" or die "Cannot open $_.inc $_";
print I @inc;
close I;
- open H, ">html/$Language{$lang}/$_.html" or die "Cannot open $_.html: $_";
+ open H, ">html/$Debian::L10n::Utils::Language{$lang}/$_.html" or die "Cannot open $_.html: $_";
print H $head;
print H @inc;
print H $tail;
close H;
}
}
+}
=head1 LICENSE
Modified: dl10n/trunk/dl10n-spider
URL: http://svn.debian.org/wsvn/dl10n/trunk/dl10n-spider?rev=2862&op=diff
==============================================================================
--- dl10n/trunk/dl10n-spider (original)
+++ dl10n/trunk/dl10n-spider Sun Feb 12 14:25:39 2012
@@ -10,7 +10,7 @@
=head1 SYNOPSIS
-dl10n-spider [options] lang+
+dl10n-spider [options] [lang]+
=head1 DESCRIPTION
Modified: dl10n/trunk/doc/dl10n-spider_add-new-language.txt
URL: http://svn.debian.org/wsvn/dl10n/trunk/doc/dl10n-spider_add-new-language.txt?rev=2862&op=diff
==============================================================================
--- dl10n/trunk/doc/dl10n-spider_add-new-language.txt (original)
+++ dl10n/trunk/doc/dl10n-spider_add-new-language.txt Sun Feb 12 14:25:39 2012
@@ -2,10 +2,6 @@
1. Add support for the new language in the dl10n tools
- * dl10n-html
- Add the new language to %Language
- * lib/Debian/L10n/Html.pm
- Add the new language to %LanguageList and %Language
* lib/Debian/L10n/Utils.pm
Add the new language to %LanguageList and %Language
* Changelog
Modified: dl10n/trunk/lib/Debian/L10n/BTS.pm
URL: http://svn.debian.org/wsvn/dl10n/trunk/lib/Debian/L10n/BTS.pm?rev=2862&op=diff
==============================================================================
--- dl10n/trunk/lib/Debian/L10n/BTS.pm (original)
+++ dl10n/trunk/lib/Debian/L10n/BTS.pm Sun Feb 12 14:25:39 2012
@@ -141,7 +141,7 @@
if ( ($pkg_bug ne $pkg)
and ($src_bug ne $pkg)
and ($pkg_bug ne "wnpp")) {
- warn "Warning: #$bug_nb filled against $pkg_bug (source: $src_bug) but $pkg is in the database\n";
+ warn "Warning: #$bug_nb filled against $pkg_bug (source: $src_bug) but $pkg is in the database $dbName\n";
}
$opendate{$bug_nb} = Date::Format::time2str("%Y-%m-%d %T %z", $soap_bugs->{$bug_nb}->{date}, "GMT");
$bugsubmitter{$bug_nb} = parse_submitter($soap_bugs->{$bug_nb}->{originator});
Modified: dl10n/trunk/lib/Debian/L10n/Html.pm
URL: http://svn.debian.org/wsvn/dl10n/trunk/lib/Debian/L10n/Html.pm?rev=2862&op=diff
==============================================================================
--- dl10n/trunk/lib/Debian/L10n/Html.pm (original)
+++ dl10n/trunk/lib/Debian/L10n/Html.pm Sun Feb 12 14:25:39 2012
@@ -27,6 +27,7 @@
use LWP::UserAgent;
use Digest::MD5 qw(md5_base64);
use Debian::L10n::Db;
+use Debian::L10n::Utils;
use Time::Local 'timelocal';
use File::Path;
@@ -70,51 +71,6 @@
'po-man' => 'man', # nobody uses po4a so far, but it may come
);
-my %LanguageList = (
- ar => 'arabic',
- ca => 'catalan',
- cs => 'czech',
- da => 'danish',
- de => 'german',
- en => 'english',
- es => 'spanish',
- fr => 'french',
- gl => 'galician',
- id => 'indonesian',
- it => 'italian',
- nl => 'dutch',
-# pt => 'portuguese',
- pt_BR => 'portuguese',
- ro => 'romanian',
- ru => 'russian',
- sk => 'slovak',
- sv => 'swedish',
- tr => 'turkish',
- all => 'all',
- );
-my %Language = (
- ar => 'arabic',
- ca => 'catalan',
- cs => 'czech',
- da => 'danish',
- de => 'german',
- en => 'english',
- es => 'spanish',
- fr => 'french',
- gl => 'galician',
- id => 'indonesian',
- it => 'italian',
- nl => 'dutch',
-# pt => 'portuguese',
- pt_BR => 'brazilian',
- ro => 'romanian',
- ru => 'russian',
- sk => 'slovak',
- sv => 'swedish',
- tr => 'turkish',
- all => 'all',
- );
-
=head2 check_bts
check_bts searches in the BTS for open bugs, it fixes the bug submission date
@@ -186,7 +142,7 @@
$translator = "" if $status eq "maj";
$list =~ /^(\d\d\d\d)-(\d\d)-(\d\d\d\d\d)$/;
- $list = "<a href=\"http://lists.debian.org/debian-l10n-$LanguageList{$lang}/$1/debian-l10n-$LanguageList{$lang}-$1$2/msg$3.html\">[$1-$2-$3]</a>";
+ $list = "<a href=\"http://lists.debian.org/debian-l10n-$Debian::L10n::Utils::LanguageList{$lang}/$1/debian-l10n-$Debian::L10n::Utils::LanguageList{$lang}-$1$2/msg$3.html\">[$1-$2-$3]</a>";
$bug_nb = $bug_nb ? "<a href=\"http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=$bug_nb\">#$bug_nb</a>"
: "";
@@ -278,7 +234,7 @@
$date =~ s/\ \+0000//;
$list =~ /^(\d\d\d\d)-(\d\d)-(\d\d\d\d\d)$/;
- $list = "<a href=\"http://lists.debian.org/debian-l10n-$LanguageList{$lang}/$1/debian-l10n-$LanguageList{$lang}-$1$2/msg$3.html\">[$1-$2-$3]</a>";
+ $list = "<a href=\"http://lists.debian.org/debian-l10n-$Debian::L10n::Utils::LanguageList{$lang}/$1/debian-l10n-$Debian::L10n::Utils::LanguageList{$lang}-$1$2/msg$3.html\">[$1-$2-$3]</a>";
$sbug_nb = $sbug_nb ? "<a href=\"http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=$sbug_nb\">#$sbug_nb</a>"
: "";
@@ -375,7 +331,7 @@
$date =~ s/\ \+0000//;
$list =~ /^(\d\d\d\d)-(\d\d)-(\d\d\d\d\d)$/;
- $list = "<a href=\"http://lists.debian.org/debian-l10n-$LanguageList{$lang}/$1/debian-l10n-$LanguageList{$lang}-$1$2/msg$3.html\">[$1-$2-$3]</a>";
+ $list = "<a href=\"http://lists.debian.org/debian-l10n-$Debian::L10n::Utils::LanguageList{$lang}/$1/debian-l10n-$Debian::L10n::Utils::LanguageList{$lang}-$1$2/msg$3.html\">[$1-$2-$3]</a>";
$bug_nb = $bug_nb ? "<a href=\"http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=$bug_nb\">#$bug_nb</a>"
: "";
@@ -471,7 +427,7 @@
$date =~ s/\ \+0000//;
$list =~ /^(\d\d\d\d)-(\d\d)-(\d\d\d\d\d)$/;
- $list = "<a href=\"http://lists.debian.org/debian-l10n-$LanguageList{$lang}/$1/debian-l10n-$LanguageList{$lang}-$1$2/msg$3.html\">[$1-$2-$3]</a>";
+ $list = "<a href=\"http://lists.debian.org/debian-l10n-$Debian::L10n::Utils::LanguageList{$lang}/$1/debian-l10n-$Debian::L10n::Utils::LanguageList{$lang}-$1$2/msg$3.html\">[$1-$2-$3]</a>";
$bug_nb = $bug_nb ? "<a href=\"http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=$bug_nb\">#$bug_nb</a>"
: "";
@@ -576,7 +532,7 @@
$date =~ s/\ \+0000//;
$list =~ /^(\d\d\d\d)-(\d\d)-(\d\d\d\d\d)$/;
- $list = "<a href=\"http://lists.debian.org/debian-l10n-$LanguageList{$lang}/$1/debian-l10n-$LanguageList{$lang}-$1$2/msg$3.html\">[$1-$2-$3]</a>";
+ $list = "<a href=\"http://lists.debian.org/debian-l10n-$Debian::L10n::Utils::LanguageList{$lang}/$1/debian-l10n-$Debian::L10n::Utils::LanguageList{$lang}-$1$2/msg$3.html\">[$1-$2-$3]</a>";
$bug_nb = $bug_nb ? "<a href=\"http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=$bug_nb\">#$bug_nb</a>"
: "";
@@ -662,7 +618,7 @@
$date =~ s/\ \+0000//;
$list =~ /^(\d\d\d\d)-(\d\d)-(\d\d\d\d\d)$/;
- $list = "<a href=\"http://lists.debian.org/debian-l10n-$LanguageList{$lang}/$1/debian-l10n-$LanguageList{$lang}-$1$2/msg$3.html\">[$1-$2-$3]</a>";
+ $list = "<a href=\"http://lists.debian.org/debian-l10n-$Debian::L10n::Utils::LanguageList{$lang}/$1/debian-l10n-$Debian::L10n::Utils::LanguageList{$lang}-$1$2/msg$3.html\">[$1-$2-$3]</a>";
$bug_nb = $bug_nb ? "<a href=\"http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=$bug_nb\">#$bug_nb</a>"
: "";
@@ -711,13 +667,13 @@
my @langs;
if (m/^all$/i) {
- @langs = keys %Language;
+ @langs = keys %Debian::L10n::Utils::Language;
} else {
@langs = ($_, @_);
}
while (my $lang = shift @langs) {
- die "Html.pm: Lang '$lang' unknown. Please update \%Language.\n" unless $Language{$lang};
+ die "Html.pm: Lang '$lang' unknown. Please update \%Debian::L10n::Utils::Language.\n" unless $Debian::L10n::Utils::Language{$lang};
my $db = Debian::L10n::Db->new();
my $dbName = "$Status_file"; # FIXME add $lang if not provided in command line FIXME
$dbName =~ s/\$lang/$lang/g;
Modified: dl10n/trunk/lib/Debian/L10n/Spider.pm
URL: http://svn.debian.org/wsvn/dl10n/trunk/lib/Debian/L10n/Spider.pm?rev=2862&op=diff
==============================================================================
--- dl10n/trunk/lib/Debian/L10n/Spider.pm (original)
+++ dl10n/trunk/lib/Debian/L10n/Spider.pm Sun Feb 12 14:25:39 2012
@@ -319,7 +319,7 @@
$page++;
}
- Debian::L10n::BTS::check_bts($db) if $check_bts;
+ Debian::L10n::BTS::check_bts($db, $dbName) if $check_bts;
$db->write($dbName);
Debian::L10n::Db::clean_db($db);
$db->write($dbName);
Modified: dl10n/trunk/lib/Debian/L10n/Utils.pm
URL: http://svn.debian.org/wsvn/dl10n/trunk/lib/Debian/L10n/Utils.pm?rev=2862&op=diff
==============================================================================
--- dl10n/trunk/lib/Debian/L10n/Utils.pm (original)
+++ dl10n/trunk/lib/Debian/L10n/Utils.pm Sun Feb 12 14:25:39 2012
@@ -43,6 +43,8 @@
'po-man' => 'man', # nobody uses po4a so far, but it may come
);
+# %LanguageList contains the name of the debian mailing lists
+# It might differ from the name in %Language
our %LanguageList = (
ar => 'arabic',
ca => 'catalan',
@@ -65,6 +67,7 @@
tr => 'turkish',
);
+# %Language contains the human readable name of the language
our %Language = (
ar => 'arabic',
ca => 'catalan',
More information about the Debian-l10n-commits
mailing list