summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoroehhar <harald.oehlmann@elmicron.de>2015-06-01 15:16:58 (GMT)
committeroehhar <harald.oehlmann@elmicron.de>2015-06-01 15:16:58 (GMT)
commit97895a4fdceee8f6b1eaea4253bb6dbffb9c9360 (patch)
treef17d31f8246439f95ab0f96a90edacefcd22ad33
parente478e78b30e12b40d4cdced03374bff49e01a3ae (diff)
downloadtcl-97895a4fdceee8f6b1eaea4253bb6dbffb9c9360.zip
tcl-97895a4fdceee8f6b1eaea4253bb6dbffb9c9360.tar.gz
tcl-97895a4fdceee8f6b1eaea4253bb6dbffb9c9360.tar.bz2
Make all msgcat tests pass
-rwxr-xr-xlibrary/msgcat/msgcat.tcl2
-rwxr-xr-x[-rw-r--r--]tests/msgcat.test13
2 files changed, 12 insertions, 3 deletions
diff --git a/library/msgcat/msgcat.tcl b/library/msgcat/msgcat.tcl
index b217634..228ac97 100755
--- a/library/msgcat/msgcat.tcl
+++ b/library/msgcat/msgcat.tcl
@@ -435,7 +435,7 @@ proc msgcat::mcloadedlocales {subcommand} {
# default data, if no package locale is set.
#
# Arguments:
-# subcommand One of get, init, present, add or remove
+# subcommand see list above
# locale package locale (only set subcommand)
#
# Results:
diff --git a/tests/msgcat.test b/tests/msgcat.test
index 050b592..8fd94e1 100644..100755
--- a/tests/msgcat.test
+++ b/tests/msgcat.test
@@ -17,8 +17,8 @@ if {[catch {package require tcltest 2}]} {
puts stderr "Skipping tests in [info script]. tcltest 2 required."
return
}
-if {[catch {package require msgcat 1.5}]} {
- puts stderr "Skipping tests in [info script]. No msgcat 1.5 found to test."
+if {[catch {package require msgcat 1.6}]} {
+ puts stderr "Skipping tests in [info script]. No msgcat 1.6 found to test."
return
}
@@ -412,9 +412,14 @@ namespace eval ::msgcat::test {
foreach loc {foo foo_BAR foo_BAR_baz} {
test msgcat-5.$count {mcload} -setup {
variable locale [mclocale]
+ ::msgcat::mclocale ""
+ ::msgcat::mcloadedlocales clear
+ ::msgcat::mcpackageconfig unset mcfolder
mclocale $loc
} -cleanup {
mclocale $locale
+ ::msgcat::mcloadedlocales clear
+ ::msgcat::mcpackageconfig unset mcfolder
} -body {
mcload $msgdir
} -result [expr { $count+1 }]
@@ -428,6 +433,8 @@ namespace eval ::msgcat::test {
mclocale foo_BAR_notexist
} -cleanup {
mclocale $locale
+ ::msgcat::mcloadedlocales clear
+ ::msgcat::mcpackageconfig unset mcfolder
} -body {
mcload $msgdir
} -result 3
@@ -437,6 +444,8 @@ namespace eval ::msgcat::test {
mclocale no_FI_notexist
} -cleanup {
mclocale $locale
+ ::msgcat::mcloadedlocales clear
+ ::msgcat::mcpackageconfig unset mcfolder
} -body {
mcload $msgdir
} -result 1