From e647ad78ae6f12eeefb19759e3122bb4de92344b Mon Sep 17 00:00:00 2001 From: Przemek Perkowski Date: Wed, 14 Jan 2026 11:21:07 +0000 Subject: [PATCH 1/7] Add admin-area1 to formatting rules for DE, FR, NL and PL --- model/countries/DE/DE-formatting-rules.yaml | 10 ++++++++-- model/countries/FR/FR-formatting-rules.yaml | 10 ++++++++-- model/countries/NL/NL-formatting-rules.yaml | 11 ++++++++++- model/countries/PL/PL-formatting-rules.yaml | 12 ++++++++++-- 4 files changed, 36 insertions(+), 7 deletions(-) diff --git a/model/countries/DE/DE-formatting-rules.yaml b/model/countries/DE/DE-formatting-rules.yaml index e73ac5e..fd25d34 100644 --- a/model/countries/DE/DE-formatting-rules.yaml +++ b/model/countries/DE/DE-formatting-rules.yaml @@ -1,15 +1,19 @@ formatting-rules: address: + # {street-address-alternative-1} + # {postal-code} {locality1} + # {admin-area1} + # {country-name} - street-address-alternative-1 - separator: "\n" - postal-code - - separator: " " - locality1 - separator: "\n" + - admin-area1 + - separator: "\n" - country-name - skip: country # redundant with country-name - skip: street-address # redundant with street-address-alternative-1 - - skip: admin-area1 street-address-alternative-1: - building-location @@ -42,6 +46,7 @@ examples: address-overflow: Obergeschoss 2 Wohnung 3 locality1: Enkenbach postal-code: 67677 + admin-area1: Rheinland-Pfalz country: DE country-name: Deutschland @@ -52,4 +57,5 @@ examples: Mozartstr. 9 Obergeschoss 2 Wohnung 3 67677 Enkenbach + Rheinland-Pfalz Deutschland diff --git a/model/countries/FR/FR-formatting-rules.yaml b/model/countries/FR/FR-formatting-rules.yaml index 8edeeba..67301a7 100644 --- a/model/countries/FR/FR-formatting-rules.yaml +++ b/model/countries/FR/FR-formatting-rules.yaml @@ -1,17 +1,22 @@ formatting-rules: address: + # {street-address-alternative-1} + # {locality2} + # {postal-code} {locality1} + # {admin-area1} + # {country-name} - street-address-alternative-1 - separator: "\n" - locality2 - separator: "\n" - postal-code - - separator: " " - locality1 - separator: "\n" + - admin-area1 + - separator: "\n" - country-name - skip: country # redundant with country-name - skip: street-address # redundant with street-address-alternative-1 - - skip: admin-area1 # redundant with postal-code street-address-alternative-1: - building-location @@ -57,4 +62,5 @@ examples: Appartament 36 Quartier du Marais 59491 Villeneuve-d'ascq + Nord-Pas-de-Calais France \ No newline at end of file diff --git a/model/countries/NL/NL-formatting-rules.yaml b/model/countries/NL/NL-formatting-rules.yaml index f1e0fbc..566f87e 100644 --- a/model/countries/NL/NL-formatting-rules.yaml +++ b/model/countries/NL/NL-formatting-rules.yaml @@ -1,15 +1,20 @@ formatting-rules: address: + # {street-address-alternative-1} + # {postal-code} {locality1} + # {admin-area1} + # {country-name} - street-address-alternative-1 - separator: "\n" - postal-code - separator: " " - locality1 - separator: "\n" + - admin-area1 + - separator: "\n" - country-name - skip: country # redundant with country-name - skip: street-address # redundant with street-address-alternative-1 - - skip: admin-area1 # not commonly used street-address-alternative-1: - building-location @@ -52,6 +57,7 @@ examples: locality1: Amsterdam postal-code-prefix: 1234 postal-code-suffix: AB + admin-area1: Noord-Holland country: NL country-name: Netherlands output: @@ -60,6 +66,7 @@ examples: text: | Kerkstraat 10-A 1234 AB Amsterdam + Noord-Holland Netherlands - id: address-without-unit @@ -72,6 +79,7 @@ examples: locality1: Amsterdam postal-code-prefix: 1234 postal-code-suffix: AB + admin-area1: Noord-Holland country: NL country-name: Netherlands output: @@ -80,4 +88,5 @@ examples: text: | Kerkstraat 10 1234 AB Amsterdam + Noord-Holland Netherlands diff --git a/model/countries/PL/PL-formatting-rules.yaml b/model/countries/PL/PL-formatting-rules.yaml index 8d276c4..b3de511 100644 --- a/model/countries/PL/PL-formatting-rules.yaml +++ b/model/countries/PL/PL-formatting-rules.yaml @@ -1,15 +1,19 @@ formatting-rules: address: + # {street-address-alternative-1} + # {postal-code} {locality1} + # {admin-area1} + # {country-name} - street-address-alternative-1 - separator: "\n" - postal-code - - separator: " " - locality1 - separator: "\n" + - admin-area1 + - separator: "\n" - country-name - skip: country # redundant with country-name - skip: street-address # redundant with street-address-alternative-1 - - skip: admin-area1 street-address-alternative-1: - building-location @@ -46,6 +50,7 @@ examples: building-and-unit: 9/10 locality1: Warsaw postal-code: 01-001 + admin-area1: mazowieckie country: PL country-name: Polska @@ -55,6 +60,7 @@ examples: text: | ul. Warsaw 9/10 01-001 Warsaw + mazowieckie Polska - id: address-without-apartment @@ -66,6 +72,7 @@ examples: building-and-unit: 9 locality1: Warsaw postal-code: 01-001 + admin-area1: mazowieckie country: PL country-name: Polska @@ -75,4 +82,5 @@ examples: text: | ul. Warsaw 9 01-001 Warsaw + mazowieckie Polska From 401737e2fdcf028b3f602ba2cd487e3184f952df Mon Sep 17 00:00:00 2001 From: Przemek Perkowski Date: Wed, 14 Jan 2026 11:22:42 +0000 Subject: [PATCH 2/7] Cleanup the comments in formatting rules of all the countries for consistency --- model/countries/AU/AU-formatting-rules.yaml | 5 +++-- model/countries/BR/BR-formatting-rules.yaml | 13 +++++++++---- model/countries/CA/CA-formatting-rules.yaml | 4 +++- model/countries/IN/IN-formatting-rules.yaml | 7 +++++++ model/countries/IT/IT-formatting-rules.yaml | 5 +++-- model/countries/MX/MX-formatting-rules.yaml | 8 +++++--- model/countries/US/US-formatting-rules.yaml | 6 +++--- model/countries/XX/XX-formatting-rules.yaml | 6 +++--- 8 files changed, 36 insertions(+), 18 deletions(-) diff --git a/model/countries/AU/AU-formatting-rules.yaml b/model/countries/AU/AU-formatting-rules.yaml index c61ad7a..9307588 100644 --- a/model/countries/AU/AU-formatting-rules.yaml +++ b/model/countries/AU/AU-formatting-rules.yaml @@ -1,11 +1,12 @@ formatting-rules: address: + # {street-address-alternative-1} + # {locality1} {admin-area1} {postal-code} + # {country-name} - street-address-alternative-1 - separator: "\n" - locality1 - - separator: " " - admin-area1 - - separator: " " - postal-code - separator: "\n" - country-name diff --git a/model/countries/BR/BR-formatting-rules.yaml b/model/countries/BR/BR-formatting-rules.yaml index e703dc4..046c7f4 100644 --- a/model/countries/BR/BR-formatting-rules.yaml +++ b/model/countries/BR/BR-formatting-rules.yaml @@ -1,5 +1,10 @@ formatting-rules: address: + # {street-address-alternative-1} + # {locality2} + # {locality1} - {admin-area1} + # {postal-code} + # {country-name} - street-address-alternative-1 - separator: "\n" - locality2 @@ -29,10 +34,10 @@ formatting-rules: - in-building-location in-building-location: - - prefix: "Andar " - - floor - - separator: ", " - - unit + - prefix: "Andar " + - floor + - separator: ", " + - unit building-location: - street diff --git a/model/countries/CA/CA-formatting-rules.yaml b/model/countries/CA/CA-formatting-rules.yaml index 3ae98d6..4a8d503 100644 --- a/model/countries/CA/CA-formatting-rules.yaml +++ b/model/countries/CA/CA-formatting-rules.yaml @@ -1,5 +1,8 @@ formatting-rules: address: + # {street-address} + # {locality1}, {admin-area1} {postal-code} + # {country-name} - street-address - separator: "\n" - locality1 @@ -9,7 +12,6 @@ formatting-rules: - separator: "\n" - country-name - skip: country # redundant with country-name - - skip: street-address # redundant with street-address-alternative-1 postal-code: - postal-code-prefix diff --git a/model/countries/IN/IN-formatting-rules.yaml b/model/countries/IN/IN-formatting-rules.yaml index 8527944..8fd605f 100644 --- a/model/countries/IN/IN-formatting-rules.yaml +++ b/model/countries/IN/IN-formatting-rules.yaml @@ -1,5 +1,12 @@ formatting-rules: address: + # {building-location} + # {locality2} + # {landmark} + # {locality1} + # {admin-area1} + # {postal-code} + # {country-name} - building-location - separator: "\n" - locality2 diff --git a/model/countries/IT/IT-formatting-rules.yaml b/model/countries/IT/IT-formatting-rules.yaml index dc61814..a4a0db6 100644 --- a/model/countries/IT/IT-formatting-rules.yaml +++ b/model/countries/IT/IT-formatting-rules.yaml @@ -1,11 +1,12 @@ formatting-rules: address: + # {street-address-alternative-1} + # {postal-code} {locality1} {admin-area1} + # {country-name} - street-address-alternative-1 - separator: "\n" - postal-code - - separator: " " - locality1 - - separator: " " - admin-area1 - separator: "\n" - country-name diff --git a/model/countries/MX/MX-formatting-rules.yaml b/model/countries/MX/MX-formatting-rules.yaml index ae5c278..024241e 100644 --- a/model/countries/MX/MX-formatting-rules.yaml +++ b/model/countries/MX/MX-formatting-rules.yaml @@ -1,19 +1,21 @@ formatting-rules: address: + # {street-address-alternative-1} + # {locality2} + # {admin-area2} + # {post-code} {locality1}, {admin-area1} + # {country-name} - street-address-alternative-1 - separator: "\n" - # {neighborhood} - locality2 - separator: "\n" - admin-area2 - separator: "\n" - # {post-code} {city}, {state} - postal-code - locality1 - separator: ", " - admin-area1 - separator: "\n" - # {country} - country-name - skip: country # redundant with country-name - skip: street-address # redundant with street-address-alternative-1 diff --git a/model/countries/US/US-formatting-rules.yaml b/model/countries/US/US-formatting-rules.yaml index 828d8bf..2a18acb 100644 --- a/model/countries/US/US-formatting-rules.yaml +++ b/model/countries/US/US-formatting-rules.yaml @@ -1,17 +1,17 @@ formatting-rules: address: + # {street-address} + # {locality1}, {admin-area1} {postal-code} + # {country-name} - street-address - separator: "\n" - # {city}, {state} {post-code} - locality1 - separator: ", " - admin-area1 - postal-code - separator: "\n" - # {country} - country-name - skip: country # redundant with country-name - - skip: street-address # redundant with street-address-alternative-1 examples: - id: name diff --git a/model/countries/XX/XX-formatting-rules.yaml b/model/countries/XX/XX-formatting-rules.yaml index 19dffbe..347bd9f 100644 --- a/model/countries/XX/XX-formatting-rules.yaml +++ b/model/countries/XX/XX-formatting-rules.yaml @@ -1,8 +1,10 @@ formatting-rules: address: + # {street-address-alternative-1} + # {locality1} {locality2}, {admin-area1} {admin-area2} {postal-code} + # {country-name} - street-address-alternative-1 - separator: "\n" - # {city} {dummy-neighborhood}, {state} {dummy-adminarea2} {post-code} - locality1 - locality2 - separator: ", " @@ -10,7 +12,6 @@ formatting-rules: - admin-area2 - postal-code - separator: "\n" - # {country} - country-name - skip: country # redundant with country-name - skip: street-address # redundant with street-address-alternative-1 @@ -23,7 +24,6 @@ formatting-rules: - separator: "\n" - in-building-location - # Apartamento 5A, Piso 10 in-building-location: - prefix: "Apt. " - unit-name From e6f4861e9086ce5e5b822d2e285cf14daeb8d62e Mon Sep 17 00:00:00 2001 From: Przemek Perkowski Date: Wed, 21 Jan 2026 16:27:05 +0000 Subject: [PATCH 3/7] Update per-country .html files in docs/model. --- docs/model/AU.html | 4 ++-- docs/model/DE.html | 9 +++++++-- docs/model/FR.html | 5 +++-- docs/model/IT.html | 4 ++-- docs/model/NL.html | 14 ++++++++++++-- docs/model/PL.html | 14 ++++++++++++-- 6 files changed, 38 insertions(+), 12 deletions(-) diff --git a/docs/model/AU.html b/docs/model/AU.html index 0f0f8a7..d3748a2 100644 --- a/docs/model/AU.html +++ b/docs/model/AU.html @@ -3792,13 +3792,13 @@

Children:

Formatting:

address = -street-address-alternative-1⏎locality1␣admin-area1␣postal-code⏎country-name +street-address-alternative-1⏎locality1admin-area1postal-code⏎country-name
Flattened formatting:
address =
-unit-typeunit-name␣Level floor␣␣building␣street
locality1␣admin-area1␣postal-code-prefix-postal-code-suffix
country-name +unit-typeunit-name␣Level floor␣␣building␣street
locality1admin-area1postal-code-prefix-postal-code-suffix
country-name

diff --git a/docs/model/DE.html b/docs/model/DE.html index 49acc67..14adf23 100644 --- a/docs/model/DE.html +++ b/docs/model/DE.html @@ -1615,6 +1615,10 @@

Example addresses

+ + admin-area1
Rheinland-Pfalz
+ + @@ -1692,6 +1696,7 @@

Example addresses

Mozartstr. 9
 Obergeschoss 2 Wohnung 3
 67677 Enkenbach
+Rheinland-Pfalz
 Deutschland
@@ -3986,13 +3991,13 @@

Children:

Formatting:

address = -street-address-alternative-1⏎postal-code␣locality1⏎country-name +street-address-alternative-1⏎postal-codelocality1⏎admin-area1⏎country-name
Flattened formatting:
address =
-street␣building
address-overflow
postal-code-prefix-postal-code-suffix␣locality1
country-name +street␣building
address-overflow
postal-code-prefix-postal-code-suffixlocality1
admin-area1
country-name

diff --git a/docs/model/FR.html b/docs/model/FR.html index 4cde68c..49d1d3b 100644 --- a/docs/model/FR.html +++ b/docs/model/FR.html @@ -1565,6 +1565,7 @@

Example addresses

Appartament 36 Quartier du Marais 59491 Villeneuve-d'ascq +Nord-Pas-de-Calais France @@ -3565,13 +3566,13 @@

Children:

Formatting:

address = -street-address-alternative-1⏎locality2⏎postal-code␣locality1⏎country-name +street-address-alternative-1⏎locality2⏎postal-codelocality1⏎admin-area1⏎country-name
Flattened formatting:
address =
-building␣street
address-overflow
locality2
postal-code-prefix-postal-code-suffix␣locality1
country-name +building␣street
address-overflow
locality2
postal-code-prefix-postal-code-suffixlocality1
admin-area1
country-name

diff --git a/docs/model/IT.html b/docs/model/IT.html index 39c8122..b5e63c0 100644 --- a/docs/model/IT.html +++ b/docs/model/IT.html @@ -3746,13 +3746,13 @@

Children:

Formatting:

address = -street-address-alternative-1⏎postal-code␣locality1␣admin-area1⏎country-name +street-address-alternative-1⏎postal-codelocality1admin-area1⏎country-name
Flattened formatting:
address =
-street␣building,␣address-overflow
postal-code-prefix-postal-code-suffix␣locality1␣admin-area1
country-name +street␣building,␣address-overflow
postal-code-prefix-postal-code-suffixlocality1admin-area1
country-name

diff --git a/docs/model/NL.html b/docs/model/NL.html index ba83054..9533e0b 100644 --- a/docs/model/NL.html +++ b/docs/model/NL.html @@ -1691,6 +1691,10 @@

Example addresses

+ + admin-area1
Noord-Holland
+ + @@ -1771,6 +1775,7 @@

Example addresses

Output for "address":
Kerkstraat 10-A
 1234 AB Amsterdam
+Noord-Holland
 Netherlands
@@ -1862,6 +1867,10 @@

Example addresses

+ + admin-area1
Noord-Holland
+ + @@ -1942,6 +1951,7 @@

Example addresses

Output for "address":
Kerkstraat 10
 1234 AB Amsterdam
+Noord-Holland
 Netherlands
@@ -4082,13 +4092,13 @@

Children:

Formatting:

address = -street-address-alternative-1⏎postal-code␣locality1⏎country-name +street-address-alternative-1⏎postal-code␣locality1⏎admin-area1⏎country-name
Flattened formatting:
address =
-street␣building-unit-typeunit-name
postal-code-prefixpostal-code-suffix␣locality1
country-name +street␣building-unit-typeunit-name
postal-code-prefixpostal-code-suffix␣locality1
admin-area1
country-name

diff --git a/docs/model/PL.html b/docs/model/PL.html index a715ac5..f608b13 100644 --- a/docs/model/PL.html +++ b/docs/model/PL.html @@ -1608,6 +1608,10 @@

Example addresses

+ + admin-area1
mazowieckie
+ + @@ -1684,6 +1688,7 @@

Example addresses

Output for "address":
ul. Warsaw 9/10
 01-001 Warsaw
+mazowieckie
 Polska
@@ -1769,6 +1774,10 @@

Example addresses

+ + admin-area1
mazowieckie
+ + @@ -1845,6 +1854,7 @@

Example addresses

Output for "address":
ul. Warsaw 9
 01-001 Warsaw
+mazowieckie
 Polska
@@ -3840,13 +3850,13 @@

Children:

Formatting:

address = -street-address-alternative-1⏎postal-code␣locality1⏎country-name +street-address-alternative-1⏎postal-codelocality1⏎admin-area1⏎country-name
Flattened formatting:
address =
-street␣building/unit-typeunit-name
postal-code-prefix-postal-code-suffix␣locality1
country-name +street␣building/unit-typeunit-name
postal-code-prefix-postal-code-suffixlocality1
admin-area1
country-name

From 137a8a60adb85fefe487f188a007b96b863c3700 Mon Sep 17 00:00:00 2001 From: Przemek Perkowski Date: Wed, 21 Jan 2026 16:31:00 +0000 Subject: [PATCH 4/7] Revert the file formatting change in BR --- model/countries/BR/BR-formatting-rules.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/model/countries/BR/BR-formatting-rules.yaml b/model/countries/BR/BR-formatting-rules.yaml index 046c7f4..aebaa60 100644 --- a/model/countries/BR/BR-formatting-rules.yaml +++ b/model/countries/BR/BR-formatting-rules.yaml @@ -34,10 +34,10 @@ formatting-rules: - in-building-location in-building-location: - - prefix: "Andar " - - floor - - separator: ", " - - unit + - prefix: "Andar " + - floor + - separator: ", " + - unit building-location: - street From 393f61dcb686dcb9d0a9715bf44673afd2376634 Mon Sep 17 00:00:00 2001 From: Przemek Perkowski Date: Tue, 27 Jan 2026 16:01:57 +0000 Subject: [PATCH 5/7] Delete useless comments in the formatting rules yaml files --- model/countries/AU/AU-formatting-rules.yaml | 3 --- model/countries/BR/BR-formatting-rules.yaml | 5 ----- model/countries/CA/CA-formatting-rules.yaml | 3 --- model/countries/DE/DE-formatting-rules.yaml | 4 ---- model/countries/FR/FR-formatting-rules.yaml | 5 ----- model/countries/IN/IN-formatting-rules.yaml | 7 ------- model/countries/IT/IT-formatting-rules.yaml | 3 --- model/countries/MX/MX-formatting-rules.yaml | 5 ----- model/countries/NL/NL-formatting-rules.yaml | 4 ---- model/countries/PL/PL-formatting-rules.yaml | 4 ---- model/countries/US/US-formatting-rules.yaml | 3 --- model/countries/XX/XX-formatting-rules.yaml | 3 --- 12 files changed, 49 deletions(-) diff --git a/model/countries/AU/AU-formatting-rules.yaml b/model/countries/AU/AU-formatting-rules.yaml index 9307588..712ea2b 100644 --- a/model/countries/AU/AU-formatting-rules.yaml +++ b/model/countries/AU/AU-formatting-rules.yaml @@ -1,8 +1,5 @@ formatting-rules: address: - # {street-address-alternative-1} - # {locality1} {admin-area1} {postal-code} - # {country-name} - street-address-alternative-1 - separator: "\n" - locality1 diff --git a/model/countries/BR/BR-formatting-rules.yaml b/model/countries/BR/BR-formatting-rules.yaml index aebaa60..e703dc4 100644 --- a/model/countries/BR/BR-formatting-rules.yaml +++ b/model/countries/BR/BR-formatting-rules.yaml @@ -1,10 +1,5 @@ formatting-rules: address: - # {street-address-alternative-1} - # {locality2} - # {locality1} - {admin-area1} - # {postal-code} - # {country-name} - street-address-alternative-1 - separator: "\n" - locality2 diff --git a/model/countries/CA/CA-formatting-rules.yaml b/model/countries/CA/CA-formatting-rules.yaml index 4a8d503..41696ee 100644 --- a/model/countries/CA/CA-formatting-rules.yaml +++ b/model/countries/CA/CA-formatting-rules.yaml @@ -1,8 +1,5 @@ formatting-rules: address: - # {street-address} - # {locality1}, {admin-area1} {postal-code} - # {country-name} - street-address - separator: "\n" - locality1 diff --git a/model/countries/DE/DE-formatting-rules.yaml b/model/countries/DE/DE-formatting-rules.yaml index fd25d34..02eeda3 100644 --- a/model/countries/DE/DE-formatting-rules.yaml +++ b/model/countries/DE/DE-formatting-rules.yaml @@ -1,9 +1,5 @@ formatting-rules: address: - # {street-address-alternative-1} - # {postal-code} {locality1} - # {admin-area1} - # {country-name} - street-address-alternative-1 - separator: "\n" - postal-code diff --git a/model/countries/FR/FR-formatting-rules.yaml b/model/countries/FR/FR-formatting-rules.yaml index 67301a7..1244758 100644 --- a/model/countries/FR/FR-formatting-rules.yaml +++ b/model/countries/FR/FR-formatting-rules.yaml @@ -1,10 +1,5 @@ formatting-rules: address: - # {street-address-alternative-1} - # {locality2} - # {postal-code} {locality1} - # {admin-area1} - # {country-name} - street-address-alternative-1 - separator: "\n" - locality2 diff --git a/model/countries/IN/IN-formatting-rules.yaml b/model/countries/IN/IN-formatting-rules.yaml index 8fd605f..8527944 100644 --- a/model/countries/IN/IN-formatting-rules.yaml +++ b/model/countries/IN/IN-formatting-rules.yaml @@ -1,12 +1,5 @@ formatting-rules: address: - # {building-location} - # {locality2} - # {landmark} - # {locality1} - # {admin-area1} - # {postal-code} - # {country-name} - building-location - separator: "\n" - locality2 diff --git a/model/countries/IT/IT-formatting-rules.yaml b/model/countries/IT/IT-formatting-rules.yaml index a4a0db6..b6ee09b 100644 --- a/model/countries/IT/IT-formatting-rules.yaml +++ b/model/countries/IT/IT-formatting-rules.yaml @@ -1,8 +1,5 @@ formatting-rules: address: - # {street-address-alternative-1} - # {postal-code} {locality1} {admin-area1} - # {country-name} - street-address-alternative-1 - separator: "\n" - postal-code diff --git a/model/countries/MX/MX-formatting-rules.yaml b/model/countries/MX/MX-formatting-rules.yaml index 024241e..703f2b8 100644 --- a/model/countries/MX/MX-formatting-rules.yaml +++ b/model/countries/MX/MX-formatting-rules.yaml @@ -1,10 +1,5 @@ formatting-rules: address: - # {street-address-alternative-1} - # {locality2} - # {admin-area2} - # {post-code} {locality1}, {admin-area1} - # {country-name} - street-address-alternative-1 - separator: "\n" - locality2 diff --git a/model/countries/NL/NL-formatting-rules.yaml b/model/countries/NL/NL-formatting-rules.yaml index 566f87e..4512a44 100644 --- a/model/countries/NL/NL-formatting-rules.yaml +++ b/model/countries/NL/NL-formatting-rules.yaml @@ -1,9 +1,5 @@ formatting-rules: address: - # {street-address-alternative-1} - # {postal-code} {locality1} - # {admin-area1} - # {country-name} - street-address-alternative-1 - separator: "\n" - postal-code diff --git a/model/countries/PL/PL-formatting-rules.yaml b/model/countries/PL/PL-formatting-rules.yaml index b3de511..5e219eb 100644 --- a/model/countries/PL/PL-formatting-rules.yaml +++ b/model/countries/PL/PL-formatting-rules.yaml @@ -1,9 +1,5 @@ formatting-rules: address: - # {street-address-alternative-1} - # {postal-code} {locality1} - # {admin-area1} - # {country-name} - street-address-alternative-1 - separator: "\n" - postal-code diff --git a/model/countries/US/US-formatting-rules.yaml b/model/countries/US/US-formatting-rules.yaml index 2a18acb..677f3ea 100644 --- a/model/countries/US/US-formatting-rules.yaml +++ b/model/countries/US/US-formatting-rules.yaml @@ -1,8 +1,5 @@ formatting-rules: address: - # {street-address} - # {locality1}, {admin-area1} {postal-code} - # {country-name} - street-address - separator: "\n" - locality1 diff --git a/model/countries/XX/XX-formatting-rules.yaml b/model/countries/XX/XX-formatting-rules.yaml index 347bd9f..7753294 100644 --- a/model/countries/XX/XX-formatting-rules.yaml +++ b/model/countries/XX/XX-formatting-rules.yaml @@ -1,8 +1,5 @@ formatting-rules: address: - # {street-address-alternative-1} - # {locality1} {locality2}, {admin-area1} {admin-area2} {postal-code} - # {country-name} - street-address-alternative-1 - separator: "\n" - locality1 From 3d9e6386d50392f65bde7d5a9e94a93eb0686f90 Mon Sep 17 00:00:00 2001 From: Przemek Perkowski Date: Tue, 27 Jan 2026 16:05:06 +0000 Subject: [PATCH 6/7] Add default space separators --- model/countries/AU/AU-formatting-rules.yaml | 2 ++ model/countries/CA/CA-formatting-rules.yaml | 1 + model/countries/DE/DE-formatting-rules.yaml | 1 + model/countries/FR/FR-formatting-rules.yaml | 1 + model/countries/IT/IT-formatting-rules.yaml | 2 ++ model/countries/MX/MX-formatting-rules.yaml | 1 + model/countries/PL/PL-formatting-rules.yaml | 1 + model/countries/US/US-formatting-rules.yaml | 1 + model/countries/XX/XX-formatting-rules.yaml | 3 +++ 9 files changed, 13 insertions(+) diff --git a/model/countries/AU/AU-formatting-rules.yaml b/model/countries/AU/AU-formatting-rules.yaml index 712ea2b..c61ad7a 100644 --- a/model/countries/AU/AU-formatting-rules.yaml +++ b/model/countries/AU/AU-formatting-rules.yaml @@ -3,7 +3,9 @@ formatting-rules: - street-address-alternative-1 - separator: "\n" - locality1 + - separator: " " - admin-area1 + - separator: " " - postal-code - separator: "\n" - country-name diff --git a/model/countries/CA/CA-formatting-rules.yaml b/model/countries/CA/CA-formatting-rules.yaml index 41696ee..a527349 100644 --- a/model/countries/CA/CA-formatting-rules.yaml +++ b/model/countries/CA/CA-formatting-rules.yaml @@ -5,6 +5,7 @@ formatting-rules: - locality1 - separator: ", " - admin-area1 + - separator: " " - postal-code - separator: "\n" - country-name diff --git a/model/countries/DE/DE-formatting-rules.yaml b/model/countries/DE/DE-formatting-rules.yaml index 02eeda3..36fdc09 100644 --- a/model/countries/DE/DE-formatting-rules.yaml +++ b/model/countries/DE/DE-formatting-rules.yaml @@ -3,6 +3,7 @@ formatting-rules: - street-address-alternative-1 - separator: "\n" - postal-code + - separator: " " - locality1 - separator: "\n" - admin-area1 diff --git a/model/countries/FR/FR-formatting-rules.yaml b/model/countries/FR/FR-formatting-rules.yaml index 1244758..ad486ce 100644 --- a/model/countries/FR/FR-formatting-rules.yaml +++ b/model/countries/FR/FR-formatting-rules.yaml @@ -5,6 +5,7 @@ formatting-rules: - locality2 - separator: "\n" - postal-code + - separator: " " - locality1 - separator: "\n" - admin-area1 diff --git a/model/countries/IT/IT-formatting-rules.yaml b/model/countries/IT/IT-formatting-rules.yaml index b6ee09b..dc61814 100644 --- a/model/countries/IT/IT-formatting-rules.yaml +++ b/model/countries/IT/IT-formatting-rules.yaml @@ -3,7 +3,9 @@ formatting-rules: - street-address-alternative-1 - separator: "\n" - postal-code + - separator: " " - locality1 + - separator: " " - admin-area1 - separator: "\n" - country-name diff --git a/model/countries/MX/MX-formatting-rules.yaml b/model/countries/MX/MX-formatting-rules.yaml index 703f2b8..97da328 100644 --- a/model/countries/MX/MX-formatting-rules.yaml +++ b/model/countries/MX/MX-formatting-rules.yaml @@ -7,6 +7,7 @@ formatting-rules: - admin-area2 - separator: "\n" - postal-code + - separator: " " - locality1 - separator: ", " - admin-area1 diff --git a/model/countries/PL/PL-formatting-rules.yaml b/model/countries/PL/PL-formatting-rules.yaml index 5e219eb..86fdc57 100644 --- a/model/countries/PL/PL-formatting-rules.yaml +++ b/model/countries/PL/PL-formatting-rules.yaml @@ -3,6 +3,7 @@ formatting-rules: - street-address-alternative-1 - separator: "\n" - postal-code + - separator: " " - locality1 - separator: "\n" - admin-area1 diff --git a/model/countries/US/US-formatting-rules.yaml b/model/countries/US/US-formatting-rules.yaml index 677f3ea..93fdb34 100644 --- a/model/countries/US/US-formatting-rules.yaml +++ b/model/countries/US/US-formatting-rules.yaml @@ -5,6 +5,7 @@ formatting-rules: - locality1 - separator: ", " - admin-area1 + - separator: " " - postal-code - separator: "\n" - country-name diff --git a/model/countries/XX/XX-formatting-rules.yaml b/model/countries/XX/XX-formatting-rules.yaml index 7753294..c1ec30e 100644 --- a/model/countries/XX/XX-formatting-rules.yaml +++ b/model/countries/XX/XX-formatting-rules.yaml @@ -3,10 +3,13 @@ formatting-rules: - street-address-alternative-1 - separator: "\n" - locality1 + - separator: " " - locality2 - separator: ", " - admin-area1 + - separator: " " - admin-area2 + - separator: " " - postal-code - separator: "\n" - country-name From 53e8bd05319f396c3fd477a34e9db6a77a3ef592 Mon Sep 17 00:00:00 2001 From: Przemek Perkowski Date: Tue, 27 Jan 2026 16:08:45 +0000 Subject: [PATCH 7/7] Update the html files to match the empty delimeter --- docs/model/AU.html | 4 ++-- docs/model/CA.html | 4 ++-- docs/model/DE.html | 4 ++-- docs/model/FR.html | 4 ++-- docs/model/IT.html | 4 ++-- docs/model/MX.html | 4 ++-- docs/model/PL.html | 4 ++-- docs/model/US.html | 4 ++-- docs/model/XX.html | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/model/AU.html b/docs/model/AU.html index d3748a2..0f0f8a7 100644 --- a/docs/model/AU.html +++ b/docs/model/AU.html @@ -3792,13 +3792,13 @@

Children:

Formatting:

address = -street-address-alternative-1⏎locality1admin-area1postal-code⏎country-name +street-address-alternative-1⏎locality1␣admin-area1␣postal-code⏎country-name
Flattened formatting:
address =
-unit-typeunit-name␣Level floor␣␣building␣street
locality1admin-area1postal-code-prefix-postal-code-suffix
country-name +unit-typeunit-name␣Level floor␣␣building␣street
locality1␣admin-area1␣postal-code-prefix-postal-code-suffix
country-name

diff --git a/docs/model/CA.html b/docs/model/CA.html index c642a46..253991b 100644 --- a/docs/model/CA.html +++ b/docs/model/CA.html @@ -3359,13 +3359,13 @@

Children:

Formatting:

address = -street-address⏎locality1,␣admin-area1postal-code⏎country-name +street-address⏎locality1,␣admin-area1␣postal-code⏎country-name
Flattened formatting:
address =
-address-line1
address-line2
address-line3
address-line4
locality1,␣admin-area1postal-code-prefixpostal-code-suffix
country-name +address-line1
address-line2
address-line3
address-line4
locality1,␣admin-area1␣postal-code-prefixpostal-code-suffix
country-name

diff --git a/docs/model/DE.html b/docs/model/DE.html index 14adf23..c980086 100644 --- a/docs/model/DE.html +++ b/docs/model/DE.html @@ -3991,13 +3991,13 @@

Children:

Formatting:

address = -street-address-alternative-1⏎postal-codelocality1⏎admin-area1⏎country-name +street-address-alternative-1⏎postal-code␣locality1⏎admin-area1⏎country-name
Flattened formatting:
address =
-street␣building
address-overflow
postal-code-prefix-postal-code-suffixlocality1
admin-area1
country-name +street␣building
address-overflow
postal-code-prefix-postal-code-suffix␣locality1
admin-area1
country-name

diff --git a/docs/model/FR.html b/docs/model/FR.html index 49d1d3b..a6ac6fd 100644 --- a/docs/model/FR.html +++ b/docs/model/FR.html @@ -3566,13 +3566,13 @@

Children:

Formatting:

address = -street-address-alternative-1⏎locality2⏎postal-codelocality1⏎admin-area1⏎country-name +street-address-alternative-1⏎locality2⏎postal-code␣locality1⏎admin-area1⏎country-name
Flattened formatting:
address =
-building␣street
address-overflow
locality2
postal-code-prefix-postal-code-suffixlocality1
admin-area1
country-name +building␣street
address-overflow
locality2
postal-code-prefix-postal-code-suffix␣locality1
admin-area1
country-name

diff --git a/docs/model/IT.html b/docs/model/IT.html index b5e63c0..39c8122 100644 --- a/docs/model/IT.html +++ b/docs/model/IT.html @@ -3746,13 +3746,13 @@

Children:

Formatting:

address = -street-address-alternative-1⏎postal-codelocality1admin-area1⏎country-name +street-address-alternative-1⏎postal-code␣locality1␣admin-area1⏎country-name
Flattened formatting:
address =
-street␣building,␣address-overflow
postal-code-prefix-postal-code-suffixlocality1admin-area1
country-name +street␣building,␣address-overflow
postal-code-prefix-postal-code-suffix␣locality1␣admin-area1
country-name

diff --git a/docs/model/MX.html b/docs/model/MX.html index a2bdf71..3c2e0e5 100644 --- a/docs/model/MX.html +++ b/docs/model/MX.html @@ -4198,13 +4198,13 @@

Children:

Formatting:

address = -street-address-alternative-1⏎locality2⏎admin-area2⏎postal-codelocality1,␣admin-area1⏎country-name +street-address-alternative-1⏎locality2⏎admin-area2⏎postal-code␣locality1,␣admin-area1⏎country-name
Flattened formatting:
address =
-streetbuilding,␣Piso floor,␣unit-typeunit-name
Entre Calles cross-street1␣y␣cross-street2
landmark
locality2
admin-area2
postal-code-prefix-postal-code-suffixlocality1,␣admin-area1
country-name +streetbuilding,␣Piso floor,␣unit-typeunit-name
Entre Calles cross-street1␣y␣cross-street2
landmark
locality2
admin-area2
postal-code-prefix-postal-code-suffix␣locality1,␣admin-area1
country-name

diff --git a/docs/model/PL.html b/docs/model/PL.html index f608b13..fe795e9 100644 --- a/docs/model/PL.html +++ b/docs/model/PL.html @@ -3850,13 +3850,13 @@

Children:

Formatting:

address = -street-address-alternative-1⏎postal-codelocality1⏎admin-area1⏎country-name +street-address-alternative-1⏎postal-code␣locality1⏎admin-area1⏎country-name
Flattened formatting:
address =
-street␣building/unit-typeunit-name
postal-code-prefix-postal-code-suffixlocality1
admin-area1
country-name +street␣building/unit-typeunit-name
postal-code-prefix-postal-code-suffix␣locality1
admin-area1
country-name

diff --git a/docs/model/US.html b/docs/model/US.html index 7e500b2..5794993 100644 --- a/docs/model/US.html +++ b/docs/model/US.html @@ -3586,13 +3586,13 @@

Children:

Formatting:

address = -street-address⏎locality1,␣admin-area1postal-code⏎country-name +street-address⏎locality1,␣admin-area1␣postal-code⏎country-name
Flattened formatting:
address =
-address-line1
address-line2
address-line3
address-line4
locality1,␣admin-area1postal-code-prefix-postal-code-suffix
country-name +address-line1
address-line2
address-line3
address-line4
locality1,␣admin-area1␣postal-code-prefix-postal-code-suffix
country-name

diff --git a/docs/model/XX.html b/docs/model/XX.html index c3de174..4813789 100644 --- a/docs/model/XX.html +++ b/docs/model/XX.html @@ -3369,13 +3369,13 @@

Children:

Formatting:

address = -street-address-alternative-1⏎locality1locality2,␣admin-area1admin-area2postal-code⏎country-name +street-address-alternative-1⏎locality1␣locality2,␣admin-area1␣admin-area2␣postal-code⏎country-name
Flattened formatting:
address =
-streetbuilding
Apt. unit-name,␣Floor floor
locality1locality2,␣admin-area1admin-area2postal-code-prefix-postal-code-suffix
country-name +streetbuilding
Apt. unit-name,␣Floor floor
locality1␣locality2,␣admin-area1␣admin-area2␣postal-code-prefix-postal-code-suffix
country-name