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

Changeset 11611


Ignore:
Timestamp:
05/06/15 09:02:59 (4 years ago)
Author:
mdavis
Message:

cldrbug 8324: added final units

Location:
trunk/common
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/common/main/en.xml

    r11600 r11611  
    54855485                                <unitPattern count="other">{0} terabytes</unitPattern> 
    54865486                        </unit> 
     5487                        <unit type="duration-century"> 
     5488                                <displayName>centuries</displayName> 
     5489                                <unitPattern count="one">{0} century</unitPattern> 
     5490                                <unitPattern count="other">{0} centuries</unitPattern> 
     5491                        </unit> 
    54875492                        <unit type="duration-day"> 
    54885493                                <displayName>days</displayName> 
    … …  
    56775682                                <unitPattern count="other">{0} miles</unitPattern> 
    56785683                        </unit> 
     5684                        <unit type="length-mile-nautical"> 
     5685                                <displayName>nautical mile</displayName> 
     5686                                <unitPattern count="one">{0} nautical mile</unitPattern> 
     5687                                <unitPattern count="other">{0} nautical miles</unitPattern> 
     5688                        </unit> 
    56795689                        <unit type="length-mile-scandinavian"> 
    56805690                                <displayName>mile-scandinavian</displayName> 
    … …  
    58405850                                <unitPattern count="one">{0} kilometer per hour</unitPattern> 
    58415851                                <unitPattern count="other">{0} kilometers per hour</unitPattern> 
     5852                        </unit> 
     5853                        <unit type="speed-knot"> 
     5854                                <displayName>knot</displayName> 
     5855                                <unitPattern count="one">{0} knot</unitPattern> 
     5856                                <unitPattern count="other">{0} knots</unitPattern> 
    58425857                        </unit> 
    58435858                        <unit type="speed-meter-per-second"> 

  • trunk/common/main/root.xml

    r11610 r11611  
    40014001                                <unitPattern count="other">{0} TB</unitPattern> 
    40024002                        </unit> 
     4003                        <unit type="duration-century"> 
     4004                                <displayName>c</displayName> 
     4005                                <unitPattern count="other">{0} c</unitPattern> 
     4006                        </unit> 
    40034007                        <unit type="duration-day"> 
    40044008                                <displayName>day</displayName> 
    … …  
    41694173                                <unitPattern count="other">{0} mi</unitPattern> 
    41704174                        </unit> 
     4175                        <unit type="length-mile-nautical"> 
     4176                                <displayName>nmi</displayName> 
     4177                                <unitPattern count="other">{0} nmi</unitPattern> 
     4178                        </unit> 
    41714179                        <unit type="length-mile-scandinavian"> 
    41724180                                <displayName>smi</displayName> 
    … …  
    43004308                                <displayName>km/h</displayName> 
    43014309                                <unitPattern count="other">{0} km/h</unitPattern> 
     4310                        </unit> 
     4311                        <unit type="speed-knot"> 
     4312                                <displayName>kn</displayName> 
     4313                                <unitPattern count="other">{0} kn</unitPattern> 
    43024314                        </unit> 
    43034315                        <unit type="speed-meter-per-second"> 

  • trunk/common/supplemental/supplementalMetadata.xml

    r11586 r11611  
    824824            <attributeValues elements="type" attributes="key" type="bcp47">key</attributeValues> 
    825825            <!-- there is special code for this case <attributeValues elements="type" attributes="type" type="bcp47">use-key</attributeValues>  --> 
    826             <attributeValues elements="unit" attributes="type" type="regex">temperature-generic|duration-day-person|duration-month-person|duration-week-person|duration-year-person|length-mile-scandinavian|volume-cup-metric|volume-pint-metric|volume-teaspoon-au|angle-revolution|consumption-liter-per-100kilometers|(acceleration-(g-force|meter-per-second-squared)|angle-(degree|arc-minute|arc-second|radian)|area-(acre|square-(centimeter|inch|foot|kilometer|meter|mile|yard)|hectare)|consumption-(liter-per-kilometer|mile-per-gallon)|digital-(kilo|mega|giga|tera)?(bit|byte)|duration-(nanosecond|microsecond|millisecond|(day|hour|minute|month|second|week|year))|electric-(milli)?(ampere|ohm|volt)|energy-(kilocalorie|calorie|foodcalorie|joule|kilojoule|kilowatt-hour)|frequency-(kilo|mega|giga)?hertz|length-(astronomical-unit|(pico|nano|micro|milli|centi|deci|kilo)?meter|fathom|foot|furlong|inch|light-year|mile|nautical-mile|parsec|yard)|light-lux|mass-(carat|(kilo|milli|micro)?gram|ounce|ounce-troy|pound|metric-ton|stone|ton)|power-(horsepower|(kilo|milli|mega|giga)?watt)|pressure-(hectopascal|inch-hg|millibar|millimeter-of-mercury|pound-per-square-inch)|proportion-karat|speed-((mile|kilometer)-per-hour|meter-per-second)|temperature-(celsius|fahrenheit|kelvin)|volume-(acre-foot|bushel|cup|fluid-ounce|(milli|deci|centi|hecto|mega)?liter|gallon|pint|quart|cubic-(centimeter|kilometer|meter|mile|inch|foot|yard)|tablespoon|teaspoon))</attributeValues> 
     826            <attributeValues elements="unit" attributes="type" type="regex">duration-century|speed-knot|length-mile-nautical|temperature-generic|duration-day-person|duration-month-person|duration-week-person|duration-year-person|length-mile-scandinavian|volume-cup-metric|volume-pint-metric|volume-teaspoon-au|angle-revolution|consumption-liter-per-100kilometers|(acceleration-(g-force|meter-per-second-squared)|angle-(degree|arc-minute|arc-second|radian)|area-(acre|square-(centimeter|inch|foot|kilometer|meter|mile|yard)|hectare)|consumption-(liter-per-kilometer|mile-per-gallon)|digital-(kilo|mega|giga|tera)?(bit|byte)|duration-(nanosecond|microsecond|millisecond|(day|hour|minute|month|second|week|year))|electric-(milli)?(ampere|ohm|volt)|energy-(kilocalorie|calorie|foodcalorie|joule|kilojoule|kilowatt-hour)|frequency-(kilo|mega|giga)?hertz|length-(astronomical-unit|(pico|nano|micro|milli|centi|deci|kilo)?meter|fathom|foot|furlong|inch|light-year|mile|nautical-mile|parsec|yard)|light-lux|mass-(carat|(kilo|milli|micro)?gram|ounce|ounce-troy|pound|metric-ton|stone|ton)|power-(horsepower|(kilo|milli|mega|giga)?watt)|pressure-(hectopascal|inch-hg|millibar|millimeter-of-mercury|pound-per-square-inch)|proportion-karat|speed-((mile|kilometer)-per-hour|meter-per-second)|temperature-(celsius|fahrenheit|kelvin)|volume-(acre-foot|bushel|cup|fluid-ounce|(milli|deci|centi|hecto|mega)?liter|gallon|pint|quart|cubic-(centimeter|kilometer|meter|mile|inch|foot|yard)|tablespoon|teaspoon))</attributeValues> 
    827827            <attributeValues elements="variable" attributes="id">$variableID</attributeValues> 
    828828            <attributeValues elements="variant" attributes="type">$variant</attributeValues> 
Note: See TracChangeset for help on using the changeset viewer.