From f2fb4f7ffdce932a8f605c0f540a9eabc3a21c43 Mon Sep 17 00:00:00 2001 From: Siep Kroonenberg Date: Sun, 4 Nov 2018 16:04:02 +0000 Subject: Tlcontrib support; localization (use .po directly) git-svn-id: svn://tug.org/texlive/trunk@49076 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/installer/install-tl-gui.tcl | 4 ++-- Master/tlpkg/installer/install-tl-windows.cmd | 18 ++---------------- 2 files changed, 4 insertions(+), 18 deletions(-) (limited to 'Master/tlpkg/installer') diff --git a/Master/tlpkg/installer/install-tl-gui.tcl b/Master/tlpkg/installer/install-tl-gui.tcl index b69cd5fa617..07ea07954a5 100755 --- a/Master/tlpkg/installer/install-tl-gui.tcl +++ b/Master/tlpkg/installer/install-tl-gui.tcl @@ -1291,7 +1291,7 @@ proc run_menu {} { # collection-texworks incr rw - pgrid [ttk::label .texwl -text "Install TeXworks front end"] \ + pgrid [ttk::label .texwl -text [__ "Install TeXworks front end"]] \ -in $curf -row $rw -column 0 -columnspan 2 -sticky w ttk::checkbutton .texwb -variable ::vars(collection-texworks) pgrid .texwb -in $curf -row $rw -column 2 -sticky e @@ -1371,7 +1371,7 @@ proc read_descs {} { err_exit "Illegal line $l in descs section" } } - set ::scheme_descs(scheme-custom) "Custom scheme" + set ::scheme_descs(scheme-custom) [__ "Custom scheme"] } proc read_vars {} { diff --git a/Master/tlpkg/installer/install-tl-windows.cmd b/Master/tlpkg/installer/install-tl-windows.cmd index ab1e22f8295..ca5677d0241 100644 --- a/Master/tlpkg/installer/install-tl-windows.cmd +++ b/Master/tlpkg/installer/install-tl-windows.cmd @@ -100,7 +100,7 @@ goto rebuildargs if %p% == -gui goto dogui if %p% == --gui goto dogui -rem not a gui- or lang argument: copy to args string +rem not a gui argument: copy to args string if "%args%" == "" ( set args=%p% ) else ( @@ -112,21 +112,7 @@ goto rebuildargs set p= if %notcl% == yes set tcl=no -rem locale detection for tcl -rem the LANG environment variable should set the tcl default language. -rem Since reg.exe may be disabled by e.g. company policy, -rem tcl will yet consult the registry if LANG is not set, -rem although under some circumstances this may cause a long delay. -if %tcl% == no goto endreg -if not x%LANG% == x goto endreg -rem reg.exe runnable by user? -reg /? >nul 2>&1 -goto endreg -if errorlevel 1 goto endreg -for /f "skip=1 usebackq tokens=3 delims= " %%a in (`reg query hklm\system\currentcontrolset\control\nls\language /v Installlanguage`) do set lid=%%a -if errorlevel 1 goto endreg -for /f "skip=1 usebackq tokens=3 delims=; " %%a in (`reg query hkcr\mime\database\rfc1766 /v %lid%`) do set LANG=%%a -:endreg +rem removed: locale detection via registry; leave to tcl msgcat rem Check for tex directories on path and remove them. rem Need to remove any double quotes from path -- cgit v1.2.3