summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-06-16 10:40:20 (GMT)
committernijtmans <nijtmans>2010-06-16 10:40:20 (GMT)
commit45f681e2ed1d035294167b07f216abb34e2a2928 (patch)
tree8d956ffffd9aeebd08928fa132be16d2f5858f6a
parent81c023bcb0900a37988a5deb611bc4f4aba68545 (diff)
downloadtcl-45f681e2ed1d035294167b07f216abb34e2a2928.zip
tcl-45f681e2ed1d035294167b07f216abb34e2a2928.tar.gz
tcl-45f681e2ed1d035294167b07f216abb34e2a2928.tar.bz2
[Bug 3016135] traceback using clock format with locale of he_IL
-rw-r--r--ChangeLog7
-rwxr-xr-xlibrary/msgs/he.msg4
-rwxr-xr-xtools/loadICU.tcl4
3 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 8c48b7d..41f54a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-16 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * tools/loadICU.tcl [Bug 3016135] traceback using clock format with
+ * library/msgs/he.msg locale of he_IL
+
2010-06-09 Andreas Kupries <andreask@activestate.com>
* library/platform/platform.tcl: Added OSX Intel 64bit
@@ -276,7 +281,7 @@
* generic/rege_dfa.c: Fix macro conflict on CYGWIN: don't use
"small".
* generic/tclTest.c: Fix gcc 4.4 warning: ignoring return value of
- * unix/tclUnixPipe.c: ‘write’
+ * unix/tclUnixPipe.c: 'write'
* unix/tclUnixNotify.c:
2010-01-19 Donal K. Fellows <dkf@users.sf.net>
diff --git a/library/msgs/he.msg b/library/msgs/he.msg
index 52a94e2..4fd921d 100755
--- a/library/msgs/he.msg
+++ b/library/msgs/he.msg
@@ -44,8 +44,8 @@ namespace eval ::tcl::clock {
"\u05e0\u05d5\u05d1\u05de\u05d1\u05e8"\
"\u05d3\u05e6\u05de\u05d1\u05e8"\
""]
- ::msgcat::mcset he BCE "\u05dc\u05e1\u05d4"\u05e0"
- ::msgcat::mcset he CE "\u05dc\u05e4\u05e1\u05d4"\u05e0"
+ ::msgcat::mcset he BCE "\u05dc\u05e1\u05d4\u0022\u05e0"
+ ::msgcat::mcset he CE "\u05dc\u05e4\u05e1\u05d4\u0022\u05e0"
::msgcat::mcset he DATE_FORMAT "%d/%m/%Y"
::msgcat::mcset he TIME_FORMAT "%H:%M:%S"
::msgcat::mcset he DATE_TIME_FORMAT "%d/%m/%Y %H:%M:%S %z"
diff --git a/tools/loadICU.tcl b/tools/loadICU.tcl
index da0e134..55af781 100755
--- a/tools/loadICU.tcl
+++ b/tools/loadICU.tcl
@@ -26,7 +26,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: loadICU.tcl,v 1.3 2007/04/20 02:23:35 kennykb Exp $
+# RCS: @(#) $Id: loadICU.tcl,v 1.3.4.1 2010/06/16 10:40:20 nijtmans Exp $
#
#----------------------------------------------------------------------
@@ -591,7 +591,7 @@ proc backslashify { string } {
set retval {}
foreach char [split $string {}] {
scan $char %c ccode
- if { $ccode >= 0x0020 && $ccode < 0x007f
+ if { $ccode >= 0x0020 && $ccode < 0x007f && $char ne "\""
&& $char ne "\{" && $char ne "\}" && $char ne "\["
&& $char ne "\]" && $char ne "\\" && $char ne "\$" } {
append retval $char