diff --git a/README.md b/README.md index 1051d96c680..ca9159e6b27 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,6 @@ The API covers the following modules: | Module | Example | Output | | -------- | --------------------------------------------- | -------------------------------------------------------------------------------------------------- | -| Address | `faker.address.city()` | Lake Raoulfort | | Animal | `faker.animal.cat()` | Norwegian Forest Cat | | Color | `faker.color.rgb()` | #cdfcdc | | Commerce | `faker.commerce.product()` | Polo t-shirt | @@ -86,6 +85,7 @@ The API covers the following modules: | Helpers | `faker.helpers.arrayElement(['a', 'b', 'c'])` | b | | Image | `faker.image.cats()` | https://loremflickr.com/640/480/cats | | Internet | `faker.internet.domainName()` | muddy-neuropathologist.net | +| Location | `faker.location.city()` | Lake Raoulfort | | Lorem | `faker.lorem.paragraph()` | Porro nulla id vero perspiciatis nulla nihil. ... | | Music | `faker.music.genre()` | R&B | | Person | `faker.person.firstName()` | Cameron | diff --git a/src/locales/af_ZA/location/city.ts b/src/locales/af_ZA/location/city.ts index ea6ea950e46..7375aa8378a 100644 --- a/src/locales/af_ZA/location/city.ts +++ b/src/locales/af_ZA/location/city.ts @@ -1,6 +1,6 @@ export default [ - '{{address.city_prefix}} {{person.firstName}}{{address.city_suffix}}', - '{{address.city_prefix}} {{person.firstName}}', - '{{person.firstName}}{{address.city_suffix}}', - '{{person.lastName}}{{address.city_suffix}}', + '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}', + '{{location.city_prefix}} {{person.firstName}}', + '{{person.firstName}}{{location.city_suffix}}', + '{{person.lastName}}{{location.city_suffix}}', ]; diff --git a/src/locales/af_ZA/location/street.ts b/src/locales/af_ZA/location/street.ts index f7dd9d3b3aa..af32d0c4248 100644 --- a/src/locales/af_ZA/location/street.ts +++ b/src/locales/af_ZA/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', ]; diff --git a/src/locales/ar/location/city.ts b/src/locales/ar/location/city.ts index e3da346bd1e..ad43b68fc5c 100644 --- a/src/locales/ar/location/city.ts +++ b/src/locales/ar/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_name}}']; +export default ['{{location.city_name}}']; diff --git a/src/locales/ar/location/street.ts b/src/locales/ar/location/street.ts index 5db4f5be71f..c182e83762a 100644 --- a/src/locales/ar/location/street.ts +++ b/src/locales/ar/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{address.street_prefix}} {{person.first_name}}', - '{{address.street_prefix}} {{person.last_name}}', + '{{location.street_prefix}} {{person.first_name}}', + '{{location.street_prefix}} {{person.last_name}}', ]; diff --git a/src/locales/ar/location/street_address.ts b/src/locales/ar/location/street_address.ts index 55bed3628b9..2e1a661d418 100644 --- a/src/locales/ar/location/street_address.ts +++ b/src/locales/ar/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.buildingNumber}} {{address.street}}', - full: '{{address.buildingNumber}} {{address.street}} {{address.secondaryAddress}}', + normal: '{{location.buildingNumber}} {{location.street}}', + full: '{{location.buildingNumber}} {{location.street}} {{location.secondaryAddress}}', }; diff --git a/src/locales/ar/team/name.ts b/src/locales/ar/team/name.ts index ed2bdbb53fa..bdd4f123462 100644 --- a/src/locales/ar/team/name.ts +++ b/src/locales/ar/team/name.ts @@ -1 +1 @@ -export default ['{{address.state}} {{team.creature}}']; +export default ['{{location.state}} {{team.creature}}']; diff --git a/src/locales/az/company/name_patterns.ts b/src/locales/az/company/name_patterns.ts index 9db05dce1a3..b9374d22299 100644 --- a/src/locales/az/company/name_patterns.ts +++ b/src/locales/az/company/name_patterns.ts @@ -4,7 +4,7 @@ export default [ '{{company.prefix}} {{person.male_last_name}}', '{{company.prefix}} {{company.suffix}}{{company.suffix}}', '{{company.prefix}} {{company.suffix}}{{company.suffix}}{{company.suffix}}', - '{{company.prefix}} {{address.city_name}}{{company.suffix}}', - '{{company.prefix}} {{address.city_name}}{{company.suffix}}{{company.suffix}}', - '{{company.prefix}} {{address.city_name}}{{company.suffix}}{{company.suffix}}{{company.suffix}}', + '{{company.prefix}} {{location.city_name}}{{company.suffix}}', + '{{company.prefix}} {{location.city_name}}{{company.suffix}}{{company.suffix}}', + '{{company.prefix}} {{location.city_name}}{{company.suffix}}{{company.suffix}}{{company.suffix}}', ]; diff --git a/src/locales/az/location/city.ts b/src/locales/az/location/city.ts index e3da346bd1e..ad43b68fc5c 100644 --- a/src/locales/az/location/city.ts +++ b/src/locales/az/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_name}}']; +export default ['{{location.city_name}}']; diff --git a/src/locales/az/location/street.ts b/src/locales/az/location/street.ts index bddea6b0e50..523f81653d1 100644 --- a/src/locales/az/location/street.ts +++ b/src/locales/az/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{address.street_suffix}} {{address.street_name}}', - '{{address.street_name}} {{address.street_suffix}}', + '{{location.street_suffix}} {{location.street_name}}', + '{{location.street_name}} {{location.street_suffix}}', ]; diff --git a/src/locales/az/location/street_address.ts b/src/locales/az/location/street_address.ts index 9a8e4da4839..3394fef6dc2 100644 --- a/src/locales/az/location/street_address.ts +++ b/src/locales/az/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}}, {{address.buildingNumber}}', - full: '{{address.street}}, {{address.buildingNumber}} {{address.secondaryAddress}}', + normal: '{{location.street}}, {{location.buildingNumber}}', + full: '{{location.street}}, {{location.buildingNumber}} {{location.secondaryAddress}}', }; diff --git a/src/locales/cz/location/city.ts b/src/locales/cz/location/city.ts index e3da346bd1e..ad43b68fc5c 100644 --- a/src/locales/cz/location/city.ts +++ b/src/locales/cz/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_name}}']; +export default ['{{location.city_name}}']; diff --git a/src/locales/cz/location/street.ts b/src/locales/cz/location/street.ts index 30ba73fc997..30a9a5ddf99 100644 --- a/src/locales/cz/location/street.ts +++ b/src/locales/cz/location/street.ts @@ -1 +1 @@ -export default ['{{address.street_name}}']; +export default ['{{location.street_name}}']; diff --git a/src/locales/cz/location/street_address.ts b/src/locales/cz/location/street_address.ts index d1e8da38725..437f20dd91a 100644 --- a/src/locales/cz/location/street_address.ts +++ b/src/locales/cz/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', }; diff --git a/src/locales/de/location/city.ts b/src/locales/de/location/city.ts index 27a932f1459..d744d882361 100644 --- a/src/locales/de/location/city.ts +++ b/src/locales/de/location/city.ts @@ -1,6 +1,6 @@ export default [ - '{{address.city_prefix}} {{person.first_name}}{{address.city_suffix}}', - '{{address.city_prefix}} {{person.first_name}}', - '{{person.first_name}}{{address.city_suffix}}', - '{{person.last_name}}{{address.city_suffix}}', + '{{location.city_prefix}} {{person.first_name}}{{location.city_suffix}}', + '{{location.city_prefix}} {{person.first_name}}', + '{{person.first_name}}{{location.city_suffix}}', + '{{person.last_name}}{{location.city_suffix}}', ]; diff --git a/src/locales/de/location/street.ts b/src/locales/de/location/street.ts index 30ba73fc997..30a9a5ddf99 100644 --- a/src/locales/de/location/street.ts +++ b/src/locales/de/location/street.ts @@ -1 +1 @@ -export default ['{{address.street_name}}']; +export default ['{{location.street_name}}']; diff --git a/src/locales/de/location/street_address.ts b/src/locales/de/location/street_address.ts index d1e8da38725..437f20dd91a 100644 --- a/src/locales/de/location/street_address.ts +++ b/src/locales/de/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', }; diff --git a/src/locales/de_AT/location/city.ts b/src/locales/de_AT/location/city.ts index e3da346bd1e..ad43b68fc5c 100644 --- a/src/locales/de_AT/location/city.ts +++ b/src/locales/de_AT/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_name}}']; +export default ['{{location.city_name}}']; diff --git a/src/locales/de_AT/location/street.ts b/src/locales/de_AT/location/street.ts index 30ba73fc997..30a9a5ddf99 100644 --- a/src/locales/de_AT/location/street.ts +++ b/src/locales/de_AT/location/street.ts @@ -1 +1 @@ -export default ['{{address.street_name}}']; +export default ['{{location.street_name}}']; diff --git a/src/locales/de_AT/location/street_address.ts b/src/locales/de_AT/location/street_address.ts index d1e8da38725..437f20dd91a 100644 --- a/src/locales/de_AT/location/street_address.ts +++ b/src/locales/de_AT/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', }; diff --git a/src/locales/de_CH/location/city.ts b/src/locales/de_CH/location/city.ts index e3da346bd1e..ad43b68fc5c 100644 --- a/src/locales/de_CH/location/city.ts +++ b/src/locales/de_CH/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_name}}']; +export default ['{{location.city_name}}']; diff --git a/src/locales/de_CH/location/street.ts b/src/locales/de_CH/location/street.ts index f7dd9d3b3aa..af32d0c4248 100644 --- a/src/locales/de_CH/location/street.ts +++ b/src/locales/de_CH/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', ]; diff --git a/src/locales/el/location/city.ts b/src/locales/el/location/city.ts index ea6ea950e46..7375aa8378a 100644 --- a/src/locales/el/location/city.ts +++ b/src/locales/el/location/city.ts @@ -1,6 +1,6 @@ export default [ - '{{address.city_prefix}} {{person.firstName}}{{address.city_suffix}}', - '{{address.city_prefix}} {{person.firstName}}', - '{{person.firstName}}{{address.city_suffix}}', - '{{person.lastName}}{{address.city_suffix}}', + '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}', + '{{location.city_prefix}} {{person.firstName}}', + '{{person.firstName}}{{location.city_suffix}}', + '{{person.lastName}}{{location.city_suffix}}', ]; diff --git a/src/locales/el/location/street.ts b/src/locales/el/location/street.ts index f7dd9d3b3aa..af32d0c4248 100644 --- a/src/locales/el/location/street.ts +++ b/src/locales/el/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', ]; diff --git a/src/locales/el/team/name.ts b/src/locales/el/team/name.ts index ed2bdbb53fa..bdd4f123462 100644 --- a/src/locales/el/team/name.ts +++ b/src/locales/el/team/name.ts @@ -1 +1 @@ -export default ['{{address.state}} {{team.creature}}']; +export default ['{{location.state}} {{team.creature}}']; diff --git a/src/locales/en/location/city.ts b/src/locales/en/location/city.ts index 9a277b6fda7..8d70128e688 100644 --- a/src/locales/en/location/city.ts +++ b/src/locales/en/location/city.ts @@ -1,7 +1,7 @@ export default [ - '{{address.city_prefix}} {{person.first_name}}{{address.city_suffix}}', - '{{address.city_prefix}} {{person.first_name}}', - '{{person.first_name}}{{address.city_suffix}}', - '{{person.last_name}}{{address.city_suffix}}', - '{{address.city_name}}', + '{{location.city_prefix}} {{person.first_name}}{{location.city_suffix}}', + '{{location.city_prefix}} {{person.first_name}}', + '{{person.first_name}}{{location.city_suffix}}', + '{{person.last_name}}{{location.city_suffix}}', + '{{location.city_name}}', ]; diff --git a/src/locales/en/location/street.ts b/src/locales/en/location/street.ts index 5e9ca1171d0..b5fcd9fea0f 100644 --- a/src/locales/en/location/street.ts +++ b/src/locales/en/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{person.first_name}} {{address.street_suffix}}', - '{{person.last_name}} {{address.street_suffix}}', + '{{person.first_name}} {{location.street_suffix}}', + '{{person.last_name}} {{location.street_suffix}}', ]; diff --git a/src/locales/en/location/street_address.ts b/src/locales/en/location/street_address.ts index 55bed3628b9..2e1a661d418 100644 --- a/src/locales/en/location/street_address.ts +++ b/src/locales/en/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.buildingNumber}} {{address.street}}', - full: '{{address.buildingNumber}} {{address.street}} {{address.secondaryAddress}}', + normal: '{{location.buildingNumber}} {{location.street}}', + full: '{{location.buildingNumber}} {{location.street}} {{location.secondaryAddress}}', }; diff --git a/src/locales/en/team/name.ts b/src/locales/en/team/name.ts index ed2bdbb53fa..bdd4f123462 100644 --- a/src/locales/en/team/name.ts +++ b/src/locales/en/team/name.ts @@ -1 +1 @@ -export default ['{{address.state}} {{team.creature}}']; +export default ['{{location.state}} {{team.creature}}']; diff --git a/src/locales/en_AU/location/city.ts b/src/locales/en_AU/location/city.ts index ea6ea950e46..7375aa8378a 100644 --- a/src/locales/en_AU/location/city.ts +++ b/src/locales/en_AU/location/city.ts @@ -1,6 +1,6 @@ export default [ - '{{address.city_prefix}} {{person.firstName}}{{address.city_suffix}}', - '{{address.city_prefix}} {{person.firstName}}', - '{{person.firstName}}{{address.city_suffix}}', - '{{person.lastName}}{{address.city_suffix}}', + '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}', + '{{location.city_prefix}} {{person.firstName}}', + '{{person.firstName}}{{location.city_suffix}}', + '{{person.lastName}}{{location.city_suffix}}', ]; diff --git a/src/locales/en_AU/location/street.ts b/src/locales/en_AU/location/street.ts index f7dd9d3b3aa..af32d0c4248 100644 --- a/src/locales/en_AU/location/street.ts +++ b/src/locales/en_AU/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', ]; diff --git a/src/locales/en_AU_ocker/location/city.ts b/src/locales/en_AU_ocker/location/city.ts index db6c26ccbd2..16c4830e472 100644 --- a/src/locales/en_AU_ocker/location/city.ts +++ b/src/locales/en_AU_ocker/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_prefix}}']; +export default ['{{location.city_prefix}}']; diff --git a/src/locales/en_AU_ocker/location/street.ts b/src/locales/en_AU_ocker/location/street.ts index 30ba73fc997..30a9a5ddf99 100644 --- a/src/locales/en_AU_ocker/location/street.ts +++ b/src/locales/en_AU_ocker/location/street.ts @@ -1 +1 @@ -export default ['{{address.street_name}}']; +export default ['{{location.street_name}}']; diff --git a/src/locales/en_CA/location/city.ts b/src/locales/en_CA/location/city.ts index ea6ea950e46..7375aa8378a 100644 --- a/src/locales/en_CA/location/city.ts +++ b/src/locales/en_CA/location/city.ts @@ -1,6 +1,6 @@ export default [ - '{{address.city_prefix}} {{person.firstName}}{{address.city_suffix}}', - '{{address.city_prefix}} {{person.firstName}}', - '{{person.firstName}}{{address.city_suffix}}', - '{{person.lastName}}{{address.city_suffix}}', + '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}', + '{{location.city_prefix}} {{person.firstName}}', + '{{person.firstName}}{{location.city_suffix}}', + '{{person.lastName}}{{location.city_suffix}}', ]; diff --git a/src/locales/en_CA/location/street.ts b/src/locales/en_CA/location/street.ts index f7dd9d3b3aa..af32d0c4248 100644 --- a/src/locales/en_CA/location/street.ts +++ b/src/locales/en_CA/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', ]; diff --git a/src/locales/en_GB/location/city.ts b/src/locales/en_GB/location/city.ts index ea6ea950e46..7375aa8378a 100644 --- a/src/locales/en_GB/location/city.ts +++ b/src/locales/en_GB/location/city.ts @@ -1,6 +1,6 @@ export default [ - '{{address.city_prefix}} {{person.firstName}}{{address.city_suffix}}', - '{{address.city_prefix}} {{person.firstName}}', - '{{person.firstName}}{{address.city_suffix}}', - '{{person.lastName}}{{address.city_suffix}}', + '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}', + '{{location.city_prefix}} {{person.firstName}}', + '{{person.firstName}}{{location.city_suffix}}', + '{{person.lastName}}{{location.city_suffix}}', ]; diff --git a/src/locales/en_GB/location/street.ts b/src/locales/en_GB/location/street.ts index f7dd9d3b3aa..af32d0c4248 100644 --- a/src/locales/en_GB/location/street.ts +++ b/src/locales/en_GB/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', ]; diff --git a/src/locales/en_GH/location/city.ts b/src/locales/en_GH/location/city.ts index e3da346bd1e..ad43b68fc5c 100644 --- a/src/locales/en_GH/location/city.ts +++ b/src/locales/en_GH/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_name}}']; +export default ['{{location.city_name}}']; diff --git a/src/locales/en_GH/location/street.ts b/src/locales/en_GH/location/street.ts index 0c511a22161..94323faf368 100644 --- a/src/locales/en_GH/location/street.ts +++ b/src/locales/en_GH/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{person.last_name}} {{address.street_suffix}}', - '{{address.street_prefix}} {{address.street_suffix}}', + '{{person.last_name}} {{location.street_suffix}}', + '{{location.street_prefix}} {{location.street_suffix}}', ]; diff --git a/src/locales/en_GH/location/street_address.ts b/src/locales/en_GH/location/street_address.ts index 55bed3628b9..2e1a661d418 100644 --- a/src/locales/en_GH/location/street_address.ts +++ b/src/locales/en_GH/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.buildingNumber}} {{address.street}}', - full: '{{address.buildingNumber}} {{address.street}} {{address.secondaryAddress}}', + normal: '{{location.buildingNumber}} {{location.street}}', + full: '{{location.buildingNumber}} {{location.street}} {{location.secondaryAddress}}', }; diff --git a/src/locales/en_IE/location/city.ts b/src/locales/en_IE/location/city.ts index ea6ea950e46..7375aa8378a 100644 --- a/src/locales/en_IE/location/city.ts +++ b/src/locales/en_IE/location/city.ts @@ -1,6 +1,6 @@ export default [ - '{{address.city_prefix}} {{person.firstName}}{{address.city_suffix}}', - '{{address.city_prefix}} {{person.firstName}}', - '{{person.firstName}}{{address.city_suffix}}', - '{{person.lastName}}{{address.city_suffix}}', + '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}', + '{{location.city_prefix}} {{person.firstName}}', + '{{person.firstName}}{{location.city_suffix}}', + '{{person.lastName}}{{location.city_suffix}}', ]; diff --git a/src/locales/en_IE/location/street.ts b/src/locales/en_IE/location/street.ts index f7dd9d3b3aa..af32d0c4248 100644 --- a/src/locales/en_IE/location/street.ts +++ b/src/locales/en_IE/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', ]; diff --git a/src/locales/en_IN/location/city.ts b/src/locales/en_IN/location/city.ts index e3da346bd1e..ad43b68fc5c 100644 --- a/src/locales/en_IN/location/city.ts +++ b/src/locales/en_IN/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_name}}']; +export default ['{{location.city_name}}']; diff --git a/src/locales/en_IN/location/street.ts b/src/locales/en_IN/location/street.ts index f7dd9d3b3aa..af32d0c4248 100644 --- a/src/locales/en_IN/location/street.ts +++ b/src/locales/en_IN/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', ]; diff --git a/src/locales/en_NG/location/city.ts b/src/locales/en_NG/location/city.ts index db6c26ccbd2..16c4830e472 100644 --- a/src/locales/en_NG/location/city.ts +++ b/src/locales/en_NG/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_prefix}}']; +export default ['{{location.city_prefix}}']; diff --git a/src/locales/en_NG/location/street.ts b/src/locales/en_NG/location/street.ts index f7dd9d3b3aa..af32d0c4248 100644 --- a/src/locales/en_NG/location/street.ts +++ b/src/locales/en_NG/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', ]; diff --git a/src/locales/en_US/location/city.ts b/src/locales/en_US/location/city.ts index ea6ea950e46..7375aa8378a 100644 --- a/src/locales/en_US/location/city.ts +++ b/src/locales/en_US/location/city.ts @@ -1,6 +1,6 @@ export default [ - '{{address.city_prefix}} {{person.firstName}}{{address.city_suffix}}', - '{{address.city_prefix}} {{person.firstName}}', - '{{person.firstName}}{{address.city_suffix}}', - '{{person.lastName}}{{address.city_suffix}}', + '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}', + '{{location.city_prefix}} {{person.firstName}}', + '{{person.firstName}}{{location.city_suffix}}', + '{{person.lastName}}{{location.city_suffix}}', ]; diff --git a/src/locales/en_US/location/street.ts b/src/locales/en_US/location/street.ts index f7dd9d3b3aa..af32d0c4248 100644 --- a/src/locales/en_US/location/street.ts +++ b/src/locales/en_US/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', ]; diff --git a/src/locales/en_ZA/location/city.ts b/src/locales/en_ZA/location/city.ts index db6c26ccbd2..16c4830e472 100644 --- a/src/locales/en_ZA/location/city.ts +++ b/src/locales/en_ZA/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_prefix}}']; +export default ['{{location.city_prefix}}']; diff --git a/src/locales/en_ZA/location/street.ts b/src/locales/en_ZA/location/street.ts index f7dd9d3b3aa..af32d0c4248 100644 --- a/src/locales/en_ZA/location/street.ts +++ b/src/locales/en_ZA/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', ]; diff --git a/src/locales/es/location/city.ts b/src/locales/es/location/city.ts index db6c26ccbd2..16c4830e472 100644 --- a/src/locales/es/location/city.ts +++ b/src/locales/es/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_prefix}}']; +export default ['{{location.city_prefix}}']; diff --git a/src/locales/es/location/street.ts b/src/locales/es/location/street.ts index 36db82de5f0..8454afa1f8f 100644 --- a/src/locales/es/location/street.ts +++ b/src/locales/es/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{address.street_suffix}} {{person.first_name}}', - '{{address.street_suffix}} {{person.first_name}} {{person.last_name}}', + '{{location.street_suffix}} {{person.first_name}}', + '{{location.street_suffix}} {{person.first_name}} {{person.last_name}}', ]; diff --git a/src/locales/es/location/street_address.ts b/src/locales/es/location/street_address.ts index 23d3d2c1612..1b8de3d3d69 100644 --- a/src/locales/es/location/street_address.ts +++ b/src/locales/es/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}}{{address.buildingNumber}}', - full: '{{address.street}}{{address.buildingNumber}} {{address.secondaryAddress}}', + normal: '{{location.street}}{{location.buildingNumber}}', + full: '{{location.street}}{{location.buildingNumber}} {{location.secondaryAddress}}', }; diff --git a/src/locales/es_MX/location/city.ts b/src/locales/es_MX/location/city.ts index db6c26ccbd2..16c4830e472 100644 --- a/src/locales/es_MX/location/city.ts +++ b/src/locales/es_MX/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_prefix}}']; +export default ['{{location.city_prefix}}']; diff --git a/src/locales/es_MX/location/street.ts b/src/locales/es_MX/location/street.ts index c831c9857b0..a5b7686e731 100644 --- a/src/locales/es_MX/location/street.ts +++ b/src/locales/es_MX/location/street.ts @@ -1,5 +1,5 @@ export default [ - '{{address.street_suffix}} {{person.first_name}}', - '{{address.street_suffix}} {{person.first_name}} {{person.last_name}}', - '{{address.street_suffix}} {{address.street_name}}', + '{{location.street_suffix}} {{person.first_name}}', + '{{location.street_suffix}} {{person.first_name}} {{person.last_name}}', + '{{location.street_suffix}} {{location.street_name}}', ]; diff --git a/src/locales/es_MX/location/street_address.ts b/src/locales/es_MX/location/street_address.ts index 23d3d2c1612..1b8de3d3d69 100644 --- a/src/locales/es_MX/location/street_address.ts +++ b/src/locales/es_MX/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}}{{address.buildingNumber}}', - full: '{{address.street}}{{address.buildingNumber}} {{address.secondaryAddress}}', + normal: '{{location.street}}{{location.buildingNumber}}', + full: '{{location.street}}{{location.buildingNumber}} {{location.secondaryAddress}}', }; diff --git a/src/locales/es_MX/team/name.ts b/src/locales/es_MX/team/name.ts index ed2bdbb53fa..bdd4f123462 100644 --- a/src/locales/es_MX/team/name.ts +++ b/src/locales/es_MX/team/name.ts @@ -1 +1 @@ -export default ['{{address.state}} {{team.creature}}']; +export default ['{{location.state}} {{team.creature}}']; diff --git a/src/locales/fa/location/city.ts b/src/locales/fa/location/city.ts index e3da346bd1e..ad43b68fc5c 100644 --- a/src/locales/fa/location/city.ts +++ b/src/locales/fa/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_name}}']; +export default ['{{location.city_name}}']; diff --git a/src/locales/fa/location/street.ts b/src/locales/fa/location/street.ts index 249fca8630b..f62f53f0931 100644 --- a/src/locales/fa/location/street.ts +++ b/src/locales/fa/location/street.ts @@ -1 +1 @@ -export default ['{{address.street_prefix}} {{address.street_suffix}}']; +export default ['{{location.street_prefix}} {{location.street_suffix}}']; diff --git a/src/locales/fa/location/street_address.ts b/src/locales/fa/location/street_address.ts index a7f306b54c4..eec0e19923e 100644 --- a/src/locales/fa/location/street_address.ts +++ b/src/locales/fa/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}}, پلاک {{address.buildingNumber}}', - full: '{{address.street}}, پلاک {{address.buildingNumber}} {{address.secondaryAddress}}', + normal: '{{location.street}}, پلاک {{location.buildingNumber}}', + full: '{{location.street}}, پلاک {{location.buildingNumber}} {{location.secondaryAddress}}', }; diff --git a/src/locales/fr/location/city.ts b/src/locales/fr/location/city.ts index e3da346bd1e..ad43b68fc5c 100644 --- a/src/locales/fr/location/city.ts +++ b/src/locales/fr/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_name}}']; +export default ['{{location.city_name}}']; diff --git a/src/locales/fr/location/street.ts b/src/locales/fr/location/street.ts index 249fca8630b..f62f53f0931 100644 --- a/src/locales/fr/location/street.ts +++ b/src/locales/fr/location/street.ts @@ -1 +1 @@ -export default ['{{address.street_prefix}} {{address.street_suffix}}']; +export default ['{{location.street_prefix}} {{location.street_suffix}}']; diff --git a/src/locales/fr/location/street_address.ts b/src/locales/fr/location/street_address.ts index 55bed3628b9..2e1a661d418 100644 --- a/src/locales/fr/location/street_address.ts +++ b/src/locales/fr/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.buildingNumber}} {{address.street}}', - full: '{{address.buildingNumber}} {{address.street}} {{address.secondaryAddress}}', + normal: '{{location.buildingNumber}} {{location.street}}', + full: '{{location.buildingNumber}} {{location.street}} {{location.secondaryAddress}}', }; diff --git a/src/locales/fr_BE/location/city.ts b/src/locales/fr_BE/location/city.ts index 5eaa0e417c3..2bddf0f5f12 100644 --- a/src/locales/fr_BE/location/city.ts +++ b/src/locales/fr_BE/location/city.ts @@ -1,4 +1,4 @@ export default [ - '{{address.city_prefix}}', - '{{address.city_prefix}}{{address.city_suffix}}', + '{{location.city_prefix}}', + '{{location.city_prefix}}{{location.city_suffix}}', ]; diff --git a/src/locales/fr_BE/location/street.ts b/src/locales/fr_BE/location/street.ts index 00c17d59447..47e60b56699 100644 --- a/src/locales/fr_BE/location/street.ts +++ b/src/locales/fr_BE/location/street.ts @@ -1,5 +1,5 @@ export default [ - '{{address.street_prefix}} {{person.first_name}}', - '{{address.street_prefix}} {{person.last_name}}', - '{{address.street_prefix}} {{address.street_suffix}}', + '{{location.street_prefix}} {{person.first_name}}', + '{{location.street_prefix}} {{person.last_name}}', + '{{location.street_prefix}} {{location.street_suffix}}', ]; diff --git a/src/locales/fr_BE/location/street_address.ts b/src/locales/fr_BE/location/street_address.ts index d1e8da38725..437f20dd91a 100644 --- a/src/locales/fr_BE/location/street_address.ts +++ b/src/locales/fr_BE/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', }; diff --git a/src/locales/fr_CA/location/city.ts b/src/locales/fr_CA/location/city.ts index ea6ea950e46..7375aa8378a 100644 --- a/src/locales/fr_CA/location/city.ts +++ b/src/locales/fr_CA/location/city.ts @@ -1,6 +1,6 @@ export default [ - '{{address.city_prefix}} {{person.firstName}}{{address.city_suffix}}', - '{{address.city_prefix}} {{person.firstName}}', - '{{person.firstName}}{{address.city_suffix}}', - '{{person.lastName}}{{address.city_suffix}}', + '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}', + '{{location.city_prefix}} {{person.firstName}}', + '{{person.firstName}}{{location.city_suffix}}', + '{{person.lastName}}{{location.city_suffix}}', ]; diff --git a/src/locales/fr_CA/location/street.ts b/src/locales/fr_CA/location/street.ts index f7dd9d3b3aa..af32d0c4248 100644 --- a/src/locales/fr_CA/location/street.ts +++ b/src/locales/fr_CA/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', ]; diff --git a/src/locales/fr_CH/location/city.ts b/src/locales/fr_CH/location/city.ts index e3da346bd1e..ad43b68fc5c 100644 --- a/src/locales/fr_CH/location/city.ts +++ b/src/locales/fr_CH/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_name}}']; +export default ['{{location.city_name}}']; diff --git a/src/locales/fr_CH/location/street.ts b/src/locales/fr_CH/location/street.ts index 249fca8630b..f62f53f0931 100644 --- a/src/locales/fr_CH/location/street.ts +++ b/src/locales/fr_CH/location/street.ts @@ -1 +1 @@ -export default ['{{address.street_prefix}} {{address.street_suffix}}']; +export default ['{{location.street_prefix}} {{location.street_suffix}}']; diff --git a/src/locales/fr_CH/location/street_address.ts b/src/locales/fr_CH/location/street_address.ts index d6c5878a730..3ee966e2703 100644 --- a/src/locales/fr_CH/location/street_address.ts +++ b/src/locales/fr_CH/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.buildingNumber}} {{address.streetName}}', - full: '{{address.buildingNumber}} {{address.streetName}} {{address.secondaryAddress}}', + normal: '{{location.buildingNumber}} {{location.streetName}}', + full: '{{location.buildingNumber}} {{location.streetName}} {{location.secondaryAddress}}', }; diff --git a/src/locales/ge/location/city.ts b/src/locales/ge/location/city.ts index 27a932f1459..d744d882361 100644 --- a/src/locales/ge/location/city.ts +++ b/src/locales/ge/location/city.ts @@ -1,6 +1,6 @@ export default [ - '{{address.city_prefix}} {{person.first_name}}{{address.city_suffix}}', - '{{address.city_prefix}} {{person.first_name}}', - '{{person.first_name}}{{address.city_suffix}}', - '{{person.last_name}}{{address.city_suffix}}', + '{{location.city_prefix}} {{person.first_name}}{{location.city_suffix}}', + '{{location.city_prefix}} {{person.first_name}}', + '{{person.first_name}}{{location.city_suffix}}', + '{{person.last_name}}{{location.city_suffix}}', ]; diff --git a/src/locales/ge/location/street.ts b/src/locales/ge/location/street.ts index 75ceb113313..afbdb76e642 100644 --- a/src/locales/ge/location/street.ts +++ b/src/locales/ge/location/street.ts @@ -1 +1 @@ -export default ['{{address.street_name}} {{address.street_suffix}}']; +export default ['{{location.street_name}} {{location.street_suffix}}']; diff --git a/src/locales/ge/location/street_address.ts b/src/locales/ge/location/street_address.ts index d1e8da38725..437f20dd91a 100644 --- a/src/locales/ge/location/street_address.ts +++ b/src/locales/ge/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', }; diff --git a/src/locales/he/location/city.ts b/src/locales/he/location/city.ts index e3da346bd1e..ad43b68fc5c 100644 --- a/src/locales/he/location/city.ts +++ b/src/locales/he/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_name}}']; +export default ['{{location.city_name}}']; diff --git a/src/locales/he/location/street.ts b/src/locales/he/location/street.ts index 86e124a5f65..bfebd5b407d 100644 --- a/src/locales/he/location/street.ts +++ b/src/locales/he/location/street.ts @@ -1 +1 @@ -export default ['{{address.street_prefix}} {{address.street_name}}']; +export default ['{{location.street_prefix}} {{location.street_name}}']; diff --git a/src/locales/he/location/street_address.ts b/src/locales/he/location/street_address.ts index d1e8da38725..437f20dd91a 100644 --- a/src/locales/he/location/street_address.ts +++ b/src/locales/he/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', }; diff --git a/src/locales/hr/location/city.ts b/src/locales/hr/location/city.ts index e3da346bd1e..ad43b68fc5c 100644 --- a/src/locales/hr/location/city.ts +++ b/src/locales/hr/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_name}}']; +export default ['{{location.city_name}}']; diff --git a/src/locales/hr/location/street.ts b/src/locales/hr/location/street.ts index 30ba73fc997..30a9a5ddf99 100644 --- a/src/locales/hr/location/street.ts +++ b/src/locales/hr/location/street.ts @@ -1 +1 @@ -export default ['{{address.street_name}}']; +export default ['{{location.street_name}}']; diff --git a/src/locales/hr/location/street_address.ts b/src/locales/hr/location/street_address.ts index d1e8da38725..437f20dd91a 100644 --- a/src/locales/hr/location/street_address.ts +++ b/src/locales/hr/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', }; diff --git a/src/locales/hy/location/city.ts b/src/locales/hy/location/city.ts index a441b2f700d..3dbf4e11545 100644 --- a/src/locales/hy/location/city.ts +++ b/src/locales/hy/location/city.ts @@ -1,4 +1,4 @@ export default [ - '{{address.city_prefix}} {{person.last_name}}', - '{{person.last_name}}{{address.city_suffix}}', + '{{location.city_prefix}} {{person.last_name}}', + '{{person.last_name}}{{location.city_suffix}}', ]; diff --git a/src/locales/hy/location/street.ts b/src/locales/hy/location/street.ts index 4b6c9f6f50a..08f3003b076 100644 --- a/src/locales/hy/location/street.ts +++ b/src/locales/hy/location/street.ts @@ -1 +1 @@ -export default ['{{person.last_name}} {{address.street_suffix}}']; +export default ['{{person.last_name}} {{location.street_suffix}}']; diff --git a/src/locales/hy/location/street_address.ts b/src/locales/hy/location/street_address.ts index d1e8da38725..437f20dd91a 100644 --- a/src/locales/hy/location/street_address.ts +++ b/src/locales/hy/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', }; diff --git a/src/locales/id_ID/location/city.ts b/src/locales/id_ID/location/city.ts index e3da346bd1e..ad43b68fc5c 100644 --- a/src/locales/id_ID/location/city.ts +++ b/src/locales/id_ID/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_name}}']; +export default ['{{location.city_name}}']; diff --git a/src/locales/id_ID/location/street.ts b/src/locales/id_ID/location/street.ts index 5db4f5be71f..c182e83762a 100644 --- a/src/locales/id_ID/location/street.ts +++ b/src/locales/id_ID/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{address.street_prefix}} {{person.first_name}}', - '{{address.street_prefix}} {{person.last_name}}', + '{{location.street_prefix}} {{person.first_name}}', + '{{location.street_prefix}} {{person.last_name}}', ]; diff --git a/src/locales/id_ID/location/street_address.ts b/src/locales/id_ID/location/street_address.ts index 006c2a907e0..4a12bddb9e1 100644 --- a/src/locales/id_ID/location/street_address.ts +++ b/src/locales/id_ID/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}} no {{address.buildingNumber}}', - full: '{{address.street}} no {{address.buildingNumber}} {{address.secondaryAddress}}', + normal: '{{location.street}} no {{location.buildingNumber}}', + full: '{{location.street}} no {{location.buildingNumber}} {{location.secondaryAddress}}', }; diff --git a/src/locales/it/location/city.ts b/src/locales/it/location/city.ts index f1c33d476b7..b29e1252b61 100644 --- a/src/locales/it/location/city.ts +++ b/src/locales/it/location/city.ts @@ -1,6 +1,6 @@ export default [ - '{{address.city_prefix}} {{person.first_name}} {{address.city_suffix}}', - '{{address.city_prefix}} {{person.first_name}}', - '{{person.first_name}} {{address.city_suffix}}', - '{{person.last_name}} {{address.city_suffix}}', + '{{location.city_prefix}} {{person.first_name}} {{location.city_suffix}}', + '{{location.city_prefix}} {{person.first_name}}', + '{{person.first_name}} {{location.city_suffix}}', + '{{person.last_name}} {{location.city_suffix}}', ]; diff --git a/src/locales/it/location/street.ts b/src/locales/it/location/street.ts index 5d4a09006fc..e2e1b0dbb6f 100644 --- a/src/locales/it/location/street.ts +++ b/src/locales/it/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{address.street_suffix}} {{person.first_name}}', - '{{address.street_suffix}} {{person.last_name}}', + '{{location.street_suffix}} {{person.first_name}}', + '{{location.street_suffix}} {{person.last_name}}', ]; diff --git a/src/locales/it/location/street_address.ts b/src/locales/it/location/street_address.ts index b198be88ddc..15512f0992d 100644 --- a/src/locales/it/location/street_address.ts +++ b/src/locales/it/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}}, {{address.secondaryAddress}}', + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}}, {{location.secondaryAddress}}', }; diff --git a/src/locales/ja/location/city.ts b/src/locales/ja/location/city.ts index 2cb639cd935..2c27e4fd042 100644 --- a/src/locales/ja/location/city.ts +++ b/src/locales/ja/location/city.ts @@ -1,6 +1,6 @@ export default [ - '{{address.city_prefix}}{{person.first_name}}{{address.city_suffix}}', - '{{person.first_name}}{{address.city_suffix}}', - '{{address.city_prefix}}{{person.last_name}}{{address.city_suffix}}', - '{{person.last_name}}{{address.city_suffix}}', + '{{location.city_prefix}}{{person.first_name}}{{location.city_suffix}}', + '{{person.first_name}}{{location.city_suffix}}', + '{{location.city_prefix}}{{person.last_name}}{{location.city_suffix}}', + '{{person.last_name}}{{location.city_suffix}}', ]; diff --git a/src/locales/ja/location/street.ts b/src/locales/ja/location/street.ts index a32c95d3e61..06ca3a5e812 100644 --- a/src/locales/ja/location/street.ts +++ b/src/locales/ja/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{person.first_name}}{{address.street_suffix}}', - '{{person.last_name}}{{address.street_suffix}}', + '{{person.first_name}}{{location.street_suffix}}', + '{{person.last_name}}{{location.street_suffix}}', ]; diff --git a/src/locales/ko/location/city.ts b/src/locales/ko/location/city.ts index 67bd1b88813..61f8d6f193b 100644 --- a/src/locales/ko/location/city.ts +++ b/src/locales/ko/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_name}}{{address.city_suffix}}']; +export default ['{{location.city_name}}{{location.city_suffix}}']; diff --git a/src/locales/ko/location/street.ts b/src/locales/ko/location/street.ts index 7b5320b5d0e..b5dd696c055 100644 --- a/src/locales/ko/location/street.ts +++ b/src/locales/ko/location/street.ts @@ -1 +1 @@ -export default ['{{address.street_name}}{{address.street_suffix}}']; +export default ['{{location.street_name}}{{location.street_suffix}}']; diff --git a/src/locales/lv/location/city.ts b/src/locales/lv/location/city.ts index e3da346bd1e..ad43b68fc5c 100644 --- a/src/locales/lv/location/city.ts +++ b/src/locales/lv/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_name}}']; +export default ['{{location.city_name}}']; diff --git a/src/locales/lv/location/street.ts b/src/locales/lv/location/street.ts index 75ceb113313..afbdb76e642 100644 --- a/src/locales/lv/location/street.ts +++ b/src/locales/lv/location/street.ts @@ -1 +1 @@ -export default ['{{address.street_name}} {{address.street_suffix}}']; +export default ['{{location.street_name}} {{location.street_suffix}}']; diff --git a/src/locales/lv/location/street_address.ts b/src/locales/lv/location/street_address.ts index d1e8da38725..437f20dd91a 100644 --- a/src/locales/lv/location/street_address.ts +++ b/src/locales/lv/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', }; diff --git a/src/locales/mk/company/name_patterns.ts b/src/locales/mk/company/name_patterns.ts index a214e6aef59..edd34a66d4b 100644 --- a/src/locales/mk/company/name_patterns.ts +++ b/src/locales/mk/company/name_patterns.ts @@ -1,5 +1,5 @@ export default [ '{{person.last_name}} {{company.suffix}}', - '{{address.city_name}} {{company.suffix}}', + '{{location.city_name}} {{company.suffix}}', '{{person.last_name}}, {{person.last_name}} и {{person.last_name}}', ]; diff --git a/src/locales/mk/location/city.ts b/src/locales/mk/location/city.ts index e3da346bd1e..ad43b68fc5c 100644 --- a/src/locales/mk/location/city.ts +++ b/src/locales/mk/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_name}}']; +export default ['{{location.city_name}}']; diff --git a/src/locales/mk/location/street.ts b/src/locales/mk/location/street.ts index 30ba73fc997..30a9a5ddf99 100644 --- a/src/locales/mk/location/street.ts +++ b/src/locales/mk/location/street.ts @@ -1 +1 @@ -export default ['{{address.street_name}}']; +export default ['{{location.street_name}}']; diff --git a/src/locales/mk/location/street_address.ts b/src/locales/mk/location/street_address.ts index d1e8da38725..437f20dd91a 100644 --- a/src/locales/mk/location/street_address.ts +++ b/src/locales/mk/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', }; diff --git a/src/locales/nb_NO/location/city.ts b/src/locales/nb_NO/location/city.ts index 67bd1b88813..61f8d6f193b 100644 --- a/src/locales/nb_NO/location/city.ts +++ b/src/locales/nb_NO/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_name}}{{address.city_suffix}}']; +export default ['{{location.city_name}}{{location.city_suffix}}']; diff --git a/src/locales/nb_NO/location/street.ts b/src/locales/nb_NO/location/street.ts index 72310d5affe..1e4fbfd7e5a 100644 --- a/src/locales/nb_NO/location/street.ts +++ b/src/locales/nb_NO/location/street.ts @@ -1,6 +1,6 @@ export default [ - '{{address.street_name}}{{address.street_suffix}}', - '{{address.street_prefix}} {{address.street_name}}{{address.street_suffix}}', - '{{person.first_name}}{{address.common_street_suffix}}', - '{{person.last_name}}{{address.common_street_suffix}}', + '{{location.street_name}}{{location.street_suffix}}', + '{{location.street_prefix}} {{location.street_name}}{{location.street_suffix}}', + '{{person.first_name}}{{location.common_street_suffix}}', + '{{person.last_name}}{{location.common_street_suffix}}', ]; diff --git a/src/locales/nb_NO/location/street_address.ts b/src/locales/nb_NO/location/street_address.ts index d1e8da38725..437f20dd91a 100644 --- a/src/locales/nb_NO/location/street_address.ts +++ b/src/locales/nb_NO/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', }; diff --git a/src/locales/ne/location/city.ts b/src/locales/ne/location/city.ts index d77ac09a558..0d422527891 100644 --- a/src/locales/ne/location/city.ts +++ b/src/locales/ne/location/city.ts @@ -1,7 +1,7 @@ export default [ - '{{address.city_prefix}} {{person.firstName}}{{address.city_suffix}}', - '{{address.city_prefix}} {{person.firstName}}', - '{{person.firstName}}{{address.city_suffix}}', - '{{person.lastName}}{{address.city_suffix}}', - '{{address.city_name}}', + '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}', + '{{location.city_prefix}} {{person.firstName}}', + '{{person.firstName}}{{location.city_suffix}}', + '{{person.lastName}}{{location.city_suffix}}', + '{{location.city_name}}', ]; diff --git a/src/locales/ne/location/street.ts b/src/locales/ne/location/street.ts index f7dd9d3b3aa..af32d0c4248 100644 --- a/src/locales/ne/location/street.ts +++ b/src/locales/ne/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', ]; diff --git a/src/locales/nl/location/city.ts b/src/locales/nl/location/city.ts index 003651627e7..daae91a86e4 100644 --- a/src/locales/nl/location/city.ts +++ b/src/locales/nl/location/city.ts @@ -1,4 +1,4 @@ export default [ - '{{address.city_prefix}}{{address.city_suffix}}', - '{{address.city_prefix}}', + '{{location.city_prefix}}{{location.city_suffix}}', + '{{location.city_prefix}}', ]; diff --git a/src/locales/nl/location/street.ts b/src/locales/nl/location/street.ts index a32c95d3e61..06ca3a5e812 100644 --- a/src/locales/nl/location/street.ts +++ b/src/locales/nl/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{person.first_name}}{{address.street_suffix}}', - '{{person.last_name}}{{address.street_suffix}}', + '{{person.first_name}}{{location.street_suffix}}', + '{{person.last_name}}{{location.street_suffix}}', ]; diff --git a/src/locales/nl/location/street_address.ts b/src/locales/nl/location/street_address.ts index d1e8da38725..437f20dd91a 100644 --- a/src/locales/nl/location/street_address.ts +++ b/src/locales/nl/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', }; diff --git a/src/locales/nl_BE/location/city.ts b/src/locales/nl_BE/location/city.ts index 5eaa0e417c3..2bddf0f5f12 100644 --- a/src/locales/nl_BE/location/city.ts +++ b/src/locales/nl_BE/location/city.ts @@ -1,4 +1,4 @@ export default [ - '{{address.city_prefix}}', - '{{address.city_prefix}}{{address.city_suffix}}', + '{{location.city_prefix}}', + '{{location.city_prefix}}{{location.city_suffix}}', ]; diff --git a/src/locales/nl_BE/location/street.ts b/src/locales/nl_BE/location/street.ts index a32c95d3e61..06ca3a5e812 100644 --- a/src/locales/nl_BE/location/street.ts +++ b/src/locales/nl_BE/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{person.first_name}}{{address.street_suffix}}', - '{{person.last_name}}{{address.street_suffix}}', + '{{person.first_name}}{{location.street_suffix}}', + '{{person.last_name}}{{location.street_suffix}}', ]; diff --git a/src/locales/nl_BE/location/street_address.ts b/src/locales/nl_BE/location/street_address.ts index d1e8da38725..437f20dd91a 100644 --- a/src/locales/nl_BE/location/street_address.ts +++ b/src/locales/nl_BE/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', }; diff --git a/src/locales/pl/location/city.ts b/src/locales/pl/location/city.ts index e3da346bd1e..ad43b68fc5c 100644 --- a/src/locales/pl/location/city.ts +++ b/src/locales/pl/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_name}}']; +export default ['{{location.city_name}}']; diff --git a/src/locales/pl/location/street.ts b/src/locales/pl/location/street.ts index 9e114ccbf34..7862632a955 100644 --- a/src/locales/pl/location/street.ts +++ b/src/locales/pl/location/street.ts @@ -1 +1 @@ -export default ['{{address.street_prefix}} {{person.last_name}}']; +export default ['{{location.street_prefix}} {{person.last_name}}']; diff --git a/src/locales/pl/location/street_address.ts b/src/locales/pl/location/street_address.ts index d1e8da38725..437f20dd91a 100644 --- a/src/locales/pl/location/street_address.ts +++ b/src/locales/pl/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', }; diff --git a/src/locales/pl/team/name.ts b/src/locales/pl/team/name.ts index 3b22d3ab82b..62f24281559 100644 --- a/src/locales/pl/team/name.ts +++ b/src/locales/pl/team/name.ts @@ -1 +1 @@ -export default ['{{team.prefix}} {{address.city}}']; +export default ['{{team.prefix}} {{location.city}}']; diff --git a/src/locales/pt_BR/location/city.ts b/src/locales/pt_BR/location/city.ts index ea6ea950e46..7375aa8378a 100644 --- a/src/locales/pt_BR/location/city.ts +++ b/src/locales/pt_BR/location/city.ts @@ -1,6 +1,6 @@ export default [ - '{{address.city_prefix}} {{person.firstName}}{{address.city_suffix}}', - '{{address.city_prefix}} {{person.firstName}}', - '{{person.firstName}}{{address.city_suffix}}', - '{{person.lastName}}{{address.city_suffix}}', + '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}', + '{{location.city_prefix}} {{person.firstName}}', + '{{person.firstName}}{{location.city_suffix}}', + '{{person.lastName}}{{location.city_suffix}}', ]; diff --git a/src/locales/pt_BR/location/street.ts b/src/locales/pt_BR/location/street.ts index f7dd9d3b3aa..af32d0c4248 100644 --- a/src/locales/pt_BR/location/street.ts +++ b/src/locales/pt_BR/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', ]; diff --git a/src/locales/pt_PT/location/city.ts b/src/locales/pt_PT/location/city.ts index e3da346bd1e..ad43b68fc5c 100644 --- a/src/locales/pt_PT/location/city.ts +++ b/src/locales/pt_PT/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_name}}']; +export default ['{{location.city_name}}']; diff --git a/src/locales/pt_PT/location/street.ts b/src/locales/pt_PT/location/street.ts index 603c6461782..f579edee3d3 100644 --- a/src/locales/pt_PT/location/street.ts +++ b/src/locales/pt_PT/location/street.ts @@ -1,5 +1,5 @@ export default [ - '{{address.street_prefix}} {{person.first_name}} {{person.last_name}}', + '{{location.street_prefix}} {{person.first_name}} {{person.last_name}}', 'N#', 'N##', 'N###', diff --git a/src/locales/pt_PT/location/street_address.ts b/src/locales/pt_PT/location/street_address.ts index d1e8da38725..437f20dd91a 100644 --- a/src/locales/pt_PT/location/street_address.ts +++ b/src/locales/pt_PT/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', }; diff --git a/src/locales/ro/location/city.ts b/src/locales/ro/location/city.ts index d77ac09a558..0d422527891 100644 --- a/src/locales/ro/location/city.ts +++ b/src/locales/ro/location/city.ts @@ -1,7 +1,7 @@ export default [ - '{{address.city_prefix}} {{person.firstName}}{{address.city_suffix}}', - '{{address.city_prefix}} {{person.firstName}}', - '{{person.firstName}}{{address.city_suffix}}', - '{{person.lastName}}{{address.city_suffix}}', - '{{address.city_name}}', + '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}', + '{{location.city_prefix}} {{person.firstName}}', + '{{person.firstName}}{{location.city_suffix}}', + '{{person.lastName}}{{location.city_suffix}}', + '{{location.city_name}}', ]; diff --git a/src/locales/ro/location/street.ts b/src/locales/ro/location/street.ts index b16d72dd9c4..e5bab9f76c3 100644 --- a/src/locales/ro/location/street.ts +++ b/src/locales/ro/location/street.ts @@ -1 +1 @@ -export default ['{{address.street_suffix}} {{address.street_name}}']; +export default ['{{location.street_suffix}} {{location.street_name}}']; diff --git a/src/locales/ro/location/street_address.ts b/src/locales/ro/location/street_address.ts index 510bbab314d..b1cf56fcac2 100644 --- a/src/locales/ro/location/street_address.ts +++ b/src/locales/ro/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}}, {{address.buildingNumber}}', - full: '{{address.street}}, {{address.buildingNumber}}, {{address.secondaryAddress}}', + normal: '{{location.street}}, {{location.buildingNumber}}', + full: '{{location.street}}, {{location.buildingNumber}}, {{location.secondaryAddress}}', }; diff --git a/src/locales/ru/company/name_patterns.ts b/src/locales/ru/company/name_patterns.ts index 9db05dce1a3..b9374d22299 100644 --- a/src/locales/ru/company/name_patterns.ts +++ b/src/locales/ru/company/name_patterns.ts @@ -4,7 +4,7 @@ export default [ '{{company.prefix}} {{person.male_last_name}}', '{{company.prefix}} {{company.suffix}}{{company.suffix}}', '{{company.prefix}} {{company.suffix}}{{company.suffix}}{{company.suffix}}', - '{{company.prefix}} {{address.city_name}}{{company.suffix}}', - '{{company.prefix}} {{address.city_name}}{{company.suffix}}{{company.suffix}}', - '{{company.prefix}} {{address.city_name}}{{company.suffix}}{{company.suffix}}{{company.suffix}}', + '{{company.prefix}} {{location.city_name}}{{company.suffix}}', + '{{company.prefix}} {{location.city_name}}{{company.suffix}}{{company.suffix}}', + '{{company.prefix}} {{location.city_name}}{{company.suffix}}{{company.suffix}}{{company.suffix}}', ]; diff --git a/src/locales/ru/location/city.ts b/src/locales/ru/location/city.ts index e3da346bd1e..ad43b68fc5c 100644 --- a/src/locales/ru/location/city.ts +++ b/src/locales/ru/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_name}}']; +export default ['{{location.city_name}}']; diff --git a/src/locales/ru/location/street.ts b/src/locales/ru/location/street.ts index bddea6b0e50..523f81653d1 100644 --- a/src/locales/ru/location/street.ts +++ b/src/locales/ru/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{address.street_suffix}} {{address.street_name}}', - '{{address.street_name}} {{address.street_suffix}}', + '{{location.street_suffix}} {{location.street_name}}', + '{{location.street_name}} {{location.street_suffix}}', ]; diff --git a/src/locales/ru/location/street_address.ts b/src/locales/ru/location/street_address.ts index 9a8e4da4839..3394fef6dc2 100644 --- a/src/locales/ru/location/street_address.ts +++ b/src/locales/ru/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}}, {{address.buildingNumber}}', - full: '{{address.street}}, {{address.buildingNumber}} {{address.secondaryAddress}}', + normal: '{{location.street}}, {{location.buildingNumber}}', + full: '{{location.street}}, {{location.buildingNumber}} {{location.secondaryAddress}}', }; diff --git a/src/locales/sk/location/city.ts b/src/locales/sk/location/city.ts index e3da346bd1e..ad43b68fc5c 100644 --- a/src/locales/sk/location/city.ts +++ b/src/locales/sk/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_name}}']; +export default ['{{location.city_name}}']; diff --git a/src/locales/sk/location/street.ts b/src/locales/sk/location/street.ts index 30ba73fc997..30a9a5ddf99 100644 --- a/src/locales/sk/location/street.ts +++ b/src/locales/sk/location/street.ts @@ -1 +1 @@ -export default ['{{address.street_name}}']; +export default ['{{location.street_name}}']; diff --git a/src/locales/sk/location/street_address.ts b/src/locales/sk/location/street_address.ts index d1e8da38725..437f20dd91a 100644 --- a/src/locales/sk/location/street_address.ts +++ b/src/locales/sk/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', }; diff --git a/src/locales/sv/location/city.ts b/src/locales/sv/location/city.ts index b53f9163cf5..aa67dfa8896 100644 --- a/src/locales/sv/location/city.ts +++ b/src/locales/sv/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_prefix}}{{address.city_suffix}}']; +export default ['{{location.city_prefix}}{{location.city_suffix}}']; diff --git a/src/locales/sv/location/street.ts b/src/locales/sv/location/street.ts index 72310d5affe..1e4fbfd7e5a 100644 --- a/src/locales/sv/location/street.ts +++ b/src/locales/sv/location/street.ts @@ -1,6 +1,6 @@ export default [ - '{{address.street_name}}{{address.street_suffix}}', - '{{address.street_prefix}} {{address.street_name}}{{address.street_suffix}}', - '{{person.first_name}}{{address.common_street_suffix}}', - '{{person.last_name}}{{address.common_street_suffix}}', + '{{location.street_name}}{{location.street_suffix}}', + '{{location.street_prefix}} {{location.street_name}}{{location.street_suffix}}', + '{{person.first_name}}{{location.common_street_suffix}}', + '{{person.last_name}}{{location.common_street_suffix}}', ]; diff --git a/src/locales/sv/location/street_address.ts b/src/locales/sv/location/street_address.ts index d1e8da38725..437f20dd91a 100644 --- a/src/locales/sv/location/street_address.ts +++ b/src/locales/sv/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', }; diff --git a/src/locales/sv/team/name.ts b/src/locales/sv/team/name.ts index 3a0c91edd4b..f8636c57ad8 100644 --- a/src/locales/sv/team/name.ts +++ b/src/locales/sv/team/name.ts @@ -1 +1 @@ -export default ['{{address.city}} {{team.suffix}}']; +export default ['{{location.city}} {{team.suffix}}']; diff --git a/src/locales/tr/location/city.ts b/src/locales/tr/location/city.ts index d77ac09a558..0d422527891 100644 --- a/src/locales/tr/location/city.ts +++ b/src/locales/tr/location/city.ts @@ -1,7 +1,7 @@ export default [ - '{{address.city_prefix}} {{person.firstName}}{{address.city_suffix}}', - '{{address.city_prefix}} {{person.firstName}}', - '{{person.firstName}}{{address.city_suffix}}', - '{{person.lastName}}{{address.city_suffix}}', - '{{address.city_name}}', + '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}', + '{{location.city_prefix}} {{person.firstName}}', + '{{person.firstName}}{{location.city_suffix}}', + '{{person.lastName}}{{location.city_suffix}}', + '{{location.city_name}}', ]; diff --git a/src/locales/tr/location/street.ts b/src/locales/tr/location/street.ts index 30ba73fc997..30a9a5ddf99 100644 --- a/src/locales/tr/location/street.ts +++ b/src/locales/tr/location/street.ts @@ -1 +1 @@ -export default ['{{address.street_name}}']; +export default ['{{location.street_name}}']; diff --git a/src/locales/tr/location/street_address.ts b/src/locales/tr/location/street_address.ts index d1e8da38725..437f20dd91a 100644 --- a/src/locales/tr/location/street_address.ts +++ b/src/locales/tr/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', }; diff --git a/src/locales/uk/company/name_patterns.ts b/src/locales/uk/company/name_patterns.ts index 9db05dce1a3..b9374d22299 100644 --- a/src/locales/uk/company/name_patterns.ts +++ b/src/locales/uk/company/name_patterns.ts @@ -4,7 +4,7 @@ export default [ '{{company.prefix}} {{person.male_last_name}}', '{{company.prefix}} {{company.suffix}}{{company.suffix}}', '{{company.prefix}} {{company.suffix}}{{company.suffix}}{{company.suffix}}', - '{{company.prefix}} {{address.city_name}}{{company.suffix}}', - '{{company.prefix}} {{address.city_name}}{{company.suffix}}{{company.suffix}}', - '{{company.prefix}} {{address.city_name}}{{company.suffix}}{{company.suffix}}{{company.suffix}}', + '{{company.prefix}} {{location.city_name}}{{company.suffix}}', + '{{company.prefix}} {{location.city_name}}{{company.suffix}}{{company.suffix}}', + '{{company.prefix}} {{location.city_name}}{{company.suffix}}{{company.suffix}}{{company.suffix}}', ]; diff --git a/src/locales/uk/location/city.ts b/src/locales/uk/location/city.ts index f99cfa3301f..da2f6aad4da 100644 --- a/src/locales/uk/location/city.ts +++ b/src/locales/uk/location/city.ts @@ -1,4 +1,4 @@ export default [ - '{{address.city_name}}', - '{{address.city_prefix}} {{person.male_first_name}}', + '{{location.city_name}}', + '{{location.city_prefix}} {{person.male_first_name}}', ]; diff --git a/src/locales/uk/location/street.ts b/src/locales/uk/location/street.ts index ce1d4f4df97..2dc80f1c268 100644 --- a/src/locales/uk/location/street.ts +++ b/src/locales/uk/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{address.street_prefix}} {{address.street_name}}', - '{{address.street_name}} {{address.street_suffix}}', + '{{location.street_prefix}} {{location.street_name}}', + '{{location.street_name}} {{location.street_suffix}}', ]; diff --git a/src/locales/uk/location/street_address.ts b/src/locales/uk/location/street_address.ts index 9a8e4da4839..3394fef6dc2 100644 --- a/src/locales/uk/location/street_address.ts +++ b/src/locales/uk/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}}, {{address.buildingNumber}}', - full: '{{address.street}}, {{address.buildingNumber}} {{address.secondaryAddress}}', + normal: '{{location.street}}, {{location.buildingNumber}}', + full: '{{location.street}}, {{location.buildingNumber}} {{location.secondaryAddress}}', }; diff --git a/src/locales/ur/location/city.ts b/src/locales/ur/location/city.ts index 27a932f1459..d744d882361 100644 --- a/src/locales/ur/location/city.ts +++ b/src/locales/ur/location/city.ts @@ -1,6 +1,6 @@ export default [ - '{{address.city_prefix}} {{person.first_name}}{{address.city_suffix}}', - '{{address.city_prefix}} {{person.first_name}}', - '{{person.first_name}}{{address.city_suffix}}', - '{{person.last_name}}{{address.city_suffix}}', + '{{location.city_prefix}} {{person.first_name}}{{location.city_suffix}}', + '{{location.city_prefix}} {{person.first_name}}', + '{{person.first_name}}{{location.city_suffix}}', + '{{person.last_name}}{{location.city_suffix}}', ]; diff --git a/src/locales/ur/location/street.ts b/src/locales/ur/location/street.ts index 5e9ca1171d0..b5fcd9fea0f 100644 --- a/src/locales/ur/location/street.ts +++ b/src/locales/ur/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{person.first_name}} {{address.street_suffix}}', - '{{person.last_name}} {{address.street_suffix}}', + '{{person.first_name}} {{location.street_suffix}}', + '{{person.last_name}} {{location.street_suffix}}', ]; diff --git a/src/locales/ur/location/street_address.ts b/src/locales/ur/location/street_address.ts index 55bed3628b9..2e1a661d418 100644 --- a/src/locales/ur/location/street_address.ts +++ b/src/locales/ur/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.buildingNumber}} {{address.street}}', - full: '{{address.buildingNumber}} {{address.street}} {{address.secondaryAddress}}', + normal: '{{location.buildingNumber}} {{location.street}}', + full: '{{location.buildingNumber}} {{location.street}} {{location.secondaryAddress}}', }; diff --git a/src/locales/ur/team/name.ts b/src/locales/ur/team/name.ts index ed2bdbb53fa..bdd4f123462 100644 --- a/src/locales/ur/team/name.ts +++ b/src/locales/ur/team/name.ts @@ -1 +1 @@ -export default ['{{address.state}} {{team.creature}}']; +export default ['{{location.state}} {{team.creature}}']; diff --git a/src/locales/vi/location/city.ts b/src/locales/vi/location/city.ts index e3da346bd1e..ad43b68fc5c 100644 --- a/src/locales/vi/location/city.ts +++ b/src/locales/vi/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_name}}']; +export default ['{{location.city_name}}']; diff --git a/src/locales/vi/location/street.ts b/src/locales/vi/location/street.ts index f7dd9d3b3aa..af32d0c4248 100644 --- a/src/locales/vi/location/street.ts +++ b/src/locales/vi/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', ]; diff --git a/src/locales/zh_CN/location/city.ts b/src/locales/zh_CN/location/city.ts index b53f9163cf5..aa67dfa8896 100644 --- a/src/locales/zh_CN/location/city.ts +++ b/src/locales/zh_CN/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_prefix}}{{address.city_suffix}}']; +export default ['{{location.city_prefix}}{{location.city_suffix}}']; diff --git a/src/locales/zh_CN/location/street.ts b/src/locales/zh_CN/location/street.ts index 6522d790e53..dfaaaa6e3c0 100644 --- a/src/locales/zh_CN/location/street.ts +++ b/src/locales/zh_CN/location/street.ts @@ -1 +1 @@ -export default ['{{person.last_name}}{{address.street_suffix}}']; +export default ['{{person.last_name}}{{location.street_suffix}}']; diff --git a/src/locales/zh_CN/location/street_address.ts b/src/locales/zh_CN/location/street_address.ts index 6430ef1c785..28061915242 100644 --- a/src/locales/zh_CN/location/street_address.ts +++ b/src/locales/zh_CN/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}}{{address.buildingNumber}}号', - full: '{{address.street}}{{address.buildingNumber}}号 {{address.secondaryAddress}}', + normal: '{{location.street}}{{location.buildingNumber}}号', + full: '{{location.street}}{{location.buildingNumber}}号 {{location.secondaryAddress}}', }; diff --git a/src/locales/zh_TW/location/city.ts b/src/locales/zh_TW/location/city.ts index b53f9163cf5..aa67dfa8896 100644 --- a/src/locales/zh_TW/location/city.ts +++ b/src/locales/zh_TW/location/city.ts @@ -1 +1 @@ -export default ['{{address.city_prefix}}{{address.city_suffix}}']; +export default ['{{location.city_prefix}}{{location.city_suffix}}']; diff --git a/src/locales/zh_TW/location/street.ts b/src/locales/zh_TW/location/street.ts index 6522d790e53..dfaaaa6e3c0 100644 --- a/src/locales/zh_TW/location/street.ts +++ b/src/locales/zh_TW/location/street.ts @@ -1 +1 @@ -export default ['{{person.last_name}}{{address.street_suffix}}']; +export default ['{{person.last_name}}{{location.street_suffix}}']; diff --git a/src/locales/zh_TW/location/street_address.ts b/src/locales/zh_TW/location/street_address.ts index 665870ba775..f808e3d9821 100644 --- a/src/locales/zh_TW/location/street_address.ts +++ b/src/locales/zh_TW/location/street_address.ts @@ -1,4 +1,4 @@ export default { - normal: '{{address.street}}{{address.buildingNumber}}號', - full: '{{address.street}}{{address.buildingNumber}}號 {{address.secondaryAddress}}', + normal: '{{location.street}}{{location.buildingNumber}}號', + full: '{{location.street}}{{location.buildingNumber}}號 {{location.secondaryAddress}}', }; diff --git a/src/locales/zu_ZA/location/city.ts b/src/locales/zu_ZA/location/city.ts index ea6ea950e46..7375aa8378a 100644 --- a/src/locales/zu_ZA/location/city.ts +++ b/src/locales/zu_ZA/location/city.ts @@ -1,6 +1,6 @@ export default [ - '{{address.city_prefix}} {{person.firstName}}{{address.city_suffix}}', - '{{address.city_prefix}} {{person.firstName}}', - '{{person.firstName}}{{address.city_suffix}}', - '{{person.lastName}}{{address.city_suffix}}', + '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}', + '{{location.city_prefix}} {{person.firstName}}', + '{{person.firstName}}{{location.city_suffix}}', + '{{person.lastName}}{{location.city_suffix}}', ]; diff --git a/src/locales/zu_ZA/location/street.ts b/src/locales/zu_ZA/location/street.ts index f7dd9d3b3aa..af32d0c4248 100644 --- a/src/locales/zu_ZA/location/street.ts +++ b/src/locales/zu_ZA/location/street.ts @@ -1,4 +1,4 @@ export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', ]; diff --git a/test/all_functional.spec.ts b/test/all_functional.spec.ts index c5615f309a9..0d630d47a6d 100644 --- a/test/all_functional.spec.ts +++ b/test/all_functional.spec.ts @@ -21,15 +21,15 @@ function isMethodOf(mod: string) { const BROKEN_LOCALE_METHODS = { // TODO ST-DDT 2022-03-28: these are TODOs (usually broken locale files) - address: { + company: { + companySuffix: ['az'], + }, + location: { cityPrefix: ['pt_BR', 'pt_PT'], citySuffix: ['pt_PT'], state: ['az', 'cz', 'nb_NO', 'sk'], stateAbbr: ['cz', 'sk'], }, - company: { - companySuffix: ['az'], - }, person: { prefix: ['az', 'id_ID', 'ru'], suffix: ['az', 'it', 'mk', 'pt_PT', 'ru'], @@ -38,6 +38,8 @@ const BROKEN_LOCALE_METHODS = { // @ts-expect-error: ignore also the aliases BROKEN_LOCALE_METHODS.name = BROKEN_LOCALE_METHODS.person; +// @ts-expect-error: ignore also the aliases +BROKEN_LOCALE_METHODS.address = BROKEN_LOCALE_METHODS.location; function isWorkingLocaleForMethod( mod: string,