summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorSiep Kroonenberg <siepo@cybercomm.nl>2017-06-12 13:23:16 +0000
committerSiep Kroonenberg <siepo@cybercomm.nl>2017-06-12 13:23:16 +0000
commit807d135d3f1ab7bfd3fc070a2468db975e706ed5 (patch)
tree1434bd34d434c9365b7286043ab75e6963b0b212 /Master/tlpkg
parentcbb05e207d6c11513bfdaffa1214535d99eb66f9 (diff)
Hopefully __ is now handled right.
git-svn-id: svn://tug.org/texlive/trunk@44571 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rw-r--r--Master/tlpkg/installer/install-menu-text.pl6
-rw-r--r--Master/tlpkg/installer/tracked-install.pl4
2 files changed, 4 insertions, 6 deletions
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index 07268bb782b..ea09b06dfe0 100644
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -52,10 +52,8 @@ sub string_to_list {
return split(//, $string);
}
-sub __ {
- my $s = shift;
- return sprintf($s, @_);
-}
+# ___, defined in install-tl, replaces the GUI translating function
+*::__ = \&::___;
sub button { # for main menu: 1 char
my $val=shift;
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