diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | library/msgcat/msgcat.tcl | 8 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2013-02-14 Harald Oehlmann <oehhar@users.sf.net> + + * library/msgcat/msgcat.tcl: [Bug 3604576]: msgcat-1.5.0.tm error + on windows XP + 2013-02-05 Don Porter <dgp@users.sourceforge.net> * win/tclWinFile.c: [Bug 3603434] Make sure TclpObjNormalizePath() diff --git a/library/msgcat/msgcat.tcl b/library/msgcat/msgcat.tcl index 97ad4fa..5f0ba2e 100644 --- a/library/msgcat/msgcat.tcl +++ b/library/msgcat/msgcat.tcl @@ -287,7 +287,7 @@ proc msgcat::mcload {langdir} { } set x 0 foreach p [mcpreferences] { - if { $p eq {} } { + if {$p eq {}} { set p ROOT } set langfile [file join $langdir $p.msg] @@ -374,7 +374,7 @@ proc msgcat::mcflset {src {dest ""}} { # Results: # Returns the number of pairs processed -proc msgcat::mcmset {locale pairs } { +proc msgcat::mcmset {locale pairs} { variable Msgs set length [llength $pairs] @@ -551,7 +551,7 @@ proc msgcat::Init {} { # Examples: de-CH -> de_ch, sr-Latn-CS -> sr_cs@latin, es-419 -> es # set key {HKEY_CURRENT_USER\Control Panel\International} - if { ![catch {registry get $key "LocaleName"} localeName] + if {![catch {registry get $key LocaleName} localeName] && [regexp {^([a-z]{2,3})(?:-([a-z]{4}))?(?:-([a-z]{2}))?(?:-.+)?$}\ [string tolower $localeName] match locale script territory]} { if {"" ne $territory} { @@ -561,7 +561,7 @@ proc msgcat::Init {} { if {[dict exists $modifierDict $script]} { append locale @ [dict get $modifierDict $script] } - if {![catch { mclocale [ConvertLocale $locale] }]} { + if {![catch {mclocale [ConvertLocale $locale]}]} { return } } |