Fixes for translation welcome message

git-svn-id: svn://tug.org/texlive/trunk@44402 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 20 insertions, 23 deletions

diff --git a/Master/install-tl b/Master/install-tl
index 7dcdc33c77f..51553c782f8 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -596,8 +596,7 @@ if ($opt_gui eq 'text' or
   if ($::env_warns) { print STDERR $::env_warns; }
   unless ($ENV{"TEXLIVE_INSTALL_NO_WELCOME"}) {
     foreach my $t (@::welcome_arr) {
-      printf STDOUT sprintf (shift @$t, @$t);
-      print STDOUT "\n";
+      print STDOUT "$t\n";
     }
   }
   do_cleanup(); # sets $::LOGFILENAME if not already defined
@@ -2367,26 +2366,17 @@ EOF
 #
 sub create_welcome {
   @::welcome_arr = ();
-  push @::welcome_arr, (["\nWelcome to TeX Live!\n"]);
-  push @::welcome_arr, [ <<END_WELCOME_GENERIC,
-Documentation links: %s/index.html
-The TeX Live web site (https://tug.org/texlive/)
-contains updates and corrections.
-
-TeX Live is a joint project of the TeX user groups around the world;
-please consider supporting it by joining the group best for you.
-The list of groups is on the web at https://tug.org/usergroups.html.
-END_WELCOME_GENERIC
-    $::vars{'TEXDIR'}];
+  push @::welcome_arr, __("\nWelcome to TeX Live!\n");
+  push @::welcome_arr, __(
+    "Documentation links: %s/index.html\nThe TeX Live web site (https://tug.org/texlive/)\ncontains updates and corrections.\n\nTeX Live is a joint project of the TeX user groups around the world;\n
+please consider supporting it by joining the group best for you.\n
+The list of groups is on the web at https://tug.org/usergroups.html.",
+    $::vars{'TEXDIR'});
   if (!win32()) {
-    push @::welcome_arr, [ <<END_WELCOME_W32,
-Add %s/texmf-dist/doc/man to MANPATH.
-Add %s/texmf-dist/doc/info to INFOPATH.
-Most importantly, add %s/bin/%s
-to your PATH for current and future sessions.
-END_WELCOME_W32
-    $::vars{'TEXDIR'}, $::vars{'TEXDIR'}, $::vars{'TEXDIR'},
-    $::vars{'this_platform'}];
+    push @::welcome_arr, __(
+      "Add %s/texmf-dist/doc/man to MANPATH.\nAdd %s/texmf-dist/doc/info to INFOPATH.\nMost importantly, add %s/bin/%s\nto your PATH for current and future sessions.",
+      $::vars{'TEXDIR'}, $::vars{'TEXDIR'}, $::vars{'TEXDIR'},
+      $::vars{'this_platform'});
   }
 }
 
diff --git a/Master/tlpkg/bin/tl-update-messages b/Master/tlpkg/bin/tl-update-messages
index cd15cf7c8df..b243dd4c74c 100755
--- a/Master/tlpkg/bin/tl-update-messages
+++ b/Master/tlpkg/bin/tl-update-messages
@@ -21,6 +21,8 @@ xgettext -o tlpkg/translations/messages.pot	\
 	--package-version=2010			\
 	--package-name="TeX Live"		\
         -k__ -k\$__ -k%__ -k__x -k__n:1,2 -k__nx:1,2 -k__xn:1,2 -kN__ -k  \
+       install-tl \
+       tlpkg/installer/tracked-install.pl \
        tlpkg/installer/install-menu-wizard.pl \
        tlpkg/installer/install-menu-perltk.pl \
        texmf-dist/scripts/texlive/tlmgrgui.pl \
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index 6fe12d42cd5..07268bb782b 100644
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -52,6 +52,11 @@ sub string_to_list {
   return split(//, $string);
 }
 
+sub __ {
+  my $s = shift;
+  return sprintf($s, @_);
+}
+
 sub button { # for main menu: 1 char
   my $val=shift;
   my $vals=shift; # array ref to descriptions of possible values
diff --git a/Master/tlpkg/installer/tracked-install.pl b/Master/tlpkg/installer/tracked-install.pl
index bdc12e3f041..54ec22599d5 100644
--- a/Master/tlpkg/installer/tracked-install.pl
+++ b/Master/tlpkg/installer/tracked-install.pl
@@ -65,8 +65,8 @@ sub installer_tracker {
   $::progressw->tagConfigure('centered', -justify => 'center');
   # basic welcome message
   foreach my $t (@::welcome_arr) {
-    my $s = shift @$t;
-    $::progressw->insert("end", __($s, @$t)."\n", 'centered');
+    #my $s = shift @$t;
+    $::progressw->insert("end", "$t\n", 'centered');
   }
   $::progressw->insert("end", "\n");
   # additional info