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

Changeset 10784


Ignore:
Timestamp:
08/13/14 13:43:57 (5 years ago)
Author:
emmons
Message:

cldrbug 7808: Fixes to LDML2ICU Conversions

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/common/main/gd.xml

    r10739 r10784  
    246246                        <language type="pl">Pòlainnis</language> 
    247247                        <language type="prg">Pruisis</language> 
    248                         <language type="ps" references="R034">Pachtu</language> 
     248                        <language type="ps">Pachtu</language> 
    249249                        <language type="pt">Portagailis</language> 
    250250                        <language type="pt_BR">Portagailis Bhraisileach</language> 
     
    406406                        <script type="Tglg">Tagalog</script> 
    407407                        <script type="Thaa">Thaana</script> 
    408                         <script type="Thai" references="R035">Tàidh</script> 
     408                        <script type="Thai">Tàidh</script> 
    409409                        <script type="Tibt">Tibeitis</script> 
    410410                        <script type="Xpeo">Seann-Pheirsis</script> 
  • trunk/tools/java/org/unicode/cldr/icu/ldml2icu_locale.txt

    r10706 r10784  
    135135//ldml/localeDisplayNames/keys/key[@type="(%A)"] ; /Keys/$1 
    136136 
    137 # There is a language element with a references attribute in gd. 
    138 //ldml/localeDisplayNames/languages/language[@type="(%A)"]([@references="%A"])? ; /Languages/$1 
    139137//ldml/localeDisplayNames/languages/language[@type="(%A)"][@alt="short"] ; /LanguagesShort/$1 
     138//ldml/localeDisplayNames/languages/language[@type="(%A)"][@alt="(%A)"] ; /Languages%$2/$1 
     139//ldml/localeDisplayNames/languages/language[@type="(%A)"] ; /Languages/$1 
    140140 
    141141//ldml/localeDisplayNames/localeDisplayPattern/localeKeyTypePattern ; /localeDisplayPattern/keyTypePattern 
     
    145145//ldml/localeDisplayNames/measurementSystemNames/measurementSystemName[@type="(%A)"] ; /measurementSystemNames/$1 
    146146 
    147 # There is a script element with a references attribute in gd. 
    148 //ldml/localeDisplayNames/scripts/script[@type="(%A)"]([@references="%A"])? ; /Scripts/$1 
    149147//ldml/localeDisplayNames/scripts/script[@type="(%A)"][@alt="(%A)"] ; /Scripts%$2/$1 
    150  
     148//ldml/localeDisplayNames/scripts/script[@type="(%A)"] ; /Scripts/$1 
     149 
     150//ldml/localeDisplayNames/territories/territory[@type="(%A)"][@alt="short"] ; /CountriesShort/$1 
     151//ldml/localeDisplayNames/territories/territory[@type="(%A)"][@alt="(%A)"] ; /Countries%$2/$1 
    151152//ldml/localeDisplayNames/territories/territory[@type="(%A)"] ; /Countries/$1 
    152 //ldml/localeDisplayNames/territories/territory[@type="(%A)"][@alt="short"] ; /CountriesShort/$1 
    153153 
    154154//ldml/localeDisplayNames/transformNames/transformName[@type="(%W)"] ; /transformNames/$1 
    155155 
     156//ldml/localeDisplayNames/types/type[@type="(%A)"][@key="(%A)"][@alt="(%A)"] ; /Types%$3/$2/$1 
    156157//ldml/localeDisplayNames/types/type[@type="(%A)"][@key="(%A)"] ; /Types/$2/$1 
    157 //ldml/localeDisplayNames/types/type[@type="(%A)"][@key="(%A)"][@alt="(%A)"] ; /Types%$3/$2/$1 
    158158 
    159159//ldml/localeDisplayNames/variants/variant[@type="(%A)"] ; /Variants/$1 
     
    163163//ldml/numbers/currencies/currency[@type="(%A)"]/displayName[@count="(%A)"] ; /CurrencyPlurals/$1/$2 
    164164 
     165//ldml/numbers/currencies/currency[@type="(%W)"]/symbol[@alt="narrow"] ; /Currencies%narrow/$1 
    165166//ldml/numbers/currencies/currency[@type="(%W)"]/symbol ; /Currencies/$1 ; fallback=$1 
    166 //ldml/numbers/currencies/currency[@type="(%W)"]/symbol[@alt="narrow"] ; /CurrenciesNarrow/$1 
    167167//ldml/numbers/currencies/currency[@type="(%W)"]/displayName ; /Currencies/$1 ; fallback=$1 
    168168//ldml/numbers/currencies/currency[@type="(%W)"]/pattern[@type="standard"]; /Currencies/$1/ ; fallback=//ldml/numbers/currencyFormats[@numberSystem="%D"]/currencyFormatLength/currencyFormat[@type="standard"]/pattern[@type="standard"] 
  • trunk/tools/java/org/unicode/cldr/icu/ldml2icu_supplemental.txt

    r9106 r10784  
    5757     ; /languageData/$1/secondary/territories ; values=$3 
    5858 
     59//supplementalData/territoryContainment/group[@type="(%W)"][@contains="(%A)"][@status="deprecated"] ; /territoryContainment/deprecated/$1 ; values=$2 
     60//supplementalData/territoryContainment/group[@type="(%W)"][@contains="(%A)"][@status="grouping"] ; /territoryContainment/containedGroupings/$1 ; values=$2 
     61//supplementalData/territoryContainment/group[@type="(%W)"][@contains="(%A)"][@grouping="true"] ; /territoryContainment/grouping ; values=$1 
    5962//supplementalData/territoryContainment/group[@type="(%W)"][@contains="(%A)"]; /territoryContainment/$1 ; values=$2 
    60 //supplementalData/territoryContainment/group[@type="(%W)"][@contains="(%A)"][@grouping="true"] 
    61      ; /territoryContainment/$1 ; values=$2 
    62      ; /territoryContainment/grouping ; values=$1 
    6363 
    6464//supplementalData/weekData/firstDay[@day="(%W)"][@territories="(%W)"] ; /weekData/$2:intvector     ; values=$1 ; fallback=/weekData/001:intvector[0] 
Note: See TracChangeset for help on using the changeset viewer.