Skip to content
This repository has been archived by the owner on Jul 11, 2024. It is now read-only.

Upgrade to CLDR data version 35 #22

Merged
merged 2 commits into from
Apr 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ formatter.string(from: ["5 feet", "6 inch"]) // "5 feet, 6 inch"

### Localisation

The formatter is backed by an export of the Unicode CLDR data (version 34) and just like any other standard `NSFormatter` you can simply set the `locale` property to take advantage of over 200 languages and regional formats configurations provided.
The formatter is backed by an export of the Unicode CLDR data (version 35) and just like any other standard `NSFormatter` you can simply set the `locale` property to take advantage of over 200 languages and regional formats configurations provided.

```swift
let formatter = ListItemFormatter()
Expand Down
2 changes: 1 addition & 1 deletion Source/Resources.xcassets/am.dataset/am.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"2": "%1$@ ወይም %2$@"
},
"standardNarrow": {
"start": "%1$@ %2$@",
"start": "%1$@, %2$@",
"middle": "%1$@፣ %2$@",
"end": "%1$@, እና %2$@",
"2": "%1$@ እና %2$@"
Expand Down
6 changes: 3 additions & 3 deletions Source/Resources.xcassets/ar.dataset/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
"2": "%1$@ أو %2$@"
},
"standardNarrow": {
"start": "%1$@، و%2$@",
"middle": "%1$@، و%2$@",
"end": "%1$@، و%2$@",
"start": "%1$@ و%2$@",
"middle": "%1$@ و%2$@",
"end": "%1$@ و%2$@",
"2": "%1$@ و%2$@"
},
"standardShort": {
Expand Down
4 changes: 2 additions & 2 deletions Source/Resources.xcassets/as.dataset/as.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"standardNarrow": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@ আৰু %2$@",
"2": "%1$@ আৰু %2$@"
"end": "%1$@, %2$@",
"2": "%1$@, %2$@"
},
"standardShort": {
"start": "%1$@, %2$@",
Expand Down
4 changes: 2 additions & 2 deletions Source/Resources.xcassets/az.dataset/az.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"standardNarrow": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@ %2$@",
"2": "%1$@ %2$@"
"end": "%1$@, %2$@",
"2": "%1$@, %2$@"
},
"standardShort": {
"start": "%1$@, %2$@",
Expand Down
4 changes: 2 additions & 2 deletions Source/Resources.xcassets/ca.dataset/ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"standardNarrow": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@ i %2$@",
"2": "%1$@ i %2$@"
"end": "%1$@, %2$@",
"2": "%1$@, %2$@"
},
"standardShort": {
"start": "%1$@, %2$@",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"standardNarrow": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@ i %2$@",
"2": "%1$@ i %2$@"
"end": "%1$@, %2$@",
"2": "%1$@, %2$@"
},
"standardShort": {
"start": "%1$@, %2$@",
Expand Down
12 changes: 12 additions & 0 deletions Source/Resources.xcassets/ceb.dataset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"info": {
"version": 1,
"author": "xcode"
},
"data": [
{
"idiom": "universal",
"filename": "ceb.json"
}
]
}
59 changes: 59 additions & 0 deletions Source/Resources.xcassets/ceb.dataset/ceb.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"localeIdentifier": "ceb",
"listPatterns": {
"standard": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, at %2$@",
"2": "%1$@ at %2$@"
},
"or": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, or %2$@",
"2": "%1$@ or %2$@"
},
"orNarrow": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, or %2$@",
"2": "%1$@ or %2$@"
},
"orShort": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, or %2$@",
"2": "%1$@ or %2$@"
},
"standardNarrow": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, at %2$@",
"2": "%1$@ at %2$@"
},
"standardShort": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, at %2$@",
"2": "%1$@ at %2$@"
},
"unit": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, at %2$@",
"2": "%1$@ at %2$@"
},
"unitNarrow": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, at %2$@",
"2": "%1$@ at %2$@"
},
"unitShort": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, at %2$@",
"2": "%1$@ at %2$@"
}
}
}
8 changes: 4 additions & 4 deletions Source/Resources.xcassets/chr.dataset/chr.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@
"standardNarrow": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, ᎠᎴ %2$@",
"2": "%1$@ ᎠᎴ %2$@"
"end": "%1$@, & %2$@",
"2": "%1$@, %2$@"
},
"standardShort": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, ᎠᎴ %2$@",
"2": "%1$@ ᎠᎴ %2$@"
"end": "%1$@, & %2$@",
"2": "%1$@ & %2$@"
},
"unit": {
"start": "%1$@, %2$@",
Expand Down
4 changes: 2 additions & 2 deletions Source/Resources.xcassets/cs.dataset/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"standardNarrow": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@ a %2$@",
"2": "%1$@ a %2$@"
"end": "%1$@, %2$@",
"2": "%1$@, %2$@"
},
"standardShort": {
"start": "%1$@, %2$@",
Expand Down
4 changes: 2 additions & 2 deletions Source/Resources.xcassets/cy.dataset/cy.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"standardNarrow": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, a(c) %2$@",
"2": "%1$@ a(c) %2$@"
"end": "%1$@, %2$@",
"2": "%1$@, %2$@"
},
"standardShort": {
"start": "%1$@, %2$@",
Expand Down
4 changes: 2 additions & 2 deletions Source/Resources.xcassets/el.dataset/el.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"standardNarrow": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@ και %2$@",
"2": "%1$@ και %2$@"
"end": "%1$@, %2$@",
"2": "%1$@, %2$@"
},
"standardShort": {
"start": "%1$@, %2$@",
Expand Down
8 changes: 4 additions & 4 deletions Source/Resources.xcassets/en.dataset/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@
"standardNarrow": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, and %2$@",
"2": "%1$@ and %2$@"
"end": "%1$@, %2$@",
"2": "%1$@, %2$@"
},
"standardShort": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, and %2$@",
"2": "%1$@ and %2$@"
"end": "%1$@, & %2$@",
"2": "%1$@ & %2$@"
},
"unit": {
"start": "%1$@, %2$@",
Expand Down
6 changes: 3 additions & 3 deletions Source/Resources.xcassets/en_AU.dataset/en_AU.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@
"standardNarrow": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@ and %2$@",
"2": "%1$@ and %2$@"
"end": "%1$@, %2$@",
"2": "%1$@, %2$@"
},
"standardShort": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@ and %2$@",
"2": "%1$@ and %2$@"
"2": "%1$@ & %2$@"
},
"unit": {
"start": "%1$@, %2$@",
Expand Down
12 changes: 12 additions & 0 deletions Source/Resources.xcassets/en_CA.dataset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"info": {
"version": 1,
"author": "xcode"
},
"data": [
{
"idiom": "universal",
"filename": "en_CA.json"
}
]
}
59 changes: 59 additions & 0 deletions Source/Resources.xcassets/en_CA.dataset/en_CA.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"localeIdentifier": "en_CA",
"listPatterns": {
"standard": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, and %2$@",
"2": "%1$@ and %2$@"
},
"or": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, or %2$@",
"2": "%1$@ or %2$@"
},
"orNarrow": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, or %2$@",
"2": "%1$@ or %2$@"
},
"orShort": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, or %2$@",
"2": "%1$@ or %2$@"
},
"standardNarrow": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, and %2$@",
"2": "%1$@ and %2$@"
},
"standardShort": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, and %2$@",
"2": "%1$@ and %2$@"
},
"unit": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, %2$@",
"2": "%1$@, %2$@"
},
"unitNarrow": {
"start": "%1$@ %2$@",
"middle": "%1$@ %2$@",
"end": "%1$@ %2$@",
"2": "%1$@ %2$@"
},
"unitShort": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, %2$@",
"2": "%1$@, %2$@"
}
}
}
4 changes: 2 additions & 2 deletions Source/Resources.xcassets/en_GB.dataset/en_GB.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"standardNarrow": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@ and %2$@",
"2": "%1$@ and %2$@"
"end": "%1$@, %2$@",
"2": "%1$@, %2$@"
},
"standardShort": {
"start": "%1$@, %2$@",
Expand Down
12 changes: 12 additions & 0 deletions Source/Resources.xcassets/en_IN.dataset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"info": {
"version": 1,
"author": "xcode"
},
"data": [
{
"idiom": "universal",
"filename": "en_IN.json"
}
]
}
59 changes: 59 additions & 0 deletions Source/Resources.xcassets/en_IN.dataset/en_IN.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"localeIdentifier": "en_IN",
"listPatterns": {
"standard": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, and %2$@",
"2": "%1$@ and %2$@"
},
"or": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, or %2$@",
"2": "%1$@ or %2$@"
},
"orNarrow": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, or %2$@",
"2": "%1$@ or %2$@"
},
"orShort": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, or %2$@",
"2": "%1$@ or %2$@"
},
"standardNarrow": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, and %2$@",
"2": "%1$@, %2$@"
},
"standardShort": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, & %2$@",
"2": "%1$@ & %2$@"
},
"unit": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, %2$@",
"2": "%1$@, %2$@"
},
"unitNarrow": {
"start": "%1$@ %2$@",
"middle": "%1$@ %2$@",
"end": "%1$@ %2$@",
"2": "%1$@ %2$@"
},
"unitShort": {
"start": "%1$@, %2$@",
"middle": "%1$@, %2$@",
"end": "%1$@, %2$@",
"2": "%1$@, %2$@"
}
}
}
Loading