summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-29 08:18:56 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-29 08:18:56 (GMT)
commit25374f98c20f5f7b42efc6587ec069feffc396d1 (patch)
tree453d190e3466ba8c77e36ac83f25cc7198a51543
parenteca033cfb854b6950a21b858085a58d0f9002860 (diff)
downloadtcl-25374f98c20f5f7b42efc6587ec069feffc396d1.zip
tcl-25374f98c20f5f7b42efc6587ec069feffc396d1.tar.gz
tcl-25374f98c20f5f7b42efc6587ec069feffc396d1.tar.bz2
suggestions from Harald
-rw-r--r--library/msgcat/msgcat.tcl17
1 files changed, 6 insertions, 11 deletions
diff --git a/library/msgcat/msgcat.tcl b/library/msgcat/msgcat.tcl
index 204de9c..3757ec6 100644
--- a/library/msgcat/msgcat.tcl
+++ b/library/msgcat/msgcat.tcl
@@ -451,23 +451,18 @@ proc msgcat::Init {} {
}
}
#
- # The rest of this routine is special processing for Windows;
- # all other platforms, get out now.
+ # The rest of this routine is special processing for Windows or
+ # Cygwin. All other platforms, get out now.
#
- if {[info sharedlibextension] ne ".dll"} {
+ if {([info sharedlibextension] ne ".dll")
+ || [catch {package require registry}]} {
mclocale C
return
}
#
- # On Windows, try to set locale depending on registry settings,
- # or fall back on locale of "C".
+ # On Windows or Cygwin, try to set locale depending on registry
+ # settings, or fall back on locale of "C".
#
- if {[catch {
- package require registry
- }]} {
- mclocale C
- return
- }
# First check registry value LocalName present from Windows Vista
# which contains the local string as RFC5646, composed of: