Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Make all msgcat tests pass |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | msgcat_dyn_locale |
| Files: | files | file ages | folders |
| SHA1: |
c3bc0457256b0dbf027452799ac5c9ef |
| User & Date: | oehhar 2015-06-01 15:16:58 |
Context
|
2015-06-22
| ||
| 12:40 | Merge trunk check-in: a8834249fb user: oehhar tags: msgcat_dyn_locale | |
|
2015-06-01
| ||
| 15:16 | Make all msgcat tests pass check-in: c3bc045725 user: oehhar tags: msgcat_dyn_locale | |
|
2015-05-31
| ||
| 19:03 | clock.tcl modified that all clock tests pass check-in: 5cbb737b5c user: oehhar tags: msgcat_dyn_locale | |
Changes
Changes to library/msgcat/msgcat.tcl.
| ︙ | ︙ | |||
431 432 433 434 435 436 437 | # locales not containes in package mcpreferences. # It is an error to call this without a package locale set. # # The subcommands get, preferences and loaded return the corresponding # default data, if no package locale is set. # # Arguments: | | | 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 |
# locales not containes in package mcpreferences.
# It is an error to call this without a package locale set.
#
# The subcommands get, preferences and loaded return the corresponding
# default data, if no package locale is set.
#
# Arguments:
# subcommand see list above
# locale package locale (only set subcommand)
#
# Results:
# Empty string, if not stated differently for the subcommand
proc msgcat::mcpackagelocale {subcommand {locale ""}} {
# todo: implement using an ensemble
|
| ︙ | ︙ |
Changes to tests/msgcat.test.
| ︙ | ︙ | |||
13 14 15 16 17 18 19 |
# message catalogs for locales foo, foo_BAR, and foo_BAR_baz.
package require Tcl 8.5
if {[catch {package require tcltest 2}]} {
puts stderr "Skipping tests in [info script]. tcltest 2 required."
return
}
| | | | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
# message catalogs for locales foo, foo_BAR, and foo_BAR_baz.
package require Tcl 8.5
if {[catch {package require tcltest 2}]} {
puts stderr "Skipping tests in [info script]. tcltest 2 required."
return
}
if {[catch {package require msgcat 1.6}]} {
puts stderr "Skipping tests in [info script]. No msgcat 1.6 found to test."
return
}
namespace eval ::msgcat::test {
namespace import ::msgcat::*
namespace import ::tcltest::test
namespace import ::tcltest::cleanupTests
|
| ︙ | ︙ | |||
408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 |
}
makeFile [list ::msgcat::mcset $loc abc abc-$loc] $msg.msg $msgdir
}
variable count 1
foreach loc {foo foo_BAR foo_BAR_baz} {
test msgcat-5.$count {mcload} -setup {
variable locale [mclocale]
mclocale $loc
} -cleanup {
mclocale $locale
} -body {
mcload $msgdir
} -result [expr { $count+1 }]
incr count
}
# Even though foo_BAR_notexist does not exist,
# foo_BAR, foo and the root should be loaded.
test msgcat-5.4 {mcload} -setup {
variable locale [mclocale]
mclocale foo_BAR_notexist
} -cleanup {
mclocale $locale
} -body {
mcload $msgdir
} -result 3
test msgcat-5.5 {mcload} -setup {
variable locale [mclocale]
mclocale no_FI_notexist
} -cleanup {
mclocale $locale
} -body {
mcload $msgdir
} -result 1
test msgcat-5.6 {mcload} -setup {
variable locale [mclocale]
mclocale foo
| > > > > > > > > > | 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 |
}
makeFile [list ::msgcat::mcset $loc abc abc-$loc] $msg.msg $msgdir
}
variable count 1
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 }]
incr count
}
# Even though foo_BAR_notexist does not exist,
# foo_BAR, foo and the root should be loaded.
test msgcat-5.4 {mcload} -setup {
variable locale [mclocale]
mclocale foo_BAR_notexist
} -cleanup {
mclocale $locale
::msgcat::mcloadedlocales clear
::msgcat::mcpackageconfig unset mcfolder
} -body {
mcload $msgdir
} -result 3
test msgcat-5.5 {mcload} -setup {
variable locale [mclocale]
mclocale no_FI_notexist
} -cleanup {
mclocale $locale
::msgcat::mcloadedlocales clear
::msgcat::mcpackageconfig unset mcfolder
} -body {
mcload $msgdir
} -result 1
test msgcat-5.6 {mcload} -setup {
variable locale [mclocale]
mclocale foo
|
| ︙ | ︙ |