diff options
| author | sebres <sebres@users.sourceforge.net> | 2017-06-02 21:48:40 (GMT) |
|---|---|---|
| committer | sebres <sebres@users.sourceforge.net> | 2017-06-02 21:48:40 (GMT) |
| commit | c57348f989dd5d03412cb58e73f8c0af5016a8e8 (patch) | |
| tree | 887761b17dd015315b4df88601aa9f16cd93234c | |
| parent | e876dd14ef1030b80b8e90390d193e9c7850c89f (diff) | |
| download | tcl-c57348f989dd5d03412cb58e73f8c0af5016a8e8.zip tcl-c57348f989dd5d03412cb58e73f8c0af5016a8e8.tar.gz tcl-c57348f989dd5d03412cb58e73f8c0af5016a8e8.tar.bz2 | |
amend fix default locale, (fixed everywhere - no current locale anymore for default, avoid set it after clear caches, etc.)
| -rw-r--r-- | generic/tclClock.c | 5 | ||||
| -rw-r--r-- | library/clock.tcl | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/generic/tclClock.c b/generic/tclClock.c index 8f1bb8d..3f075ab 100644 --- a/generic/tclClock.c +++ b/generic/tclClock.c @@ -1030,8 +1030,9 @@ ClockConfigureObjCmd( dataPtr->DefaultLocaleDict = NULL; } } - if (i+1 >= objc && dataPtr->DefaultLocale != NULL) { - Tcl_SetObjResult(interp, dataPtr->DefaultLocale); + if (i+1 >= objc) { + Tcl_SetObjResult(interp, dataPtr->DefaultLocale ? + dataPtr->DefaultLocale : dataPtr->literals[LIT_C]); } break; case CLOCK_CURRENT_LOCALE: diff --git a/library/clock.tcl b/library/clock.tcl index 8b54463..1f79817 100644 --- a/library/clock.tcl +++ b/library/clock.tcl @@ -544,10 +544,7 @@ proc mcget {loc} { } current { set loc [mclocale] } - if {$loc eq {C}} { - set loclist [msgcat::PackagePreferences ::tcl::clock] - set loc [lindex $loclist 0] - } else { + if {$loc ne {}} { set loc [string tolower $loc] } |