[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html texi2html.pl test/encodings/res/docum...
From: |
Patrice Dumas |
Subject: |
[Texi2html-cvs] texi2html texi2html.pl test/encodings/res/docum... |
Date: |
Tue, 04 Aug 2009 14:55:36 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Changes by: Patrice Dumas <pertusus> 09/08/04 14:55:35
Modified files:
. : texi2html.pl
test/encodings/res/documentlanguage_set_unknown:
documentlanguage_set.2
test/encodings/res_all/documentlanguage_set_unknown:
documentlanguage_set.2
test/encodings/res_info/documentlanguage_set_unknown:
documentlanguage_set.2
Log message:
Warn when language is not known, even when supplied on the command line.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.305&r2=1.306
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/documentlanguage_set_unknown/documentlanguage_set.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/documentlanguage_set_unknown/documentlanguage_set.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/documentlanguage_set_unknown/documentlanguage_set.2?cvsroot=texi2html&r1=1.1&r2=1.2
Patches:
Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -b -r1.305 -r1.306
--- texi2html.pl 4 Aug 2009 14:30:44 -0000 1.305
+++ texi2html.pl 4 Aug 2009 14:55:34 -0000 1.306
@@ -86,7 +86,7 @@
}
# CVS version:
-# $Id: texi2html.pl,v 1.305 2009/08/04 14:30:44 pertusus Exp $
+# $Id: texi2html.pl,v 1.306 2009/08/04 14:55:34 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";
@@ -2132,8 +2132,8 @@
$::texi_map_ref->{'today'} = $Texi2HTML::THISDOC{'today'};
}
-#
-# called on -lang, and when a @documentlanguage appears
+# Called on --document-language, at the beginning of each pass and
+#Â when a @documentlanguage appears
sub set_document_language ($$;$)
{
my $lang = shift;
@@ -2166,6 +2166,7 @@
msg_warn("$region_code is not a valid region code.", $line_nr);
}
}
+
my @files = locate_init_file("$i18n_dir/$lang", 1);
if (! scalar(@files) and defined($main_lang))
{
@@ -2183,6 +2184,8 @@
print STDERR "# using '$language' as document language\n" if
($T2H_VERBOSE);
# since it may be different from get_conf('documentlanguage'),
# we record it.
+ #Â Currently this is not used anywhere, not sure what the value
+ #Â really corresponds with.
$Texi2HTML::THISDOC{'current_language'} = $language;
set_date($language);
return 1;
@@ -4331,13 +4334,14 @@
{
my $pass = shift;
- #Â set the translations now. This means at the beginning of each phase.
+ #Â set the translations now. This means at the beginning of each pass.
+ # Do it silently, except during the last pass.
my $lang = Texi2HTML::Config::get_conf('documentlanguage');
-#print STDERR "$pass $lang\n";
- if (!set_document_language($lang, 1))
+ my $silent_lang = 1 if ($pass != 2);
+ if (!set_document_language($lang, $silent_lang))
{
- document_warn ("Translations for '$lang' not found. Using 'en'.") if
($pass == 2);
- set_document_language('en', 1);
+ document_warn ("Translations for '$lang' not found. Using 'en'.")
unless ($silent_lang);
+ set_document_language('en', $silent_lang);
}
# All the initialization used the informations still there at the
#Â end of the previous pass.
@@ -4971,23 +4975,24 @@
my $line = shift;
my $silent = shift;
my $line_nr = shift;
- my $return_value = 0;
+ my $language_change_succes = 0;
if ($line =~ s/\s+(\w+)\s*//)
{
my $lang = $1;
my $prev_lang = Texi2HTML::Config::get_conf('documentlanguage');
- if ($lang and Texi2HTML::Config::set_conf('documentlanguage', $lang))
- {
- $return_value = set_document_language($lang, $silent, $line_nr);
- if (!$return_value)
+ #Â This won't be done if the documentlanguage was set on the command
line
+ if (Texi2HTML::Config::set_conf('documentlanguage', $lang))
{
+ $language_change_succes = set_document_language($lang, $silent,
$line_nr);
+ if (!$language_change_succes)
+ { #Â reset previous documentlanguage
Texi2HTML::Config::set_conf('documentlanguage', $prev_lang);
line_error ("Translations for '$lang' not found. Reverting to
'$prev_lang'.", $line_nr) unless ($silent);
}
}
#Â FIXME warn about stuff remaining on the line?
}
- return $return_value;
+ return $language_change_succes;
}
# actions that should be done in more than one pass. In fact most are not
Index: test/encodings/res/documentlanguage_set_unknown/documentlanguage_set.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/encodings/res/documentlanguage_set_unknown/documentlanguage_set.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res/documentlanguage_set_unknown/documentlanguage_set.2
17 May 2009 15:35:21 -0000 1.1
+++ test/encodings/res/documentlanguage_set_unknown/documentlanguage_set.2
4 Aug 2009 14:55:35 -0000 1.2
@@ -1 +1,2 @@
+unknown is not a valid language code.
Translations for 'unknown' not found. Using 'en'.
Index:
test/encodings/res_all/documentlanguage_set_unknown/documentlanguage_set.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/encodings/res_all/documentlanguage_set_unknown/documentlanguage_set.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_all/documentlanguage_set_unknown/documentlanguage_set.2
6 Jul 2009 21:59:21 -0000 1.1
+++ test/encodings/res_all/documentlanguage_set_unknown/documentlanguage_set.2
4 Aug 2009 14:55:35 -0000 1.2
@@ -1 +1,2 @@
+unknown is not a valid language code.
Translations for 'unknown' not found. Using 'en'.
Index:
test/encodings/res_info/documentlanguage_set_unknown/documentlanguage_set.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/encodings/res_info/documentlanguage_set_unknown/documentlanguage_set.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_info/documentlanguage_set_unknown/documentlanguage_set.2
6 Jul 2009 21:59:36 -0000 1.1
+++ test/encodings/res_info/documentlanguage_set_unknown/documentlanguage_set.2
4 Aug 2009 14:55:35 -0000 1.2
@@ -1 +1,2 @@
+unknown is not a valid language code.
Translations for 'unknown' not found. Using 'en'.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Texi2html-cvs] texi2html texi2html.pl test/encodings/res/docum...,
Patrice Dumas <=