diff options
| author | hobbs <hobbs> | 2006-11-03 00:34:51 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2006-11-03 00:34:51 (GMT) |
| commit | c399e676c8dbdec3ce1fe4b694d7c269f9b1f675 (patch) | |
| tree | 13086bc5f8998596d202f1bdeaa9df4ed46bc3cd /library/msgcat | |
| parent | ee75480f2f9483654c8f665acd984569f3234ca8 (diff) | |
| download | tcl-c399e676c8dbdec3ce1fe4b694d7c269f9b1f675.zip tcl-c399e676c8dbdec3ce1fe4b694d7c269f9b1f675.tar.gz tcl-c399e676c8dbdec3ce1fe4b694d7c269f9b1f675.tar.bz2 | |
* doc/ParseCmd.3, doc/Tcl.n, doc/eval.n, doc/exec.n:
* doc/fconfigure.n, doc/interp.n, doc/unknown.n:
* library/auto.tcl, library/init.tcl, library/package.tcl:
* library/safe.tcl, library/tm.tcl, library/msgcat/msgcat.tcl:
* tests/all.tcl, tests/basic.test, tests/cmdInfo.test:
* tests/compile.test, tests/encoding.test, tests/execute.test:
* tests/fCmd.test, tests/http.test, tests/init.test:
* tests/interp.test, tests/io.test, tests/ioUtil.test:
* tests/iogt.test, tests/namespace-old.test, tests/namespace.test:
* tests/parse.test, tests/pkg.test, tests/pkgMkIndex.test:
* tests/proc.test, tests/reg.test, tests/trace.test:
* tests/upvar.test, tests/winConsole.test, tests/winFCmd.test:
* tools/tclZIC.tcl:
* generic/tclParse.c (Tcl_ParseCommand): Replace {expand} with {*}
officially (TIP #293). Leave -DALLOW_EXPAND=0|1 option to keep
{expand} syntax for transition users. [Bug 1589629]
Diffstat (limited to 'library/msgcat')
| -rw-r--r-- | library/msgcat/msgcat.tcl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/library/msgcat/msgcat.tcl b/library/msgcat/msgcat.tcl index 2aa321e..ccf4054 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.25 2006/09/11 14:38:03 dgp Exp $ +# RCS: @(#) $Id: msgcat.tcl,v 1.26 2006/11/03 00:34:52 hobbs Exp $ package require Tcl 8.5 # When the version number changes, be sure to update the pkgIndex.tcl file, @@ -35,7 +35,7 @@ namespace eval msgcat { # Map of language codes used in Windows registry to those of ISO-639 if { $::tcl_platform(platform) eq "windows" } { - variable WinRegToISO639 [dict create {expand}{ + variable WinRegToISO639 [dict create {*}{ 01 ar 0401 ar_SA 0801 ar_IQ 0c01 ar_EG 1001 ar_LY 1401 ar_DZ 1801 ar_MA 1c01 ar_TN 2001 ar_OM 2401 ar_YE 2801 ar_SY 2c01 ar_JO 3001 ar_LB 3401 ar_KW 3801 ar_AE 3c01 ar_BH @@ -196,7 +196,7 @@ proc msgcat::mc {src args} { if {[llength $args] == 0} { return [dict get $Msgs $loc $ns $src] } else { - return [format [dict get $Msgs $loc $ns $src] {expand}$args] + return [format [dict get $Msgs $loc $ns $src] {*}$args] } } } @@ -204,7 +204,7 @@ proc msgcat::mc {src args} { } # we have not found the translation return [uplevel 1 [list [namespace origin mcunknown] \ - $Locale $src {expand}$args]] + $Locale $src {*}$args]] } # msgcat::mclocale -- @@ -382,7 +382,7 @@ proc msgcat::mcmset {locale pairs } { proc msgcat::mcunknown {locale src args} { if {[llength $args]} { - return [format $src {expand}$args] + return [format $src {*}$args] } else { return $src } |