From d633c2d1792e8990aaaef8cdd2543a561c63407f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 18 May 2017 21:25:39 +0000 Subject: __ is not defined in install-tl; revert git-svn-id: svn://tug.org/texlive/trunk@44407 c570f23f-e606-0410-a88d-b1316a301751 --- Master/install-tl | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/Master/install-tl b/Master/install-tl index 51553c782f8..6b588ba6b61 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -1,7 +1,7 @@ #!/usr/bin/env perl # $Id$ # -# Copyright 2007-2016 +# Copyright 2007-2017 # Reinhard Kotucha, Norbert Preining, Karl Berry, Siep Kroonenberg. # This file is licensed under the GNU General Public License version 2 # or any later version. @@ -596,7 +596,8 @@ if ($opt_gui eq 'text' or if ($::env_warns) { print STDERR $::env_warns; } unless ($ENV{"TEXLIVE_INSTALL_NO_WELCOME"}) { foreach my $t (@::welcome_arr) { - print STDOUT "$t\n"; + printf STDOUT sprintf (shift @$t, @$t); + print STDOUT "\n"; } } do_cleanup(); # sets $::LOGFILENAME if not already defined @@ -2366,17 +2367,26 @@ EOF # sub create_welcome { @::welcome_arr = (); - 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'}); + push @::welcome_arr, (["\nWelcome to TeX Live!\n"]); + push @::welcome_arr, [ <