From 5f40521906712378848aec8e6f86a8fd09fb9d26 Mon Sep 17 00:00:00 2001 From: Tanuki Date: Thu, 28 Nov 2019 20:08:36 +1000 Subject: [PATCH] Update address format in China --- data/address-formats.json | 10 +++++++++- data/presets.yaml | 3 +++ data/presets/fields.json | 2 +- data/presets/fields/address.json | 3 +++ dist/locales/en.json | 3 +++ 5 files changed, 19 insertions(+), 2 deletions(-) diff --git a/data/address-formats.json b/data/address-formats.json index 7bad0ef5a..1afef963f 100644 --- a/data/address-formats.json +++ b/data/address-formats.json @@ -139,7 +139,15 @@ ["postcode", "province"], ["city", "district"], ["street", "housenumber"] - ] + ], + "widths": { + "postcode": 0.3, + "province": 0.7, + "city": 0.5, + "district": 0.5, + "street": 0.7, + "housenumber": 0.3 + } } ] } diff --git a/data/presets.yaml b/data/presets.yaml index 4cb6ad694..6998b7548 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -109,6 +109,7 @@ en: block_number: Block Number block_number!jp: Block No. city: City + city!cn: City/Prefecture/League city!jp: City/Town/Village/Tokyo Special Ward city!vn: City/Town conscriptionnumber: '123' @@ -116,6 +117,7 @@ en: county: County county!jp: District district: District + district!cn: District/County/Banner district!vn: Arrondissement/Town/District floor: Floor hamlet: Hamlet @@ -127,6 +129,7 @@ en: place: Place postcode: Postcode province: Province + province!cn: Province/Municipality/AR/SAR province!jp: Prefecture quarter: Quarter quarter!jp: Ōaza/Machi diff --git a/data/presets/fields.json b/data/presets/fields.json index 7b2289e24..e1d40902c 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -3,7 +3,7 @@ "access_simple": {"key": "access", "type": "combo", "label": "Allowed Access", "options": ["yes", "permissive", "private", "customers", "permit", "no"], "terms": ["permitted", "private", "public"]}, "access": {"keys": ["access", "foot", "motor_vehicle", "bicycle", "horse"], "reference": {"key": "access"}, "type": "access", "label": "Allowed Access", "placeholder": "Not Specified", "strings": {"types": {"access": "All", "foot": "Foot", "motor_vehicle": "Motor Vehicles", "bicycle": "Bicycles", "horse": "Horses"}, "options": {"yes": {"title": "Allowed", "description": "Access allowed by law; a right of way"}, "no": {"title": "Prohibited", "description": "Access not allowed to the general public"}, "permissive": {"title": "Permissive", "description": "Access allowed until such time as the owner revokes the permission"}, "private": {"title": "Private", "description": "Access allowed only with permission of the owner on an individual basis"}, "designated": {"title": "Designated", "description": "Access allowed according to signs or specific local laws"}, "destination": {"title": "Destination", "description": "Access allowed only to reach a destination"}, "dismount": {"title": "Dismount", "description": "Access allowed but rider must dismount"}, "permit": {"title": "Permit", "description": "Access allowed only with a valid permit or license"}}}}, "addr/interpolation": {"key": "addr:interpolation", "type": "combo", "label": "Type", "strings": {"options": {"all": "All", "even": "Even", "odd": "Odd", "alphabetic": "Alphabetic"}}}, - "address": {"type": "address", "key": "addr", "keys": ["addr:block_number", "addr:city", "addr:block_number", "addr:conscriptionnumber", "addr:county", "addr:country", "addr:county", "addr:district", "addr:floor", "addr:hamlet", "addr:housename", "addr:housenumber", "addr:neighbourhood", "addr:place", "addr:postcode", "addr:province", "addr:quarter", "addr:state", "addr:street", "addr:subdistrict", "addr:suburb", "addr:unit"], "icon": "address", "label": "Address", "strings": {"placeholders": {"block_number": "Block Number", "block_number!jp": "Block No.", "city": "City", "city!jp": "City/Town/Village/Tokyo Special Ward", "city!vn": "City/Town", "conscriptionnumber": "123", "country": "Country", "county": "County", "county!jp": "District", "district": "District", "district!vn": "Arrondissement/Town/District", "floor": "Floor", "hamlet": "Hamlet", "housename": "Housename", "housenumber": "123", "housenumber!jp": "Building No./Lot No.", "neighbourhood": "Neighbourhood", "neighbourhood!jp": "Chōme/Aza/Koaza", "place": "Place", "postcode": "Postcode", "province": "Province", "province!jp": "Prefecture", "quarter": "Quarter", "quarter!jp": "Ōaza/Machi", "state": "State", "street": "Street", "subdistrict": "Subdistrict", "subdistrict!vn": "Ward/Commune/Townlet", "suburb": "Suburb", "suburb!jp": "Ward", "unit": "Unit"}}, "terms": ["location"]}, + "address": {"type": "address", "key": "addr", "keys": ["addr:block_number", "addr:city", "addr:block_number", "addr:conscriptionnumber", "addr:county", "addr:country", "addr:county", "addr:district", "addr:floor", "addr:hamlet", "addr:housename", "addr:housenumber", "addr:neighbourhood", "addr:place", "addr:postcode", "addr:province", "addr:quarter", "addr:state", "addr:street", "addr:subdistrict", "addr:suburb", "addr:unit"], "icon": "address", "label": "Address", "strings": {"placeholders": {"block_number": "Block Number", "block_number!jp": "Block No.", "city": "City", "city!cn": "City/Prefecture/League", "city!jp": "City/Town/Village/Tokyo Special Ward", "city!vn": "City/Town", "conscriptionnumber": "123", "country": "Country", "county": "County", "county!jp": "District", "district": "District", "district!cn": "District/County/Banner", "district!vn": "Arrondissement/Town/District", "floor": "Floor", "hamlet": "Hamlet", "housename": "Housename", "housenumber": "123", "housenumber!jp": "Building No./Lot No.", "neighbourhood": "Neighbourhood", "neighbourhood!jp": "Chōme/Aza/Koaza", "place": "Place", "postcode": "Postcode", "province": "Province", "province!cn": "Province/Municipality/AR/SAR", "province!jp": "Prefecture", "quarter": "Quarter", "quarter!jp": "Ōaza/Machi", "state": "State", "street": "Street", "subdistrict": "Subdistrict", "subdistrict!vn": "Ward/Commune/Townlet", "suburb": "Suburb", "suburb!jp": "Ward", "unit": "Unit"}}, "terms": ["location"]}, "admin_level": {"key": "admin_level", "type": "number", "minValue": 1, "label": "Admin Level"}, "aerialway": {"key": "aerialway", "type": "typeCombo", "label": "Type"}, "aerialway/access": {"key": "aerialway:access", "type": "combo", "label": "Access", "strings": {"options": {"entry": "Entry", "exit": "Exit", "both": "Both"}}}, diff --git a/data/presets/fields/address.json b/data/presets/fields/address.json index 7359fbb5f..cd4eb7494 100644 --- a/data/presets/fields/address.json +++ b/data/presets/fields/address.json @@ -32,6 +32,7 @@ "block_number": "Block Number", "block_number!jp": "Block No.", "city": "City", + "city!cn": "City/Prefecture/League", "city!jp": "City/Town/Village/Tokyo Special Ward", "city!vn": "City/Town", "conscriptionnumber": "123", @@ -39,6 +40,7 @@ "county": "County", "county!jp": "District", "district": "District", + "district!cn": "District/County/Banner", "district!vn": "Arrondissement/Town/District", "floor": "Floor", "hamlet": "Hamlet", @@ -50,6 +52,7 @@ "place": "Place", "postcode": "Postcode", "province": "Province", + "province!cn": "Province/Municipality/AR/SAR", "province!jp": "Prefecture", "quarter": "Quarter", "quarter!jp": "Ōaza/Machi", diff --git a/dist/locales/en.json b/dist/locales/en.json index ed5894843..620f26f25 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2553,6 +2553,7 @@ "block_number": "Block Number", "block_number!jp": "Block No.", "city": "City", + "city!cn": "City/Prefecture/League", "city!jp": "City/Town/Village/Tokyo Special Ward", "city!vn": "City/Town", "conscriptionnumber": "123", @@ -2560,6 +2561,7 @@ "county": "County", "county!jp": "District", "district": "District", + "district!cn": "District/County/Banner", "district!vn": "Arrondissement/Town/District", "floor": "Floor", "hamlet": "Hamlet", @@ -2571,6 +2573,7 @@ "place": "Place", "postcode": "Postcode", "province": "Province", + "province!cn": "Province/Municipality/AR/SAR", "province!jp": "Prefecture", "quarter": "Quarter", "quarter!jp": "Ōaza/Machi",