Changeset d2cf6f7 in tol

Timestamp:

Feb 13, 2012, 8:18:01 AM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

66654ee

Parents:

8593497

Message:

refs #1429, después de cargar initlibrary se establece el idioma si se ha pedido por linea de comando uno específico ya que TolConfigManager puede haber establecido uno distinto durante el LoadConfig.

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

File:

• tolsh/tolsh.vfs/lib/app-tolsh/tolsh.tcl (modified) (7 diffs)

tolsh/tolsh.vfs/lib/app-tolsh/tolsh.tcl

@@ -30 +30 @@
   # By default load initLibrary
   #
-  set options(lang)    0
+  set options(lang)    ""
   set options(initlib) 1
   set options(iniproject) 1
@@ -83 +83 @@
   set i 0
   while {$i < $num} {
+    logtmp "set item [lindex $cmdline $i]"
     set item [lindex $cmdline $i]
     if {[string index $item 0] eq "-"} {
       set opt [string range $item 1 end]
       if {$opt eq "e" || $opt eq "en"} {
-        set $options(lang) 0
+        set options(lang) "en"
       } elseif {$opt eq "s" || $opt eq "sp"} {
-        set $options(lang) 1
+        set options(lang) "es"
       } elseif {$opt eq "i"} {
         # initLibrary should not be loaded
@@ -95 +96 @@
         set options(initlib) 0
       } elseif {$opt eq "np"} {
-        set $options(iniproject) 0
+        set options(iniproject) 0
       } elseif {[string index $opt 0] eq "c"} {
         if {[string length $opt]>1} {
@@ -396 +397 @@
   #
   if {$options(runmode) != "server" && $options(runmode) != "shared"} {
-    if {[info exist ::env(USE_TOLTCL_202)]} {
-      puts "requested to load Toltcl from $::env(USE_TOLTCL_202)"
+    if {[info exist ::env(USE_TOLTCL_31)]} {
+      puts "requested to load Toltcl from $::env(USE_TOLTCL_31)"
       load $::env(USE_TOLTCL_202)
     } else {
       package require -exact Toltcl 3.1
     }
+    #puts "tol::initkernel $options(lang) $options(vmode)"
     tol::initkernel $options(lang) $options(vmode)
 
@@ -407 +409 @@
       tol::initlibrary $options(iniproject)
     }
-
+    # why should I do that?
+    if { $options(lang) ne "" } {
+      ::tol::language $options(lang)
+    }
     set appdata [string trim \
                [lindex [::tol::info var [list Text TolAppDataPath]] 2] \"]
@@ -465 +470 @@
     
   } elseif {$options(runmode) eq "server"} {
-    puts "runmode=server"
+    #puts "runmode=server"
     run_as_server $tolcomm_dir
     
   } elseif {$options(runmode) eq "shared"} {
-    puts "runmode=shared"
+    #puts "runmode=shared"
     run_as_shared $tolcomm_dir
   
   } elseif {$options(runmode) eq "slave"} {
-    puts "runmode=slave"
+    #puts "runmode=slave"
     run_as_slave $tolcomm_dir   
   }
@@ -579 +584 @@
 
 proc logtmp { msg } {
-  return 
+  return
   set user $::tcl_platform(user)
   set fd [ open "/tmp/tolsh.${user}.log" a ]