Skip to content

Commit

Permalink
Merge pull request #576 from vtex/LOC-14706-ECU
Browse files Browse the repository at this point in the history
Fixed Ecuador ZIP code regex validation to accept both 6-digit postal codes and the older 4-digit municipality codes.
  • Loading branch information
jeffersontuc authored Jun 6, 2024
2 parents 7575191 + 4b362b6 commit 23302a3
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 39 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

### Fixed

- Ecuador ZIP code regex validation to accept both 6-digit postal codes and the older 4-digit municipality codes used in the list of provinces.
- New city ('Guatemala Zona 25') in Guatemala.

## [3.36.1] - 2024-05-29
Expand Down
106 changes: 68 additions & 38 deletions messages/context.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,64 @@
"address-form.optional": "Optional",
"address-form.edit": "Edit",
"address-form.search": "Search",
"address-form.geolocation.example.ARG": "Eg: Av. del Libertador 1473, Buenos Aires",
"address-form.geolocation.example.BOL": "Eg: Av Arce, 2556, La Paz",
"address-form.geolocation.example.BRA": "Eg: Av Paulista, 1578, São Paulo",
"address-form.geolocation.example.CAN": "Eg: 450 Wilbrod St, Ottawa",
"address-form.geolocation.example.CHL": "Eg: Los Militares, 6191, Santiago",
"address-form.geolocation.example.COL": "Eg: Calle 93 # 14-20, Bogotá",
"address-form.geolocation.example.ECU": "Eg: Av Rio Amazonas, N 37-61, Quito",
"address-form.geolocation.example.ESP": "Eg: Calle Fernando el Santo, 6, Madrid",
"address-form.geolocation.example.GTM": "Eg: 6A Calle 6, Guatemala",
"address-form.geolocation.example.HUN": "Eg: Tétényi út 12--16, Budapest",
"address-form.geolocation.example.MEX": "Eg: Calle de Tacuba 8, Ciudad de México",
"address-form.geolocation.example.PER": "Eg: Av. José Pardo, 850, Miraflores, Lima",
"address-form.geolocation.example.PRT": "Eg: Av. da França 20, Porto",
"address-form.geolocation.example.PRY": "Eg: Avenida Eusebio Ayala, 100, Assunção",
"address-form.geolocation.example.UNI": "Eg: 225 East 41st Street, New York",
"address-form.geolocation.example.URY": "Eg: Bulevar Artigas, 1394, Montevidéu",
"address-form.geolocation.example.USA": "Eg: 225 East 41st Street, New York",
"address-form.geolocation.example.VEN": "Eg: Avenida Mohedano, Caracas",
"address-form.geolocation.example.ROU": "Eg: Bulevardul Ion Mihalache, București 011192, Romania",
"address-form.geolocation.example.BGR": "Eg: улица Елин Пелин 13, София",
"address-form.geolocation.example.DEU": "Eg: Rheinalleee 95, Düsseldorf",
"address-form.geolocation.example.FRA": "Eg: 7 Rue Hautefeuille, Paris",
"address-form.geolocation.example.GBR": "Eg: 29 High Street Poole BH15 1AB",
"address-form.geolocation.example.ITA": "Eg: Corso Vittorio Emanuele 69, Milano",
"address-form.geolocation.example.NLD": "Eg: Surinamestraat 27, Amsterdam",
"address-form.geolocation.example.POL": "Eg: Ulica Twarda 3, Szczecin",
"address-form.geolocation.example.RUS": "Eg: Арбат, 3 Москва",
"address-form.geolocation.example.ZAF": "Eg: 234 Brickfield Rd, Salt River, Cape Town, 7501, South Africa",
"address-form.geolocation.example.ARE": "E.g.: 11 65th St, Al Bada'a, Dubai",
"address-form.geolocation.example.ARG": "E.g.: Av. del Libertador 1473, Buenos Aires",
"address-form.geolocation.example.AUS": "E.g.: 115 Findon Rd, Woodville South SA 5011",
"address-form.geolocation.example.AUT": "E.g.: Stuwerstraße 5, 1020 Wien",
"address-form.geolocation.example.BEL": "E.g.: Av. Gustave Latinis 2, 1030 Schaerbeek",
"address-form.geolocation.example.BGR": "E.g.: улица Елин Пелин 13, София",
"address-form.geolocation.example.BOL": "E.g.: Av Arce, 2556, La Paz",
"address-form.geolocation.example.BRA": "E.g.: Av Paulista, 1578, São Paulo",
"address-form.geolocation.example.CAN": "E.g.: 450 Wilbrod St, Ottawa",
"address-form.geolocation.example.CHL": "E.g.: Los Militares, 6191, Santiago",
"address-form.geolocation.example.COL": "E.g.: Calle 93 # 14-20, Bogotá",
"address-form.geolocation.example.CRI": "E.g.: Calle 4, Avenida 9, San José",
"address-form.geolocation.example.CZE": "E.g.: K Vidouli 15, 155 00 Praha",
"address-form.geolocation.example.DEU": "E.g.: Rheinallee 95, Düsseldorf",
"address-form.geolocation.example.DNK": "E.g.: Allegade 10, 2000 Frederiksberg",
"address-form.geolocation.example.DOM": "E.g.: C. Barney N. Morgan 2, Santo Domingo 10402",
"address-form.geolocation.example.ECU": "E.g.: Av Río Amazonas, N 37-61, Quito",
"address-form.geolocation.example.ESP": "E.g.: Calle Fernando el Santo, 6, Madrid",
"address-form.geolocation.example.FIN": "E.g.: Autistenkatu 1, 20300 Turku",
"address-form.geolocation.example.FRA": "E.g.: 7 Rue Hautefeuille, Paris",
"address-form.geolocation.example.GBR": "E.g.: 29 High Street Poole BH15 1AB",
"address-form.geolocation.example.GRC": "E.g.: Zaimi 37, Athina 106 82",
"address-form.geolocation.example.GTM": "E.g.: 6A Calle 6, Guatemala",
"address-form.geolocation.example.HRV": "E.g.: Ul. don Bože Milanovića 15, 23000, Zadar",
"address-form.geolocation.example.HUN": "E.g.: Tétényi út 12--16, Budapest",
"address-form.geolocation.example.IDN": "E.g.: Jl. Pegangsaan Timur No.1, RT.1/RW.1, Pegangsaan, Kec. Menteng, Kota Jakarta Pusat, Daerah Khusus Ibukota Jakarta 10310",
"address-form.geolocation.example.IND": "E.g.: 148, Juhu Tara Rd, Juhu, Mumbai 400049",
"address-form.geolocation.example.IRL": "E.g.: 58 Faussagh Ave, Cabra West, Dublin",
"address-form.geolocation.example.ITA": "E.g.: Corso Vittorio Emanuele II 69, Milano",
"address-form.geolocation.example.JAM": "E.g.: 26 Hope Rd, Kingston",
"address-form.geolocation.example.JPN": "E.g.: 2 Chome-8-1 Nishishinjuku, Shinjuku City, Tokyo",
"address-form.geolocation.example.KOR": "E.g.: 21 Namdaemunsijang 4-gil, Jung-gu, Seoul",
"address-form.geolocation.example.MEX": "E.g.: Calle de Tacuba 8, Ciudad de México",
"address-form.geolocation.example.NIC": "E.g.: Pista de La Solidaridad, Managua 15000",
"address-form.geolocation.example.NLD": "E.g.: Surinamestraat 27, Amsterdam",
"address-form.geolocation.example.NZL": "E.g.: 361 New North Road, Kingsland, Auckland 1010",
"address-form.geolocation.example.PER": "E.g.: Av. José Pardo, 850, Miraflores, Lima",
"address-form.geolocation.example.POL": "E.g: Ulica Twarda 3, Szczecin",
"address-form.geolocation.example.PRI": "E.g.: 100 C. Pelayo, San Juan, 00901",
"address-form.geolocation.example.PRT": "E.g.: Av. da França 20, Porto",
"address-form.geolocation.example.PRY": "E.g.: Avenida Eusebio Ayala, 100, Asunción",
"address-form.geolocation.example.ROU": "E.g.: Bulevardul Ion Mihalache, București 011192, Romania",
"address-form.geolocation.example.RUS": "E.g.: Арбат, 3 Москва",
"address-form.geolocation.example.SAU": "E.g.: 8078 Al Imam Saud Ibn Abdul Aziz Branch Rd, Al Mursilat, Riyadh 12464",
"address-form.geolocation.example.SGP": "E.g.: 15-3 Jalan Riang 358987",
"address-form.geolocation.example.SLV": "E.g.: Štefanova ulica 6, 1000 Ljubljana",
"address-form.geolocation.example.SMR": "E.g.: Via Androne dei Bastioni, 4, 47890 Città di San Marino",
"address-form.geolocation.example.SRB": "E.g.: Šantićeva 8, 11000 Beograd",
"address-form.geolocation.example.SVK": "E.g.: Bazová 9, 821 08 Bratislava",
"address-form.geolocation.example.SWE": "E.g.: Parkgatan 41, 411 38 Göteborg",
"address-form.geolocation.example.THA": "E.g.: 91 ถนน ร่วมจิตต์ แขวงถนนนครไชยศรี เขตดุสิต กรุงเทพมหานคร 10300",
"address-form.geolocation.example.UKR": "E.g.: вулиця Рейтарська, 30, Київ, 02000",
"address-form.geolocation.example.URY": "E.g.: Bulevar Artigas, 1394, Montevideo",
"address-form.geolocation.example.USA": "E.g.: 225 East 41st Street, New York",
"address-form.geolocation.example.VEN": "E.g.: Avenida Mohedano, Caracas",
"address-form.geolocation.example.ZAF": "E.g.: 234 Brickfield Rd, Salt River, Cape Town, 7501, South Africa",
"address-form.geolocation.example.UNI": "E.g.: 225 East 41st Street, New York",
"address-form.geolocation.example.MLT": "E.g.: 35, Dawret Fra Giovanni Bichi Il-Kalkara, KKR 1280 Malta",
"address-form.error.ERROR_EMPTY_FIELD": "This field is required.",
"address-form.error.ERROR_POSTAL_CODE": "Invalid postal code.",
"address-form.error.ERROR_GOOGLE_ADDRESS": "Invalid address.",
Expand All @@ -40,33 +70,33 @@
"address-form.field.notApplicable": "N/A",
"address-form.field.noNumber": "No number",
"address-form.field.country": "Country",
"address-form.field.postalCode": "Postal Code",
"address-form.field.postalCode": "Postal code",
"address-form.field.street": "Street",
"address-form.field.addressLine1": "Address Line 1",
"address-form.field.addressLine2": "Address Line 2",
"address-form.field.addressLine1": "Address line 1",
"address-form.field.addressLine2": "Address line 2",
"address-form.field.number": "Number",
"address-form.field.exteriorNumber": "Exterior Number",
"address-form.field.interiorNumber": "Interior Number",
"address-form.field.complement": "Additional info (eg: apt 201)",
"address-form.field.floorAndLetter": "Floor and letter",
"address-form.field.exteriorNumber": "Street number",
"address-form.field.interiorNumber": "Suite",
"address-form.field.complement": "Additional information (e.g.: apt 201)",
"address-form.field.floorAndLetter": "Floor and suite",
"address-form.field.reference": "Close to",
"address-form.field.district": "District",
"address-form.field.neighborhood": "Neighborhood",
"address-form.field.suburb": "Suburb",
"address-form.field.commercial": "Commercial address",
"address-form.field.city": "City",
"address-form.field.town": "Town",
"address-form.field.locality": "Locality",
"address-form.field.locality": "Place",
"address-form.field.state": "State",
"address-form.field.region": "Region",
"address-form.field.community": "Community",
"address-form.field.colony": "Colony",
"address-form.field.direction": "Direction",
"address-form.field.department": "Departament",
"address-form.field.department": "Department",
"address-form.field.municipality": "Municipality",
"address-form.field.delegation": "Delegation",
"address-form.field.municipalityDelegation": "Municipality/Delegation",
"address-form.field.province": "Province",
"address-form.field.receiverName": "Receiver",
"address-form.field.receiverName": "Recipient",
"address-form.field.county": "County"
}
2 changes: 1 addition & 1 deletion react/country/ECU.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1296,7 +1296,7 @@ const rules: PostalCodeRules = {
maxLength: 50,
name: 'postalCode',
postalCodeAPI: false,
regex: /^([\d]{4})$/,
regex: /^([\d]{6}|[\d]{4})$/,
size: 'small',
},
{
Expand Down

0 comments on commit 23302a3

Please sign in to comment.