[Unicode]   Common Locale Data Repository : Bug Tracking Home | Site Map | Search
 

Changeset 13050


Ignore:
Timestamp:
10/12/16 23:29:33 (2 years ago)
Author:
pedberg
Message:

cldrbug 9862: in maint-30: merge in r13043-13048; update version in dtds, CLDRFile.java, readme

Location:
branches/maint-30
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • branches/maint-30

  • branches/maint-30/common

  • branches/maint-30/common/dtd/ldml.dtd

    r12951 r13050  
    4343<!ATTLIST version number CDATA #REQUIRED > 
    4444    <!--@METADATA--> 
    45 <!ATTLIST version cldrVersion CDATA #FIXED "30" > 
     45<!ATTLIST version cldrVersion CDATA #FIXED "30.0.1" > 
    4646    <!--@VALUE--> 
    4747<!ATTLIST version draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED > 
  • branches/maint-30/common/dtd/ldmlBCP47.dtd

    r12951 r13050  
    1616<!ATTLIST version number CDATA #REQUIRED > 
    1717    <!--@METADATA--> 
    18 <!ATTLIST version cldrVersion CDATA #FIXED "30" > 
     18<!ATTLIST version cldrVersion CDATA #FIXED "30.0.1" > 
    1919    <!--@VALUE--> 
    2020 
  • branches/maint-30/common/dtd/ldmlSupplemental.dtd

    r12959 r13050  
    1717<!ATTLIST version number CDATA #REQUIRED > 
    1818    <!--@METADATA--> 
    19 <!ATTLIST version cldrVersion CDATA #FIXED "30" > 
     19<!ATTLIST version cldrVersion CDATA #FIXED "30.0.1" > 
    2020    <!--@VALUE--> 
    2121<!ATTLIST version unicodeVersion CDATA #FIXED "9.0.0" > 
  • branches/maint-30/common/main/en.xml

    r12981 r13050  
    21802180                                                <dateFormatItem id="MMMEd">E, MMM d</dateFormatItem> 
    21812181                                                <dateFormatItem id="MMMMd">MMMM d</dateFormatItem> 
    2182                                                 <dateFormatItem id="MMMMW" count="one">'week' W 'of' MMM</dateFormatItem> 
    2183                                                 <dateFormatItem id="MMMMW" count="other">'week' W 'of' MMM</dateFormatItem> 
     2182                                                <dateFormatItem id="MMMMW" count="one">'week' W 'of' MMMM</dateFormatItem> 
     2183                                                <dateFormatItem id="MMMMW" count="other">'week' W 'of' MMMM</dateFormatItem> 
    21842184                                                <dateFormatItem id="ms">mm:ss</dateFormatItem> 
    21852185                                                <dateFormatItem id="y">y</dateFormatItem> 
  • branches/maint-30/common/main/en_AU.xml

    r12954 r13050  
    190190                                        </dateFormatLength> 
    191191                                </dateFormats> 
    192                                 <dateTimeFormats> 
    193                                         <availableFormats> 
    194                                                 <dateFormatItem id="yMMMEd">E, d MMM,y</dateFormatItem> 
    195                                         </availableFormats> 
    196                                 </dateTimeFormats> 
    197192                        </calendar> 
    198193                </calendars> 
  • branches/maint-30/common/main/my.xml

    r12879 r13050  
    679679                        <territory type="MK" alt="variant">မက်စီဒိုးနီးယား (ယခင် ယူဂိုစလားဗီးယား မက်စီဒိုးနီးယားပြည်ထောင်စု)</territory> 
    680680                        <territory type="ML">မာလီ</territory> 
    681                         <territory type="MM">မြန်မာ (Burma)</territory> 
     681                        <territory type="MM">မြန်မာ</territory> 
    682682                        <territory type="MN">မွန်ဂိုးလီးယား</territory> 
    683683                        <territory type="MO">မကာအို (တရုတ်ပြည်)</territory> 
  • branches/maint-30/common/main/root.xml

    r12879 r13050  
    12611261                                                <dateFormatItem id="MMMEd">MMM d, E</dateFormatItem> 
    12621262                                                <dateFormatItem id="MMMMd">MMMM d</dateFormatItem> 
    1263                                                 <dateFormatItem id="MMMMW" count="other">'week' W 'of' MMM</dateFormatItem> 
     1263                                                <dateFormatItem id="MMMMW" count="other">'week' W 'of' MMMM</dateFormatItem> 
    12641264                                                <dateFormatItem id="ms">mm:ss</dateFormatItem> 
    12651265                                                <dateFormatItem id="y">y</dateFormatItem> 
  • branches/maint-30/common/properties/ExtendedPictographic.txt

    r12858 r13050  
    1 # DRAFT 
    2 # 
    31# ExtendedPictographic.txt 
    4 # Date: 2016-07-01 
     2# Date: 2016-10-12 
    53# © 2016 Unicode®, Inc. 
    64# For terms of use, see http://www.unicode.org/terms_of_use.html 
     
    2220# ===== 
    2321# Review Notes  
    24 # The files contain additional comments to aid with review of the draft property. 
     22# The files contain additional comments to aid in understanding the context of the property values. 
    2523# 
    2624# 1. Blocks are included if they contain any emoji characters, even if there are no EP characters. 
     
    4139#    • otherCn: the number of other code points in the block (non-Emoji, non-EP, not characters). 
    4240# 
    43 #    The characters can be listed out in detail by using http://unicode.org/cldr/utility/list-unicodeset.jsp 
     41#    The characters can be listed out in detail by using any implementation that supports UnicodeSet, 
     42#    such as ​http://unicode.org/cldr/utility/list-unicodeset.jsp. 
    4443#    The lines are omitted if empty: for example, Transport_And_Map_Symbols have no "other" characters. 
    4544#     
    4645# ===== 
    47 # DATA (generated) 
    4846 
    4947# Alchemical_Symbols 
  • branches/maint-30/common/segments/root.xml

    r12925 r13050  
    4646                                <rule id="11"> ($Extended_Pict | $EmojiNRK) $ZWJ × ($Extended_Pict | $EmojiNRK) </rule> 
    4747                                <rule id="12"> ^$Prepend* $Regional_Indicator $Regional_Indicator ÷ $Regional_Indicator </rule> 
    48                                 <rule id="13"> ^$Prepend* $Regional_Indicator $Regional_Indicator </rule> 
     48                                <rule id="13"> ^$Prepend* $Regional_Indicator × $Regional_Indicator </rule> 
    4949                        </segmentRules> 
    5050                </segmentation> 
     
    252252                                <rule id="30.01"> ($AL | $HL | $NU) × $OP </rule> 
    253253                                <rule id="30.02"> $CP × ($AL | $HL | $NU) </rule> 
    254                                 <!-- LB 30a  Do not break between Regional Indicators. --> 
    255                                 <rule id="30.11"> $RI × $RI </rule> 
     254                                <!-- LB 30a Do not break between two regional indicator symbols if there is an odd number of regional indicators preceding the break position. --> 
     255                                <rule id="30.11"> sot ($RI $RI)* $RI × $RI </rule> 
     256                                <rule id="30.12"> [^$RI] ($RI $RI)* $RI × $RI </rule> 
    256257                                <!-- LB 30b  Do not break between an emoji base and an emoji modifier.. --> 
    257258                                <rule id="30.21"> $EB × $EM </rule> 
  • branches/maint-30/common/supplemental/windowsZones.xml

    r12941 r13050  
    1010        <version number="$Revision$"/> 
    1111        <windowsZones> 
    12                 <mapTimezones otherVersion="7e00401" typeVersion="2016f"> 
     12                <mapTimezones otherVersion="7e00402" typeVersion="2016g"> 
    1313 
    1414                        <!-- (UTC-12:00) International Date Line West --> 
     
    452452                        <!-- (UTC+03:00) Moscow, St. Petersburg, Volgograd --> 
    453453                        <mapZone other="Russian Standard Time" territory="001" type="Europe/Moscow"/> 
    454                         <mapZone other="Russian Standard Time" territory="RU" type="Europe/Moscow Europe/Kirov Europe/Simferopol Europe/Volgograd"/> 
     454                        <mapZone other="Russian Standard Time" territory="RU" type="Europe/Moscow Europe/Kirov Europe/Volgograd"/> 
     455                        <mapZone other="Russian Standard Time" territory="UA" type="Europe/Simferopol"/> 
    455456 
    456457                        <!-- (UTC+03:00) Nairobi --> 
     
    556557                        <mapZone other="Bangladesh Standard Time" territory="BT" type="Asia/Thimphu"/> 
    557558 
    558                         <!-- (UTC+06:00) Novosibirsk --> 
    559                         <mapZone other="N. Central Asia Standard Time" territory="001" type="Asia/Novosibirsk"/> 
    560                         <mapZone other="N. Central Asia Standard Time" territory="RU" type="Asia/Novosibirsk Asia/Omsk"/> 
     559                        <!-- (UTC+06:00) Omsk --> 
     560                        <mapZone other="Omsk Standard Time" territory="001" type="Asia/Omsk"/> 
     561                        <mapZone other="Omsk Standard Time" territory="RU" type="Asia/Omsk"/> 
    561562 
    562563                        <!-- (UTC+06:30) Yangon (Rangoon) --> 
     
    588589                        <mapZone other="North Asia Standard Time" territory="RU" type="Asia/Krasnoyarsk Asia/Novokuznetsk"/> 
    589590 
     591                        <!-- (UTC+07:00) Novosibirsk --> 
     592                        <mapZone other="N. Central Asia Standard Time" territory="001" type="Asia/Novosibirsk"/> 
     593                        <mapZone other="N. Central Asia Standard Time" territory="RU" type="Asia/Novosibirsk"/> 
     594 
    590595                        <!-- (UTC+07:00) Tomsk --> 
    591596                        <mapZone other="Tomsk Standard Time" territory="001" type="Asia/Tomsk"/> 
     
    762767                </mapTimezones> 
    763768        </windowsZones> 
    764  
    765769</supplementalData> 
  • branches/maint-30/keyboards/dtd/ldmlKeyboard.dtd

    r12524 r13050  
    1919<!ATTLIST version number CDATA #REQUIRED > 
    2020    <!--@METADATA--> 
    21 <!ATTLIST version cldrVersion CDATA #FIXED "30" > 
     21<!ATTLIST version cldrVersion CDATA #FIXED "30.0.1" > 
    2222    <!--@METADATA--> 
    2323 
  • branches/maint-30/readme.html

    r13021 r13050  
    1212  <body> 
    1313    <h2>Unicode Common Locale Data Repository (CLDR)</h2> 
    14     <h3>ReadMe for Unicode <abbr title="Common Locale Data Repository">CLDR</abbr> version 30</h3> 
    15     <p>Last updated: 2016-Sep-30</p> 
     14    <h3>ReadMe for Unicode <abbr title="Common Locale Data Repository">CLDR</abbr> version 30.0.1</h3> 
     15    <p>Last updated: 2016-Oct-12</p> 
    1616 
    1717    <!--<p><b>Note:</b> CLDR 30 is in development and not recommended for use at this stage.</p>--> 
     
    2222    <!--<p><b>Note:</b> This is a pre-release candidate version of CLDR 30, intended for testing. 
    2323    It is not recommended for production use.</p>--> 
    24     <p>This is the final release version of CLDR 30.</p> 
     24    <p>This is the final release version of CLDR 30.0.1</p> 
    2525 
    2626    <p>For further information:</p> 
  • branches/maint-30/tools/java/org/unicode/cldr/util/CLDRFile.java

    r13026 r13050  
    114114    public static final String SUPPLEMENTAL_METADATA = "supplementalMetadata"; 
    115115    public static final String SUPPLEMENTAL_PREFIX = "supplemental"; 
    116     public static final String GEN_VERSION = "30"; 
     116    public static final String GEN_VERSION = "30.0.1"; 
    117117    public static final List<String> SUPPLEMENTAL_NAMES = Arrays.asList("characters", "coverageLevels", "dayPeriods", "genderList", "languageInfo", 
    118118        "likelySubtags", "metaZones", "numberingSystems", "ordinals", "plurals", "postalCodeData", "rgScope", "supplementalData", "supplementalMetadata", 
Note: See TracChangeset for help on using the changeset viewer.