Merge pull request LinuxCNC#535 from Solitarily/master

Fix multi-language loading error for "tklinuxcnc" UI
rredford · Nov 29, 2018 · e4495fe · e4495fe
2 parents 4986995 + 3e8ddc9
commit e4495fe
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/configure.ac b/src/configure.ac
@@ -702,7 +702,7 @@ else
     EMC2_ICON=linuxcncicon
     EMC2_TCL_DIR=${prefix}/lib/tcltk/linuxcnc
     EMC2_TCL_LIB_DIR=${prefix}/lib/tcltk/linuxcnc
-    EMC2_LANG_DIR=${prefix}/share/linuxcnc/tcl/msgs
+    EMC2_LANG_DIR=${prefix}/lib/tcltk/linuxcnc/msgs
     EMC2_PO_DIR=${prefix}/share/locale
     EMC2_HELP_DIR=${prefix}/share/doc/linuxcnc
     case $MODULE_DIR in

diff --git a/tcl/linuxcnc.tcl.in b/tcl/linuxcnc.tcl.in
@@ -76,7 +76,7 @@ proc hal {args} {
 # called *.msg, (e.g. en_US.msg).
 package require msgcat
 if {$linuxcnc::_langinit && [info exists env(LANG)]} {
-    msgcat::mclocale $env(LANG)
+    msgcat::mclocale
     msgcat::mcload $linuxcnc::LANG_DIR
     set linuxcnc::_langinit 0
 }

diff --git a/tcl/tklinuxcnc.tcl b/tcl/tklinuxcnc.tcl
@@ -58,7 +58,7 @@ set tkemc 1
 # called *.msg, (e.g. en_US.msg).
 package require msgcat
 if ([info exists env(LANG)]) {
-    msgcat::mclocale $env(LANG)
+    msgcat::mclocale
     msgcat::mcload $linuxcnc::LANG_DIR
 }