summaryrefslogtreecommitdiff
path: root/Master/tlpkg/installer
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-09-03 07:39:21 +0000
committerNorbert Preining <preining@logic.at>2009-09-03 07:39:21 +0000
commit354d95800a0aeff3779b0511cdcdf3beb801dcbb (patch)
treed2aa38b30561fdf527a2287e1302d21c9fcffa39 /Master/tlpkg/installer
parent75dd6c4cf9d482c52035776ec4363b1dc7c1fe69 (diff)
use sprintf on the translated string with the rest of the arguments,
replace 2009 in many places by %s and added arguemtn TL:TLC:ReleaseYear git-svn-id: svn://tug.org/texlive/trunk@15017 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/installer')
-rw-r--r--Master/tlpkg/installer/install-menu-perltk.pl22
-rw-r--r--Master/tlpkg/installer/install-menu-wizard.pl14
2 files changed, 14 insertions, 22 deletions
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl
index e4cbd30516f..ef7ffa64b26 100644
--- a/Master/tlpkg/installer/install-menu-perltk.pl
+++ b/Master/tlpkg/installer/install-menu-perltk.pl
@@ -157,7 +157,7 @@ sub run_menu_perltk {
my $row = 1;
- $fr->Label(-text => __("TeX Live 2009 Installation"))->grid(-row => $row, -column => 1, -columnspan => 3);
+ $fr->Label(-text => __("TeX Live %s Installation", $TeXLive::TLConfig::ReleaseYear))->grid(-row => $row, -column => 1, -columnspan => 3);
$row++;
$fr->Label(-text => "------- " . __("Basic Information") . " -------")->grid(-row => $row, -column => 1, -columnspan => 3);
@@ -371,14 +371,12 @@ sub installation_window {
$f->pack;
do_installation();
$return = $MENU_ALREADYDONE;
- my $t = __("See TEXDIR/index.html for links to documentation.\nThe TeX Live web site (http://tug.org/texlive/) contains any 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 available on the web at http://tug.org/usergroups.html.");
+ my $t = __("See %s/index.html for links to documentation.\nThe TeX Live web site (http://tug.org/texlive/) contains any 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 available on the web at http://tug.org/usergroups.html.", $::vars{'TEXDIR'});
if (!win32()) {
- $t .= "\n\n" . __("Add TEXDIR/texmf/doc/man to MANPATH.\nAdd TEXDIR/texmf/doc/info to INFOPATH.\nMost importantly, add TEXDIR/bin/PLATFORM\nto your PATH for current and future sessions.");
+ $t .= "\n\n" . __("Add %s/texmf/doc/man to MANPATH.\nAdd %s/texmf/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'});
}
$t .= "\n\n" . __("Welcome to TeX Live!");
- $t =~ s/TEXDIR/$::vars{'TEXDIR'}/g;
- $t =~ s/PLATFORM/$::vars{'this_platform'}/g;
- $t =~ s/\\n/\n/g;
+ #$t =~ s/\\n/\n/g;
$::progressw->insert("end", "\n");
my $linechar = $::progressw->index("end");
$::progressw->markSet("finaltext", $linechar);
@@ -410,8 +408,6 @@ sub menu_edit_texdir {
} else {
$hint_var = win32() ? '%USERPROFILE%' : '$HOME';
}
- my $hint_text = __('(use ~ for %%%)');
- $hint_text =~ s/%%%/$hint_var/;
if ($val =~ m!^(.*)/texlive/$texlive_release$!) {
$currsel = "$1";
$addyear = 1;
@@ -432,7 +428,7 @@ sub menu_edit_texdir {
my $sw = $mainwindow->Toplevel(-title => __("Change variable value"));
$sw->transient($mainwindow);
$sw->grab();
- $sw->Label(-text => __("Enter path for") . " $key: " . $hint_text)->pack(-padx => "2m", -pady => "2m");
+ $sw->Label(-text => __("Enter path for %s (use ~ for %s)", $key, $hint_var))->pack(-padx => "2m", -pady => "2m");
$entry = $sw->Entry(-width => 60)->pack(-padx => "2m", -pady => "2m");
my $f = $sw->Frame;
my $c1 = $f->Checkbutton(-text => 'Add "texlive"', -variable => \$addtexlive,
@@ -470,9 +466,7 @@ sub menu_edit_vars_value {
} else {
$hint_var = win32() ? '%USERPROFILE%' : '$HOME';
}
- my $hint_text = __('(use ~ for %%%)');
- $hint_text =~ s/%%%/$hint_var/;
- $sw->Label(-text => __("Enter path for") . " $key: " . $hint_text)->pack(-padx => "2m", -pady => "2m");
+ $sw->Label(-text => __("Enter path for %s (use ~ for %s)", $key, $hint_var))->pack(-padx => "2m", -pady => "2m");
my $entry = $sw->Entry(-textvariable => $val, -width => 60);
$entry->pack(-padx => "2m", -pady => "2m");
my $f = $sw->Frame;
@@ -776,12 +770,12 @@ sub menu_set_schemebutton_text {
sub menu_set_binbutton_text {
if (!win32()) {
- menu_set_text($bintextbutton, "$vars{'n_systems_selected'} " . __("out of") . " $vars{'n_systems_available'}");
+ menu_set_text($bintextbutton, __("%s out of %s", $vars{'n_systems_selected'}, $vars{'n_systems_available'}));
}
}
sub menu_set_collections_text {
- menu_set_text($collectionstext, "$vars{'n_collections_selected'} " . __("collections out of") . " $vars{'n_collections_available'}, " . __("disk space required") . ": $vars{'total_size'} MB");
+ menu_set_text($collectionstext, __("%s collections out of %s (disk space required: %s MB)", $vars{'n_collections_selected'}, $vars{'n_collections_available'}, $vars{'total_size'}));
}
sub menu_set_pathes_text {
diff --git a/Master/tlpkg/installer/install-menu-wizard.pl b/Master/tlpkg/installer/install-menu-wizard.pl
index f0f9c1c571f..34d2c9dfdbc 100644
--- a/Master/tlpkg/installer/install-menu-wizard.pl
+++ b/Master/tlpkg/installer/install-menu-wizard.pl
@@ -140,7 +140,7 @@ sub run_menu_wizard {
$ftitle->update;
$ftitle->place(-x => $LEFT, -y => $TOP);
- $tit = $ftitle->Label(-text => __('TeX Live 2009 Installation'));
+ $tit = $ftitle->Label(-text => __('TeX Live %s Installation', $TeXLive::TLConfig::ReleaseYear));
$usedfont= $tit->cget("-font");
$lineskip = $usedfont->metrics("-linespace");
@@ -179,7 +179,7 @@ sub reset_start {
$counter->configure(-text => "1/5");
$prv->placeForget;
- my $inf = $fmain->Label(-text => __("Welcome to the installation of TeX Live 2009\nhttp://tug.org/texlive\n\nThis wizard will guide you through the installation.\n\nFor an advanced, customizable installation, please consult\nthe web pages or installation guide.") . "\n" . (win32() ? __("Or use install-tl-advanced.bat") : __("Or use the argument --gui perltk to install-tl.")), -justify => "left");
+ my $inf = $fmain->Label(-text => __("Welcome to the installation of TeX Live %s\nhttp://tug.org/texlive\n\nThis wizard will guide you through the installation.\n\nFor an advanced, customizable installation, please consult\nthe web pages or installation guide.", $TeXLive::TLConfig::ReleaseYear) . "\n" . (win32() ? __("Or use install-tl-advanced.bat") : __("Or use the argument --gui perltk to install-tl.")), -justify => "left");
$inf->place(-x => 0, -y => 100);
$nxt->configure(-text => __("Next >") , -command => \&ask_path );
@@ -383,7 +383,7 @@ sub ask_go {
$_->destroy;
}
$counter->configure(-text => "4/5");
- my $inf = $fmain->Label(-justify => "left", -text => __("We are ready to install TeX Live 2009.\nThe following settings will be used.\nIf you want to change something please go back,\notherwise press the \"Install\" button."));
+ my $inf = $fmain->Label(-justify => "left", -text => __("We are ready to install TeX Live %s.\nThe following settings will be used.\nIf you want to change something please go back,\notherwise press the \"Install\" button.", $TeXLive::TLConfig::ReleaseYear));
$inf->place(-x => 0, -y => 80);
@@ -456,14 +456,12 @@ sub wizard_installation_window {
do_installation();
$::progress->value(110);
$return = $MENU_ALREADYDONE;
- my $t = __("See TEXDIR/index.html for links to documentation.\nThe TeX Live web site (http://tug.org/texlive/) contains any 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 available on the web at http://tug.org/usergroups.html.");
+ my $t = __("See %s/index.html for links to documentation.\nThe TeX Live web site (http://tug.org/texlive/) contains any 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 available on the web at http://tug.org/usergroups.html.", $::vars{'TEXDIR'});
if (!win32()) {
- $t .= "\n\n" . __("Add TEXDIR/texmf/doc/man to MANPATH.\nAdd TEXDIR/texmf/doc/info to INFOPATH.\nMost importantly, add TEXDIR/bin/PLATFORM\nto your PATH for current and future sessions.");
+ $t .= "\n\n" . __("Add %s/texmf/doc/man to MANPATH.\nAdd %s/texmf/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'});
}
$t .= "\n\n" . __('Welcome to TeX Live!');
- $t =~ s/TEXDIR/$::vars{'TEXDIR'}/g;
- $t =~ s/PLATFORM/$::vars{'this_platform'}/g;
- $t =~ s/\\n/\n/g;
+ #$t =~ s/\\n/\n/g;
my $linechar = $::progressw->index("end");
$::progressw->markSet("finaltext", $linechar);
$::progressw->markGravity("finaltext", "left");