diff --git a/.gitattributes b/.gitattributes index 83fcea5b8a..4bfb378f30 100644 --- a/.gitattributes +++ b/.gitattributes @@ -74,16 +74,8 @@ icu4c/source/data/region/pool.res -text icu4c/source/data/zone/pool.res -text icu4c/source/extra/uconv/uconv.vcxproj -text icu4c/source/extra/uconv/uconv.vcxproj.filters -text -icu4c/source/i18n/decfmtst.cpp -text -icu4c/source/i18n/decfmtst.h -text icu4c/source/i18n/i18n.vcxproj -text icu4c/source/i18n/i18n.vcxproj.filters -text -icu4c/source/i18n/smpdtfst.cpp -text -icu4c/source/i18n/smpdtfst.h -text -icu4c/source/i18n/udateintervalformat.cpp -text -icu4c/source/i18n/unicode/udateintervalformat.h -text -icu4c/source/i18n/unicode/upluralrules.h -text -icu4c/source/i18n/upluralrules.cpp -text icu4c/source/io/io.vcxproj -text icu4c/source/io/io.vcxproj.filters -text icu4c/source/layout/layout.vcxproj -text @@ -141,10 +133,8 @@ icu4c/source/samples/ustring/ustring.vcxproj -text icu4c/source/samples/ustring/ustring.vcxproj.filters -text icu4c/source/stubdata/stubdata.vcxproj -text icu4c/source/stubdata/stubdata.vcxproj.filters -text -icu4c/source/test/cintltst/cdateintervalformattest.c -text icu4c/source/test/cintltst/cintltst.vcxproj -text icu4c/source/test/cintltst/cintltst.vcxproj.filters -text -icu4c/source/test/cintltst/cpluralrulestest.c -text icu4c/source/test/intltest/intltest.vcxproj -text icu4c/source/test/intltest/intltest.vcxproj.filters -text icu4c/source/test/iotest/iotest.vcxproj -text diff --git a/icu4c/source/i18n/unicode/udateintervalformat.h b/icu4c/source/i18n/unicode/udateintervalformat.h index 19295bdd0d..4a4230a98e 100644 --- a/icu4c/source/i18n/unicode/udateintervalformat.h +++ b/icu4c/source/i18n/unicode/udateintervalformat.h @@ -25,19 +25,22 @@ * * For example, if the range is 2010-03-04 07:56 - 2010-03-04 19:56 (12 hours) * - The skeleton jm will produce - * for en_US, "7:56 AM – 7:56 PM" - * for en_GB, "7:56 – 19:56" + * for en_US, "7:56 AM - 7:56 PM" + * for en_GB, "7:56 - 19:56" * - The skeleton MMMd will produce * for en_US, "Mar 4" * for en_GB, "4 Mar" * If the range is 2010-03-04 07:56 - 2010-03-08 16:11 (4 days, 8 hours, 15 minutes) * - The skeleton jm will produce - * for en_US, "3/4/2010 7:56 AM – 3/8/2010 4:11 PM" - * for en_GB, "4/3/2010 7:56 – 8/3/2010 16:11" + * for en_US, "3/4/2010 7:56 AM - 3/8/2010 4:11 PM" + * for en_GB, "4/3/2010 7:56 - 8/3/2010 16:11" * - The skeleton MMMd will produce - * for en_US, "Mar 4–8" + * for en_US, "Mar 4-8" * for en_GB, "4-8 Mar" * + * Note: the "-" characters in the above sample output will actually be + * Unicode 2013, EN_DASH, in all but the last example. + * * Note, in ICU 4.4 the standard skeletons for which date interval format data * is usually available are as follows; best results will be obtained by using * skeletons from this set, or those formed by combining these standard skeletons diff --git a/icu4c/source/tools/icu-svnprops-check.py b/icu4c/source/tools/icu-svnprops-check.py index 547291c4fa..a20b545d4d 100755 --- a/icu4c/source/tools/icu-svnprops-check.py +++ b/icu4c/source/tools/icu-svnprops-check.py @@ -1,6 +1,6 @@ #! /usr/bin/python -# Copyright (C) 2009-2010, International Business Machines Corporation, Google and Others. +# Copyright (C) 2009-2011, International Business Machines Corporation, Google and Others. # All rights reserved. # @@ -182,8 +182,8 @@ def check_utf8(file_name, base_mime_type, actual_mime_type): if ord(bytes[0]) != 0xef: print "UTF-8 file with no BOM: " + file_name - # Append charset=utf-8. Need to escape the ';' because it is ultimately going to a shell. - return base_mime_type + '\\;charset=utf-8' + # Append charset=utf-8. + return base_mime_type + ';charset=utf-8' def main(argv):