Skip to content

Commit

Permalink
CLDR-17230 Handle name addition to keywords for non-top locales. Also…
Browse files Browse the repository at this point in the history 
… picks up a few edge cases in some top locales.
  • Loading branch information
@macchiati
macchiati committed Dec 6, 2023
1 parent a41488e commit bd565df
Show file tree
Hide file tree
Showing 15 changed files with 935 additions and 914 deletions.
10 changes: 5 additions & 5 deletions common/annotationsDerived/az.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -751,15 +751,15 @@ Derived short names and annotations, using GenerateDerivedAnnotations.java. See
<annotation cp="🧔🏾" type="tts">saqqallı şəxs: orta-tünd dəri tonu</annotation>
<annotation cp="🧔🏿">saqqal | saqqallı şəxs | saqqallı şəxs: tünd dəri tonu | tünd dəri tonu</annotation>
<annotation cp="🧔🏿" type="tts">saqqallı şəxs: tünd dəri tonu</annotation>
<annotation cp="🧔🏻‍♂">açıq dəri tonu | kişi | kişi; saqqal: açıq dəri tonu | kişi: saqqal | saqqal</annotation>
<annotation cp="🧔🏻‍♂">açıq dəri tonu | kişi | kişi; saqqal: açıq dəri tonu | kişi: saqqal | saqqal | saqqal: açıq dəri tonu</annotation>
<annotation cp="🧔🏻‍♂" type="tts">kişi; saqqal: açıq dəri tonu</annotation>
<annotation cp="🧔🏼‍♂">kişi | kişi; saqqal: orta-açıq dəri tonu | kişi: saqqal | orta-açıq dəri tonu | saqqal</annotation>
<annotation cp="🧔🏼‍♂">kişi | kişi; saqqal: orta-açıq dəri tonu | kişi: saqqal | orta-açıq dəri tonu | saqqal | saqqal: orta-açıq dəri tonu</annotation>
<annotation cp="🧔🏼‍♂" type="tts">kişi; saqqal: orta-açıq dəri tonu</annotation>
<annotation cp="🧔🏽‍♂">kişi | kişi; saqqal: orta dəri tonu | kişi: saqqal | orta dəri tonu | saqqal</annotation>
<annotation cp="🧔🏽‍♂">kişi | kişi; saqqal: orta dəri tonu | kişi: saqqal | orta dəri tonu | saqqal | saqqal: orta dəri tonu</annotation>
<annotation cp="🧔🏽‍♂" type="tts">kişi; saqqal: orta dəri tonu</annotation>
<annotation cp="🧔🏾‍♂">kişi | kişi; saqqal: orta-tünd dəri tonu | kişi: saqqal | orta-tünd dəri tonu | saqqal</annotation>
<annotation cp="🧔🏾‍♂">kişi | kişi; saqqal: orta-tünd dəri tonu | kişi: saqqal | orta-tünd dəri tonu | saqqal | saqqal: orta-tünd dəri tonu</annotation>
<annotation cp="🧔🏾‍♂" type="tts">kişi; saqqal: orta-tünd dəri tonu</annotation>
<annotation cp="🧔🏿‍♂">kişi | kişi; saqqal: tünd dəri tonu | kişi: saqqal | saqqal | tünd dəri tonu</annotation>
<annotation cp="🧔🏿‍♂">kişi | kişi; saqqal: tünd dəri tonu | kişi: saqqal | saqqal | saqqal: tünd dəri tonu | tünd dəri tonu</annotation>
<annotation cp="🧔🏿‍♂" type="tts">kişi; saqqal: tünd dəri tonu</annotation>
<annotation cp="👱🏻‍♂">açıq dəri tonu | kişi | sarışın | sarışın kişi: açıq dəri tonu</annotation>
<annotation cp="👱🏻‍♂" type="tts">sarışın kişi: açıq dəri tonu</annotation>
Expand Down
174 changes: 87 additions & 87 deletions common/annotationsDerived/de_CH.xml
View file

Large diffs are not rendered by default.

170 changes: 85 additions & 85 deletions common/annotationsDerived/en_001.xml
View file

Large diffs are not rendered by default.

270 changes: 135 additions & 135 deletions common/annotationsDerived/en_AU.xml
View file

Large diffs are not rendered by default.

180 changes: 90 additions & 90 deletions common/annotationsDerived/en_CA.xml
View file

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions common/annotationsDerived/en_GB.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ Derived short names and annotations, using GenerateDerivedAnnotations.java. See
<territory type="GB"/>
</identity>
<annotations>
<annotation cp="🧑🏻‍🌾">farmer | gardener | light skin tone</annotation>
<annotation cp="🧑🏼‍🌾">farmer | gardener | medium-light skin tone</annotation>
<annotation cp="🧑🏽‍🌾">farmer | gardener | medium skin tone</annotation>
<annotation cp="🧑🏾‍🌾">farmer | gardener | medium-dark skin tone</annotation>
<annotation cp="🧑🏿‍🌾">dark skin tone | farmer | gardener</annotation>
<annotation cp="👨🏻‍🌾">farmer | gardener | light skin tone | man</annotation>
<annotation cp="👨🏼‍🌾">farmer | gardener | man | medium-light skin tone</annotation>
<annotation cp="👨🏽‍🌾">farmer | gardener | man | medium skin tone</annotation>
<annotation cp="👨🏾‍🌾">farmer | gardener | man | medium-dark skin tone</annotation>
<annotation cp="👨🏿‍🌾">dark skin tone | farmer | gardener | man</annotation>
<annotation cp="👩🏻‍🌾">farmer | gardener | light skin tone | woman</annotation>
<annotation cp="👩🏼‍🌾">farmer | gardener | medium-light skin tone | woman</annotation>
<annotation cp="👩🏽‍🌾">farmer | gardener | medium skin tone | woman</annotation>
<annotation cp="👩🏾‍🌾">farmer | gardener | medium-dark skin tone | woman</annotation>
<annotation cp="👩🏿‍🌾">dark skin tone | farmer | gardener | woman</annotation>
<annotation cp="🧑🏻‍🌾">farmer | farmer: light skin tone | gardener | light skin tone</annotation>
<annotation cp="🧑🏼‍🌾">farmer | farmer: medium-light skin tone | gardener | medium-light skin tone</annotation>
<annotation cp="🧑🏽‍🌾">farmer | farmer: medium skin tone | gardener | medium skin tone</annotation>
<annotation cp="🧑🏾‍🌾">farmer | farmer: medium-dark skin tone | gardener | medium-dark skin tone</annotation>
<annotation cp="🧑🏿‍🌾">dark skin tone | farmer | farmer: dark skin tone | gardener</annotation>
<annotation cp="👨🏻‍🌾">farmer | gardener | light skin tone | man | man farmer: light skin tone</annotation>
<annotation cp="👨🏼‍🌾">farmer | gardener | man | man farmer: medium-light skin tone | medium-light skin tone</annotation>
<annotation cp="👨🏽‍🌾">farmer | gardener | man | man farmer: medium skin tone | medium skin tone</annotation>
<annotation cp="👨🏾‍🌾">farmer | gardener | man | man farmer: medium-dark skin tone | medium-dark skin tone</annotation>
<annotation cp="👨🏿‍🌾">dark skin tone | farmer | gardener | man | man farmer: dark skin tone</annotation>
<annotation cp="👩🏻‍🌾">farmer | gardener | light skin tone | woman | woman farmer: light skin tone</annotation>
<annotation cp="👩🏼‍🌾">farmer | gardener | medium-light skin tone | woman | woman farmer: medium-light skin tone</annotation>
<annotation cp="👩🏽‍🌾">farmer | gardener | medium skin tone | woman | woman farmer: medium skin tone</annotation>
<annotation cp="👩🏾‍🌾">farmer | gardener | medium-dark skin tone | woman | woman farmer: medium-dark skin tone</annotation>
<annotation cp="👩🏿‍🌾">dark skin tone | farmer | gardener | woman | woman farmer: dark skin tone</annotation>
<annotation cp="👨🏻‍🚒">fire truck | firefighter | light skin tone | man</annotation>
<annotation cp="👨🏼‍🚒">fire truck | firefighter | man | medium-light skin tone</annotation>
<annotation cp="👨🏽‍🚒">fire truck | firefighter | man | medium skin tone</annotation>
Expand Down
50 changes: 25 additions & 25 deletions common/annotationsDerived/en_IN.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,30 @@ Derived short names and annotations, using GenerateDerivedAnnotations.java. See
<territory type="IN"/>
</identity>
<annotations>
<annotation cp="👫🏻">couple | hand | hold | light skin tone | man | man and woman holding hands | woman | woman and man holding hands</annotation>
<annotation cp="👩🏻‍🤝‍👨🏼">couple | hand | hold | light skin tone | man | man and woman holding hands | medium-light skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏻‍🤝‍👨🏽">couple | hand | hold | light skin tone | man | man and woman holding hands | medium skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏻‍🤝‍👨🏾">couple | hand | hold | light skin tone | man | man and woman holding hands | medium-dark skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏻‍🤝‍👨🏿">couple | dark skin tone | hand | hold | light skin tone | man | man and woman holding hands | woman | woman and man holding hands</annotation>
<annotation cp="👩🏼‍🤝‍👨🏻">couple | hand | hold | light skin tone | man | man and woman holding hands | medium-light skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👫🏼">couple | hand | hold | man | man and woman holding hands | medium-light skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏼‍🤝‍👨🏽">couple | hand | hold | man | man and woman holding hands | medium skin tone | medium-light skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏼‍🤝‍👨🏾">couple | hand | hold | man | man and woman holding hands | medium-dark skin tone | medium-light skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏼‍🤝‍👨🏿">couple | dark skin tone | hand | hold | man | man and woman holding hands | medium-light skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏽‍🤝‍👨🏻">couple | hand | hold | light skin tone | man | man and woman holding hands | medium skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏽‍🤝‍👨🏼">couple | hand | hold | man | man and woman holding hands | medium skin tone | medium-light skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👫🏽">couple | hand | hold | man | man and woman holding hands | medium skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏽‍🤝‍👨🏾">couple | hand | hold | man | man and woman holding hands | medium skin tone | medium-dark skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏽‍🤝‍👨🏿">couple | dark skin tone | hand | hold | man | man and woman holding hands | medium skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏾‍🤝‍👨🏻">couple | hand | hold | light skin tone | man | man and woman holding hands | medium-dark skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏾‍🤝‍👨🏼">couple | hand | hold | man | man and woman holding hands | medium-dark skin tone | medium-light skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏾‍🤝‍👨🏽">couple | hand | hold | man | man and woman holding hands | medium skin tone | medium-dark skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👫🏾">couple | hand | hold | man | man and woman holding hands | medium-dark skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏾‍🤝‍👨🏿">couple | dark skin tone | hand | hold | man | man and woman holding hands | medium-dark skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏿‍🤝‍👨🏻">couple | dark skin tone | hand | hold | light skin tone | man | man and woman holding hands | woman | woman and man holding hands</annotation>
<annotation cp="👩🏿‍🤝‍👨🏼">couple | dark skin tone | hand | hold | man | man and woman holding hands | medium-light skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏿‍🤝‍👨🏽">couple | dark skin tone | hand | hold | man | man and woman holding hands | medium skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏿‍🤝‍👨🏾">couple | dark skin tone | hand | hold | man | man and woman holding hands | medium-dark skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👫🏿">couple | dark skin tone | hand | hold | man | man and woman holding hands | woman | woman and man holding hands</annotation>
<annotation cp="👫🏻">couple | hand | hold | light skin tone | man | man and woman holding hands | woman | woman and man holding hands | woman and man holding hands: light skin tone</annotation>
<annotation cp="👩🏻‍🤝‍👨🏼">couple | hand | hold | light skin tone | man | man and woman holding hands | medium-light skin tone | woman | woman and man holding hands | woman and man holding hands: light skin tone, medium-light skin tone</annotation>
<annotation cp="👩🏻‍🤝‍👨🏽">couple | hand | hold | light skin tone | man | man and woman holding hands | medium skin tone | woman | woman and man holding hands | woman and man holding hands: light skin tone, medium skin tone</annotation>
<annotation cp="👩🏻‍🤝‍👨🏾">couple | hand | hold | light skin tone | man | man and woman holding hands | medium-dark skin tone | woman | woman and man holding hands | woman and man holding hands: light skin tone, medium-dark skin tone</annotation>
<annotation cp="👩🏻‍🤝‍👨🏿">couple | dark skin tone | hand | hold | light skin tone | man | man and woman holding hands | woman | woman and man holding hands | woman and man holding hands: light skin tone, dark skin tone</annotation>
<annotation cp="👩🏼‍🤝‍👨🏻">couple | hand | hold | light skin tone | man | man and woman holding hands | medium-light skin tone | woman | woman and man holding hands | woman and man holding hands: medium-light skin tone, light skin tone</annotation>
<annotation cp="👫🏼">couple | hand | hold | man | man and woman holding hands | medium-light skin tone | woman | woman and man holding hands | woman and man holding hands: medium-light skin tone</annotation>
<annotation cp="👩🏼‍🤝‍👨🏽">couple | hand | hold | man | man and woman holding hands | medium skin tone | medium-light skin tone | woman | woman and man holding hands | woman and man holding hands: medium-light skin tone, medium skin tone</annotation>
<annotation cp="👩🏼‍🤝‍👨🏾">couple | hand | hold | man | man and woman holding hands | medium-dark skin tone | medium-light skin tone | woman | woman and man holding hands | woman and man holding hands: medium-light skin tone, medium-dark skin tone</annotation>
<annotation cp="👩🏼‍🤝‍👨🏿">couple | dark skin tone | hand | hold | man | man and woman holding hands | medium-light skin tone | woman | woman and man holding hands | woman and man holding hands: medium-light skin tone, dark skin tone</annotation>
<annotation cp="👩🏽‍🤝‍👨🏻">couple | hand | hold | light skin tone | man | man and woman holding hands | medium skin tone | woman | woman and man holding hands | woman and man holding hands: medium skin tone, light skin tone</annotation>
<annotation cp="👩🏽‍🤝‍👨🏼">couple | hand | hold | man | man and woman holding hands | medium skin tone | medium-light skin tone | woman | woman and man holding hands | woman and man holding hands: medium skin tone, medium-light skin tone</annotation>
<annotation cp="👫🏽">couple | hand | hold | man | man and woman holding hands | medium skin tone | woman | woman and man holding hands | woman and man holding hands: medium skin tone</annotation>
<annotation cp="👩🏽‍🤝‍👨🏾">couple | hand | hold | man | man and woman holding hands | medium skin tone | medium-dark skin tone | woman | woman and man holding hands | woman and man holding hands: medium skin tone, medium-dark skin tone</annotation>
<annotation cp="👩🏽‍🤝‍👨🏿">couple | dark skin tone | hand | hold | man | man and woman holding hands | medium skin tone | woman | woman and man holding hands | woman and man holding hands: medium skin tone, dark skin tone</annotation>
<annotation cp="👩🏾‍🤝‍👨🏻">couple | hand | hold | light skin tone | man | man and woman holding hands | medium-dark skin tone | woman | woman and man holding hands | woman and man holding hands: medium-dark skin tone, light skin tone</annotation>
<annotation cp="👩🏾‍🤝‍👨🏼">couple | hand | hold | man | man and woman holding hands | medium-dark skin tone | medium-light skin tone | woman | woman and man holding hands | woman and man holding hands: medium-dark skin tone, medium-light skin tone</annotation>
<annotation cp="👩🏾‍🤝‍👨🏽">couple | hand | hold | man | man and woman holding hands | medium skin tone | medium-dark skin tone | woman | woman and man holding hands | woman and man holding hands: medium-dark skin tone, medium skin tone</annotation>
<annotation cp="👫🏾">couple | hand | hold | man | man and woman holding hands | medium-dark skin tone | woman | woman and man holding hands | woman and man holding hands: medium-dark skin tone</annotation>
<annotation cp="👩🏾‍🤝‍👨🏿">couple | dark skin tone | hand | hold | man | man and woman holding hands | medium-dark skin tone | woman | woman and man holding hands | woman and man holding hands: medium-dark skin tone, dark skin tone</annotation>
<annotation cp="👩🏿‍🤝‍👨🏻">couple | dark skin tone | hand | hold | light skin tone | man | man and woman holding hands | woman | woman and man holding hands | woman and man holding hands: dark skin tone, light skin tone</annotation>
<annotation cp="👩🏿‍🤝‍👨🏼">couple | dark skin tone | hand | hold | man | man and woman holding hands | medium-light skin tone | woman | woman and man holding hands | woman and man holding hands: dark skin tone, medium-light skin tone</annotation>
<annotation cp="👩🏿‍🤝‍👨🏽">couple | dark skin tone | hand | hold | man | man and woman holding hands | medium skin tone | woman | woman and man holding hands | woman and man holding hands: dark skin tone, medium skin tone</annotation>
<annotation cp="👩🏿‍🤝‍👨🏾">couple | dark skin tone | hand | hold | man | man and woman holding hands | medium-dark skin tone | woman | woman and man holding hands | woman and man holding hands: dark skin tone, medium-dark skin tone</annotation>
<annotation cp="👫🏿">couple | dark skin tone | hand | hold | man | man and woman holding hands | woman | woman and man holding hands | woman and man holding hands: dark skin tone</annotation>
</annotations>
</ldml>
Loading

0 comments on commit bd565df

Please sign in to comment.