summaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2004-03-31 18:50:58 (GMT)
committerdgp <dgp@users.sourceforge.net>2004-03-31 18:50:58 (GMT)
commit58bab1bd72fa6605e743045b7ea04a4f646d068c (patch)
tree949bbdd0ae4ecebf06e3c0d68aea7900bd84be3d /library
parent4547f9ecf916bf30c68a16194b791ec6abd03872 (diff)
downloadtcl-58bab1bd72fa6605e743045b7ea04a4f646d068c.zip
tcl-58bab1bd72fa6605e743045b7ea04a4f646d068c.tar.gz
tcl-58bab1bd72fa6605e743045b7ea04a4f646d068c.tar.bz2
* doc/msgcat.n: Clarified message catalog file encodings. [Bug 811457]
* library/msgcat/msgcat.tcl ([mcset], [ConvertLocale], [Init]): Corrected [mcset] to be able to successfully set a translation to the empty string. [mcset $loc $src {}] was incorrectly set the $loc translation of $src back to $src. Also changed [ConvertLocale] to minimally require a non-empty "language" part in the locale value. If not, an error raised prompts [Init] to keep looking for a valid locale value, or ultimately fall back on the "C" locale. [Bug 811461]. * library/msgcat/pkgIndex.tcl: Bump to msgcat 1.3.2.
Diffstat (limited to 'library')
-rw-r--r--library/msgcat/msgcat.tcl13
1 files changed, 8 insertions, 5 deletions
diff --git a/library/msgcat/msgcat.tcl b/library/msgcat/msgcat.tcl
index 2180129..044dcbb 100644
--- a/library/msgcat/msgcat.tcl
+++ b/library/msgcat/msgcat.tcl
@@ -10,7 +10,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: msgcat.tcl,v 1.17.2.2 2004/03/31 01:55:21 dgp Exp $
+# RCS: @(#) $Id: msgcat.tcl,v 1.17.2.3 2004/03/31 18:51:01 dgp Exp $
package require Tcl 8.2
# When the version number changes, be sure to update the pkgIndex.tcl file,
@@ -397,8 +397,10 @@ proc msgcat::ConvertLocale {value} {
# (@(.*))? # Match (optional) "modifier"; starts with @
# $ # Match all the way to the end
# } $value -> language _ territory _ codeset _ modifier
- regexp {^([^_.@]*)(_([^.@]*))?([.]([^@]*))?(@(.*))?$} $value \
- -> language _ territory _ codeset _ modifier
+ if {![regexp {^([^_.@]+)(_([^.@]*))?([.]([^@]*))?(@(.*))?$} $value \
+ -> language _ territory _ codeset _ modifier]} {
+ return -code error "invalid locale '$value': empty language part"
+ }
set ret $language
if {[string length $territory]} {
append ret _$territory
@@ -417,8 +419,9 @@ proc msgcat::Init {} {
foreach varName {LC_ALL LC_MESSAGES LANG} {
if {[info exists ::env($varName)]
&& ![string equal "" $::env($varName)]} {
- mclocale [ConvertLocale $::env($varName)]
- return
+ if {![catch {mclocale [ConvertLocale $::env($varName)]}]} {
+ return
+ }
}
}
#