Changeset 97f7850 in tol for tolbase/lib/toltk

Timestamp:

Aug 6, 2012, 4:12:28 PM (14 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

0c1edd7

Parents:

75885bc

Message:

refs #1574, portando solución desde la rama 3.1

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@5020 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tolbase/lib/toltk

Files:

• init_toltk.tcl (modified) (3 diffs)
• tolbase.tcl (modified) (1 diff)

tolbase/lib/toltk/init_toltk.tcl

@@ -333 +333 @@
 ::iniFile::Create [file join $home_path "tolcon.ini"]
 
-
 # load language files, stored in msgs subdirectory
 set lang [::iniFile::Read TolConsole language es]
+
 ::msgcat::mclocale $lang
 
@@ -353 +353 @@
 # inicializo el kernel de tol con el lenguaje apropiado
 
-::tol::initkernel $lang vA
+set _lang [ string range $lang 0 1 ]
+if { $_lang ne "es" && $_lang ne "en" } {
+  # tol just know to deal with english or spanish
+  set _lang "en"
+}
+
+::tol::initkernel $_lang vA
 
 # Evalute the client TOL code to expose rmtps_client functionality
@@ -365 +371 @@
 Tolcon_Trace "Librerias cargadas"
 
-::tol::language $lang
+::tol::language $_lang
 Supertext::overrideTextCommand
 # force BWidget autoload

tolbase/lib/toltk/tolbase.tcl

@@ -2037 +2037 @@
   ::msgcat::mclocale $data(language)
   ::msgcat::mcload [file join $toltk_script_path msgs]
+  # sincroniza con tolconfig
+  if { $data(language) eq "es" } {
+    set tl "CASTELLANO"
+  } else {
+    set tl "ENGLISH"
+  }
+  set script [ string map [ list %L $tl ] {
+    Text TolConfigManager::Config::Various::Language := "%L";
+    Real TolConfigManager::Save(?)
+  } ]
+  toltcl::eval $script
 }