worldwide 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efbaf093f7d788844cf4ab407af37d0a752cda09a1ea08f930ab1e2ff4a0cb72
-  data.tar.gz: 0ad3a89ba63a65e6fd410b3413e251eda92edbfddd8dfb048d007a0cd2bf79c9
+  metadata.gz: ed89181f3c570e335344e1522aa94ffb1bd07b67acef2764e5637f621709765d
+  data.tar.gz: bc8829a5b99d941c438f40ebf85f8a773784dc078e7f7d308d67bde5cd4e016f
 SHA512:
-  metadata.gz: 5233dc65c0add8cdcf09bf34b35893679f79d05e2008232c8e4f49b1518cf86c0890733a141e8a9578400d83885c6197457bf40b8fe819d4157289cc958f590d
-  data.tar.gz: a1b16f73426a9ac2b74406c6b56e50dcbe5c5da14efd8e4758bf1e947548f722f6758dee5d3829a8b6a0c290a79b707159bc0df416048c6fd005af4a15c58888
+  metadata.gz: a894e63d7db49efc96d925833780730ce5b4211db0e830fc10bbcc2163bb8481e37b32b7ad98c69ac45f2753fa2e407c55a313f99d7b790dc38151ccb11534ff
+  data.tar.gz: aba3094b8b50fc38c5a03587f64b26649926523159b83389dcac11e2b87ef8252a53d872b5f868e6057b45a77ab6a5b01b9b989202bb0b1ee5325c62303eacc4

data/CHANGELOG.md

@@ -29,6 +29,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 --
 
+## [1.3.0] - 2024-06-10
+
+- Update translations for neighborhood too_long error message, add translations for localized neighborhood errors in MX, PH [#191](https://github.com/Shopify/worldwide/pull/191)
+- Generate concatenated address1/2 values when some additional field values are present [#199](https://github.com/Shopify/worldwide/pull/199)
+- update street_name and street_number too_long error message [#203](https://github.com/Shopify/worldwide/pull/203)
+- Additional field definitions in AE, CR, KW, PA, PE, SA, updated decorators for PH, VN  [#206](https://github.com/Shopify/worldwide/pull/206)
+- All error messages now contain an `_instructional` and `_informative` key. If the `Worldwide::Field::error` method is called with a `code` that does not end in either `_instructional` or `_informative`, the `Worldwide::Field::error` method will append `_instructional` to the `code` and returns this error message. [#205](https://github.com/Shopify/worldwide/pull/205)
+
 ## [1.2.0] - 2024-06-05
 
 - Merge duplicate language definition on some region yaml files to restore missing languages; `NO` adds "en" and "nb", `SA` adds "en", SG does not change [#188](https://github.com/Shopify/worldwide/pull/188)

data/Gemfile.lock

@@ -13,7 +13,7 @@ GIT
 PATH
   remote: .
   specs:
-    worldwide (1.2.0)
+    worldwide (1.3.0)
       activesupport (>= 7.0)
       i18n
       phonelib (~> 0.8)

data/db/data/regions/AE.yml

@@ -13,6 +13,17 @@ week_start_day: saturday
 format:
   edit: "{country}_{firstName}{lastName}_{company}_{address1}_{address2}_{city}{province}_{phone}"
   show: "{firstName} {lastName}_{company}_{address1}_{address2}_{city} {province}_{country}_{phone}"
+format_extended:
+  edit: "{country}_{firstName}{lastName}_{company}_{address1}_{line2}{neighborhood}_{city}{province}_{phone}"
+additional_address_fields:
+  - name: line2
+  - name: neighborhood
+    required: true
+combined_address_format:
+  address2:
+    - key: line2
+    - key: neighborhood
+      decorator: ","
 emoji: "\U0001F1E6\U0001F1EA"
 languages:
   - ar

data/db/data/regions/AT/en.yml

@@ -15,4 +15,5 @@ en:
             default: Additional address
             optional: Additional address (optional)
           errors:
-            blank: Enter additional address information
+            blank_instructional: Enter additional address information
+            blank_informative: Additional address information is missing

data/db/data/regions/CA/en.yml

@@ -16,5 +16,6 @@ en:
             unknown_for_city_informative: Province isn't valid for %{city}
             unknown_for_zip_instructional: Select a valid province for %{zip}
             unknown_for_zip_informative: Province isn't valid for %{zip}
-            unknown_for_address: Province may be incorrect
+            unknown_for_address_instructional: Province may be incorrect
+            unknown_for_address_informative: Province may be incorrect
 

data/db/data/regions/CL/bg.yml

@@ -9,7 +9,7 @@ bg:
             optional: Община (незадължително)
           errors:
             blank: Въведете община
-            too_long: "„Община“ е с твърде голяма дължина (максимумът е 255 знака)"
+            too_long: "„Община“ е с твърде голяма дължина (максимумът е %{limit} знака)"
             contains_emojis: "„Община“ не може да съдържа емоджита"
             contains_mathematical_symbols: "„Община“ не може да съдържа математически
               символи"

data/db/data/regions/CL/cs.yml

@@ -9,7 +9,7 @@ cs:
             optional: Komuna (volitelné)
           errors:
             blank: Zadejte komunu.
-            too_long: Název komuny je příliš dlouhý (maximum je 255 znaků).
+            too_long: 'Název komuny je příliš dlouhý (maximální počet znaků: %{limit}).'
             contains_emojis: Název komuny nemůže obsahovat emoji.
             contains_mathematical_symbols: Název komuny nemůže obsahovat matematické
               symboly.

data/db/data/regions/CL/da.yml

@@ -9,7 +9,7 @@ da:
             optional: Kommune (valgfrit)
           errors:
             blank: Angiv en kommune
-            too_long: Kommune er for lang (højst 255 tegn)
+            too_long: Kommune er for lang (højst %{limit} tegn)
             contains_emojis: Kommune må ikke indeholde emojis
             contains_mathematical_symbols: Kommune må ikke indeholde matematiske symboler
             contains_restricted_characters: Kommune må kun indeholde bogstaver, tal,

data/db/data/regions/CL/de.yml

@@ -9,7 +9,7 @@ de:
             optional: Gemeinde (optional)
           errors:
             blank: Gib eine Gemeinde ein.
-            too_long: Gemeinde ist zu lang (maximal 255 Zeichen).
+            too_long: Gemeinde ist zu lang (höchstens %{limit} Zeichen)
             contains_emojis: Gemeinde darf keine Emojis enthalten.
             contains_mathematical_symbols: Gemeinde darf keine mathematischen Symbole
               enthalten.

data/db/data/regions/CL/el.yml

@@ -10,7 +10,7 @@ el:
           errors:
             blank: Εισαγωγή κοινότητας
             too_long: Το πεδίο "Κοινότητα" είναι πολύ μεγάλο (το μέγιστο όριο είναι
-              255 χαρακτήρες)
+              %{limit} χαρακτήρες)
             contains_emojis: Το πεδίο "Κοινότητα" δεν μπορεί να περιέχει emoji
             contains_mathematical_symbols: Το πεδίο "Κοινότητα" δεν μπορεί να περιέχει
               μαθηματικά σύμβολα

data/db/data/regions/CL/en.yml

@@ -8,18 +8,28 @@ en:
             default: Commune
             optional: Commune (optional)
           errors:
-            blank: Enter a commune
-            too_long: Commune is too long (maximum is %{limit} characters)
-            contains_emojis: Commune cannot contain emojis
-            contains_mathematical_symbols: Commune cannot contain mathematical symbols
-            contains_restricted_characters: Commune can only contain letters, numbers,
+            blank_instructional: Enter a commune
+            blank_informative: Commune is missing
+            too_long_instructional: Commune is too long (maximum is %{limit} characters)
+            too_long_informative: Commune is too long
+            contains_emojis_instructional: Commune can't contain emojis
+            contains_emojis_informative: Commune can't contain emojis
+            contains_mathematical_symbols_instructional: Commune can't contain mathematical symbols
+            contains_mathematical_symbols_informative: Commune can't contain mathematical symbols
+            contains_restricted_characters_instructional: Commune can only contain letters, numbers,
               local characters, and special characters
-            contains_too_many_words: Commune cannot have more than %{word_count}
-              words
-            contains_html_tags: Commune cannot contain HTML tags.
-            contains_url: Commune cannot contain URLs.
-            unknown_for_city: Enter a valid commune name for %{city}.
-            unknown_for_zip: Enter a valid commune name for %{zip}.
-            unknown_for_address: Commune may be incorrect.
+            contains_restricted_characters_informative: Commune can't contain restricted characters
+            contains_too_many_words_instructional: Commune must have fewer than %{word_count} words
+            contains_too_many_words_informative: Commune must have fewer than %{word_count} words
+            contains_html_tags_instructional: Commune can't contain HTML tags
+            contains_html_tags_informative: Commune can't contain HTML tags
+            contains_url_instructional: Commune can't contain URLs
+            contains_url_informative: Commune can't contain URLs
+            unknown_for_city_instructional: Enter a valid commune for %{city}
+            unknown_for_city_informative: Enter a valid commune for %{city}
+            unknown_for_zip_instructional: Enter a valid commune for %{zip}
+            unknown_for_zip_informative: Enter a valid commune for %{zip}
+            unknown_for_address_instructional: Commune may be incorrect
+            unknown_for_address_informative: Commune may be incorrect
           warnings:
             contains_too_many_words: Commune is recommended to have less than %{word_count} words

data/db/data/regions/CL/es.yml

@@ -9,7 +9,8 @@ es:
             optional: Comuna (opcional)
           errors:
             blank: Introduce una comuna.
-            too_long: La comuna es demasiado larga (máximo de 255 caracteres).
+            too_long: El nombre de la comunidad es demasiado largo (el máximo es de
+              %{limit} caracteres).
             contains_emojis: La comuna no puede contener emojis.
             contains_mathematical_symbols: La comuna no puede contener símbolos matemáticos.
             contains_restricted_characters: La comuna solo puede contener letras,

data/db/data/regions/CL/fi.yml

@@ -9,7 +9,7 @@ fi:
             optional: Kunta (valinnainen)
           errors:
             blank: Lisää kunta
-            too_long: Kunta on liian pitkä (enintään 255 merkkiä)
+            too_long: Yhteisö on liian pitkä (enintään %{limit} merkkiä)
             contains_emojis: Kunta ei voi sisältää emojeita
             contains_mathematical_symbols: Kunta ei voi sisältää matemaattisia symboleja
             contains_restricted_characters: Kunta voi sisältää vain kirjaimia, numeroita,

data/db/data/regions/CL/fr.yml

@@ -9,7 +9,7 @@ fr:
             optional: Commune (facultatif)
           errors:
             blank: Saisir une commune
-            too_long: La commune est trop longue (le maximum est de 255 caractères)
+            too_long: La commune est trop longue (le maximum est de %{limit} caractères)
             contains_emojis: La commune ne peut pas contenir d’emojis
             contains_mathematical_symbols: La commune ne peut pas contenir de symboles
               mathématiques

data/db/data/regions/CL/hi.yml

@@ -9,7 +9,7 @@ hi:
             optional: समुदाय का नाम (वैकल्पिक)
           errors:
             blank: समुदाय का नाम डालें
-            too_long: समुदाय का नाम बहुत लंबा है (अधिकतम कैरेक्टर 255)
+            too_long: समुदाय का नाम बहुत लंबा है (अधिकतम %{limit} कैरेक्टर)
             contains_emojis: समुदाय के नाम में इमोजी नहीं हो सकते
             contains_mathematical_symbols: समुदाय के नाम में गणितीय चिह्न नहीं हो
               सकते

data/db/data/regions/CL/hr.yml

@@ -9,7 +9,8 @@ hr:
             optional: Zajednica (neobavezno)
           errors:
             blank: Unesite naziv zajednice
-            too_long: Naziv zajednice je predugačak (dopušteno je najviše 255 znakova)
+            too_long: Naziv zajednice je predugačak (najveći dopušteni broj znakova
+              je %{limit})
             contains_emojis: Naziv zajednice ne smije sadržavati emotikone
             contains_mathematical_symbols: Naziv zajednice ne smije sadržavati matematičke
               simbole

data/db/data/regions/CL/hu.yml

@@ -9,7 +9,8 @@ hu:
             optional: Megye (nem kötelező megadni)
           errors:
             blank: Add meg a megyét
-            too_long: Túl hosszú a megye neve (legfeljebb 255 karakter hosszú lehet)
+            too_long: Túl hosszú a megye neve (legfeljebb %{limit} karakter hosszú
+              lehet)
             contains_emojis: A megye neve nem tartalmazhat emodzsikat
             contains_mathematical_symbols: A megye neve nem tartalmazhat matematikai
               szimbólumokat

data/db/data/regions/CL/id.yml

@@ -9,7 +9,7 @@ id:
             optional: Komune (opsional)
           errors:
             blank: Masukkan nama komune
-            too_long: Nama komune terlalu panjang (maksimum berisi 255 karakter)
+            too_long: Nama komune terlalu panjang (maksimum %{limit} karakter)
             contains_emojis: Nama komune tidak boleh berisi emoji
             contains_mathematical_symbols: Nama komune tidak boleh berisi simbol matematika
             contains_restricted_characters: Nama komune hanya boleh terdiri dari huruf,

data/db/data/regions/CL/it.yml

@@ -9,7 +9,7 @@ it:
             optional: Comune (facoltativo)
           errors:
             blank: Inserisci una comune
-            too_long: Il nome del comune è troppo lungo (lunghezza massima 255 caratteri)
+            too_long: Il campo Comune è troppo lungo (lunghezza massima %{limit} caratteri)
             contains_emojis: Il campo Comune non può contenere emoji
             contains_mathematical_symbols: Il campo Comune non può contenere simboli
               matematici

data/db/data/regions/CL/ja.yml

@@ -9,7 +9,7 @@ ja:
             optional: コミューン (任意)
           errors:
             blank: コミューンを入力してください
-            too_long: コミューンが長すぎます (最大255文字)
+            too_long: コミューンが長すぎます (最大%{limit}文字)
             contains_emojis: コミューンに絵文字を含めることはできません
             contains_mathematical_symbols: コミューンに数学記号を含めることはできません
             contains_restricted_characters: コミューンには、文字、数字、地域の文字、特殊文字のみを含めることができます

data/db/data/regions/CL/ko.yml

@@ -9,7 +9,7 @@ ko:
             optional: 공동체(선택 사항)
           errors:
             blank: 공동체를 입력하십시오
-            too_long: 공동체가 너무 깁니다(최대 255자)
+            too_long: Commune(프랑스 행정구역)이 너무 깁니다(최대 %{limit}자)
             contains_emojis: 공동체에 이모티콘을 포함할 수 없음
             contains_mathematical_symbols: 공동체에 수학 기호를 포함할 수 없음
             contains_restricted_characters: 공동체에는 문자, 숫자, 지역 문자, 특수 문자만 포함될 수 있습니다

data/db/data/regions/CL/lt.yml

@@ -10,7 +10,7 @@ lt:
           errors:
             blank: Įveskite komuną
             too_long: Komunos pavadinimas yra per ilgas (turi sudaryti ne daugiau
-              kaip 255 simboliai)
+              kaip %{limit} simboliai)
             contains_emojis: Komunos pavadinime negali būti naudojami „emoji“
             contains_mathematical_symbols: Komunos pavadinime negali būti naudojami
               matematiniai simboliai

data/db/data/regions/CL/ms.yml

@@ -9,7 +9,7 @@ ms:
             optional: Komun (opsyenal)
           errors:
             blank: Masukkan komun
-            too_long: Komun terlalu panjang (maksimum ialah 255 aksara)
+            too_long: Komun terlalu panjang (maksimum ialah %{limit} aksara)
             contains_emojis: Komun tidak boleh mengandungi emoji
             contains_mathematical_symbols: Komun tidak boleh mengandungi simbol matematik
             contains_restricted_characters: Komun hanya boleh mengandungi huruf, nombor,

data/db/data/regions/CL/nb.yml

@@ -9,7 +9,7 @@ nb:
             optional: Kommune (valgfritt)
           errors:
             blank: Angi en kommune
-            too_long: Kommunenavnet er for langt (maksimalt 255 tegn)
+            too_long: Kommunenavnet er for langt (maksimalt %{limit} tegn)
             contains_emojis: Kommunenavnet kan ikke inneholde emojier
             contains_mathematical_symbols: Kommunenavnet kan ikke inneholde matematiske
               symboler

data/db/data/regions/CL/nl.yml

@@ -9,7 +9,7 @@ nl:
             optional: Gemeente (optioneel)
           errors:
             blank: Vul een gemeente in
-            too_long: Gemeente is te lang (mag maximaal 255 tekens zijn)
+            too_long: Gemeente is te lang (het maximum is %{limit} tekens)
             contains_emojis: Gemeente mag geen emoji's bevatten
             contains_mathematical_symbols: Gemeente mag geen wiskundige symbolen bevatten
             contains_restricted_characters: Gemeente mag alleen letters, cijfers,

data/db/data/regions/CL/pl.yml

@@ -9,7 +9,8 @@ pl:
             optional: Gmina (opcjonalnie)
           errors:
             blank: Wpisz gminę
-            too_long: Gmina jest za długa (maksymalna liczba znaków to 255)
+            too_long: Gmina zawiera zbyt dużo znaków (maksymalna liczba znaków to
+              %{limit})
             contains_emojis: Gmina nie może zawierać emoji
             contains_mathematical_symbols: Gmina nie może zawierać symboli matematycznych
             contains_restricted_characters: Gmina może zawierać litery, cyfry, znaki

data/db/data/regions/CL/pt-BR.yml

@@ -9,7 +9,7 @@ pt-BR:
             optional: Município (opcional)
           errors:
             blank: Insira um município
-            too_long: O município é longo demais (máximo de 255 caracteres)
+            too_long: O município é longo demais (máximo de %{limit} caracteres)
             contains_emojis: O município não pode conter emojis
             contains_mathematical_symbols: O município não pode conter símbolos matemáticos
             contains_restricted_characters: O município pode conter apenas letras,

data/db/data/regions/CL/pt-PT.yml

@@ -9,7 +9,7 @@ pt-PT:
             optional: Concelho (opcional)
           errors:
             blank: Introduza um concelho
-            too_long: O concelho é demasiado longo (o máximo são 255 caracteres)
+            too_long: O concelho é demasiado longo (máximo de %{limit} caracteres)
             contains_emojis: O concelho não pode conter emojis
             contains_mathematical_symbols: O concelho não pode conter símbolos matemáticos
             contains_restricted_characters: O concelho pode conter apenas letras,

data/db/data/regions/CL/ro.yml

@@ -9,7 +9,7 @@ ro:
             optional: Comună (opțional)
           errors:
             blank: Introdu un nume de comună
-            too_long: Numele comunei este prea lung (lungimea maximă este de 255 caractere)
+            too_long: Denumirea comunei este prea lungă (lungimea maximă este de %{limit}caractere)
             contains_emojis: Numele comunei nu poate conține emoji-uri
             contains_mathematical_symbols: Numele comunei nu poate conține simboluri
               matematice

data/db/data/regions/CL/ru.yml

@@ -10,7 +10,7 @@ ru:
           errors:
             blank: Укажите название коммуны
             too_long: Название коммуны слишком длинное (должно содержать не больше
-              255 символов)
+              %{limit} симв.)
             contains_emojis: Название коммуны не может содержать емодзи
             contains_mathematical_symbols: Название коммуны не может содержать математические
               символы

data/db/data/regions/CL/sk.yml

@@ -9,7 +9,7 @@ sk:
             optional: Komúna (voliteľné)
           errors:
             blank: Zadajte komúnu
-            too_long: Komúna je príliš dlhá (maximálne 255 znakov)
+            too_long: Komúna je príliš dlhá (maximálne %{limit} znakov)
             contains_emojis: Komúna nemôže obsahovať emotikony
             contains_mathematical_symbols: Komúna nemôže obsahovať matematické značky
             contains_restricted_characters: Komúna môže obsahovať len písmená, číslice,

data/db/data/regions/CL/sl.yml

@@ -10,7 +10,7 @@ sl:
           errors:
             blank: Vnesite ime skupnosti
             too_long: Ime skupnosti je predolgo (največje dovoljeno št. znakov je
-              255)
+              %{limit})
             contains_emojis: Ime skupnosti ne sme vsebovati čustvenih simbolov
             contains_mathematical_symbols: Ime skupnosti ne sme vsebovati matematičnih
               simbolov

data/db/data/regions/CL/sv.yml

@@ -9,7 +9,7 @@ sv:
             optional: Kommun (valfritt)
           errors:
             blank: Ange en kommun
-            too_long: Kommunnamnet är för långt (max. 255 tecken)
+            too_long: Kommunnamnet är för långt (max %{limit} tecken)
             contains_emojis: Kommun får inte innehålla emojier
             contains_mathematical_symbols: Kommun får inte innehålla matematiska symboler
             contains_restricted_characters: Kommun får endast innehålla bokstäver,

data/db/data/regions/CL/th.yml

@@ -9,7 +9,7 @@ th:
             optional: ชุมชน (ไม่บังคับ)
           errors:
             blank: ป้อนชื่อชุมชน
-            too_long: ชื่อชุมชนยาวเกินไป (สูงสุดคือ 255 อักขระ)
+            too_long: ชื่อชุมชนยาวเกินไป (ต้องไม่เกิน %{limit} อักขระ)
             contains_emojis: ห้ามใส่อีโมจิในชื่อชุมชน
             contains_mathematical_symbols: ห้ามใส่สัญลักษณ์ทางคณิตศาสตร์ในชื่อชุมชน
             contains_restricted_characters: ชื่อชุมชนต้องใช้เฉพาะตัวอักษร ตัวเลข อักขระท้องถิ่น

data/db/data/regions/CL/tr.yml

@@ -9,7 +9,7 @@ tr:
             optional: Belde (isteğe bağlı)
           errors:
             blank: Belde girin
-            too_long: Belde adı çok uzun (maksimum 255 karakter olmalıdır)
+            too_long: Belde adı çok uzun (maksimum %{limit} karakter olmalıdır)
             contains_emojis: Belde adı emoji içeremez
             contains_mathematical_symbols: Belde adı matematiksel semboller içeremez
             contains_restricted_characters: Belde adı yalnızca harfler, sayılar, yerel

data/db/data/regions/CL/vi.yml

@@ -9,7 +9,7 @@ vi:
             optional: Xã (không bắt buộc)
           errors:
             blank: Nhập xã
-            too_long: Xã quá dài (tối đa 255 ký tự)
+            too_long: Xã quá dài (tối đa %{limit} ký tự)
             contains_emojis: Xã không được chứa biểu tượng cảm xúc
             contains_mathematical_symbols: Xã không được chứa ký hiệu toán học
             contains_restricted_characters: Xã chỉ được chứa chữ cái, chữ số, ký tự

data/db/data/regions/CL/zh-CN.yml

@@ -9,7 +9,7 @@ zh-CN:
             optional: 公社（选填）
           errors:
             blank: 输入公社
-            too_long: 公社名过长（最多包含 255 个字符）
+            too_long: 公社名过长（最多 %{limit} 个字符）
             contains_emojis: 公社名不能包含表情符号
             contains_mathematical_symbols: 公社名不能包含数学符号
             contains_restricted_characters: 公社名只能包含字母、数字、当地字符和特殊字符

data/db/data/regions/CL/zh-TW.yml

@@ -9,7 +9,7 @@ zh-TW:
             optional: 分區 (選填)
           errors:
             blank: 請輸入「分區」
-            too_long: "「分區」過長 (最多 255 個字元)"
+            too_long: "「分區」過長 (最多 %{limit} 個字元)"
             contains_emojis: "「分區」不得包含表情符號"
             contains_mathematical_symbols: "「分區」不得包含數學符號"
             contains_restricted_characters: "「分區」僅可包含字母、數字、當地字元和特殊字元"

data/db/data/regions/CR.yml

@@ -13,6 +13,17 @@ week_start_day: sunday
 format:
   edit: "{country}_{firstName}{lastName}_{company}_{address1}_{address2}_{province}{city}{zip}_{phone}"
   show: "{firstName} {lastName}_{company}_{address1}_{address2}_{province} {city}_{zip}_{country}_{phone}"
+format_extended:
+  edit: "{country}_{firstName}{lastName}_{company}_{address1}_{line2}{neighborhood}_{city}{province}_{zip}_{phone}"
+additional_address_fields:
+  - name: line2
+  - name: neighborhood
+    required: true
+combined_address_format:
+  address2:
+    - key: line2
+    - key: neighborhood
+      decorator: ","
 emoji: "\U0001F1E8\U0001F1F7"
 languages:
   - es

data/db/data/regions/KW.yml

@@ -13,6 +13,16 @@ week_start_day: saturday
 format:
   edit: "{country}_{firstName}{lastName}_{company}_{address1}_{address2}_{zip}{city}_{province}_{phone}"
   show: "{firstName} {lastName}_{company}_{address1}_{address2}_{zip} {city}_{province}_{country}_{phone}"
+format_extended:
+  edit: "{country}_{firstName}{lastName}_{company}_{address1}_{line2}{neighborhood}_{zip}{city}_{province}_{phone}"
+additional_address_fields:
+  - name: line2
+  - name: neighborhood
+    required: true
+combined_address_format:
+  address2:
+    - key: line2
+    - key: neighborhood
 emoji: "\U0001F1F0\U0001F1FC"
 languages:
   - ar

data/db/data/regions/MX/bg.yml

@@ -17,3 +17,26 @@ bg:
           errors:
             blank_instructional: Изберете щат
             blank_informative: Липсва щат
+        neighborhood:
+          label:
+            default: Колония
+            optional: Колония (незадължително)
+          errors:
+            blank: Въведете колония
+            too_long: "„Колония“ е с твърде голяма дължина (максимумът е %{limit}
+              знака)"
+            contains_emojis: "„Колония“ не може да съдържа емоджита"
+            contains_mathematical_symbols: "„Колония“ не може да съдържа математически
+              символи"
+            contains_restricted_characters: "„Колония“ може да съдържа само букви,
+              цифри, местни знаци и специални знаци"
+            contains_too_many_words: "„Колония“ не може да съдържа повече от %{word_count}
+              думи"
+            contains_html_tags: "„Колония“ не може да съдържа HTML етикети."
+            contains_url: "„Колония“ не може да съдържа URL адреси."
+            unknown_for_city: Въведете валидно име на колония за %{city}.
+            unknown_for_zip: Въведете валидно име на колония за %{zip}.
+            unknown_for_address: Възможно е колонията да е неправилна.
+          warnings:
+            contains_too_many_words: Препоръчително е „Колония“ да не съдържа повече
+              от %{word_count} думи

data/db/data/regions/MX/cs.yml

@@ -17,3 +17,25 @@ cs:
           errors:
             blank_instructional: Vyberte stát.
             blank_informative: Stát chybí.
+        neighborhood:
+          label:
+            default: Kolonie
+            optional: Kolonie (nepovinné)
+          errors:
+            blank: Zadejte kolonii.
+            too_long: 'Název kolonie je příliš dlouhý (maximální počet znaků: %{limit}).'
+            contains_emojis: Název kolonie nemůže obsahovat emoji.
+            contains_mathematical_symbols: Název kolonie nemůže obsahovat matematické
+              symboly.
+            contains_restricted_characters: Název kolonie může obsahovat pouze písmena,
+              číslice, místní znaky a speciální znaky.
+            contains_too_many_words: 'Název kolonie nemůže obsahovat více než tento
+              počet slov: %{word_count}.'
+            contains_html_tags: Název kolonie nemůže obsahovat HTML tagy.
+            contains_url: Název kolonie nemůže obsahovat adresy URL.
+            unknown_for_city: 'Zadejte platný název kolonie pro: %{city}.'
+            unknown_for_zip: 'Zadejte platný název kolonie pro: %{zip}.'
+            unknown_for_address: Kolonie může být nesprávná.
+          warnings:
+            contains_too_many_words: 'Doporučuje se, aby název kolonie obsahoval méně
+              než tento počet slov: %{word_count}.'

data/db/data/regions/MX/da.yml

@@ -17,3 +17,24 @@ da:
           errors:
             blank_instructional: Vælg en stat
             blank_informative: Stat mangler
+        neighborhood:
+          label:
+            default: Bydel
+            optional: Bydel (valgfrit)
+          errors:
+            blank: Angiv en bydel
+            too_long: Bydel er for lang (højst %{limit} tegn)
+            contains_emojis: Bydel må ikke indeholde emojis
+            contains_mathematical_symbols: Bydel må ikke indeholde matematiske symboler
+            contains_restricted_characters: Bydel må kun indeholde bogstaver, tal,
+              lokale tegn og specialtegn
+            contains_too_many_words: Bydel må ikke indeholde flere end %{word_count}
+              ord
+            contains_html_tags: Bydel må ikke indeholde HTML-tags.
+            contains_url: Bydel må ikke indeholde webadresser.
+            unknown_for_city: Angiv et gyldigt navn på bydelen for %{city}.
+            unknown_for_zip: Angiv et gyldigt navn på bydelen for %{zip}.
+            unknown_for_address: Bydelen er muligvis forkert.
+          warnings:
+            contains_too_many_words: Det anbefales, at bydelen indeholder færre end
+              %{word_count} ord

data/db/data/regions/MX/de.yml

@@ -17,3 +17,25 @@ de:
           errors:
             blank_instructional: Staat auswählen
             blank_informative: Staat fehlt
+        neighborhood:
+          label:
+            default: Colonia
+            optional: Colonia (optional)
+          errors:
+            blank: Kolonie eingeben
+            too_long: Kolonie ist zu lang (maximal %{limit} Zeichen)
+            contains_emojis: Kolonie darf keine Emojis enthalten
+            contains_mathematical_symbols: Kolonie darf keine mathematischen Symbole
+              enthalten
+            contains_restricted_characters: Kolonie darf nur Buchstaben, Zahlen, Zeichen
+              der lokalen Sprache und Sonderzeichen enthalten
+            contains_too_many_words: Kolonie darf nicht mehr als %{word_count} Wörter
+              enthalten
+            contains_html_tags: Kolonie darf keine HTML-Tags enthalten.
+            contains_url: Kolonie darf keine URLs enthalten.
+            unknown_for_city: Gib einen gültigen Kolonienamen für %{city} ein.
+            unknown_for_zip: Gib einen gültigen Kolonienamen für %{zip} ein.
+            unknown_for_address: Kolonie ist ggf. falsch.
+          warnings:
+            contains_too_many_words: Es wird empfohlen, dass die Kolonie weniger als
+              %{word_count} Wörter enthält