From 52945c958c66a266cb0bbd7b7d49ccb6816ec64f Mon Sep 17 00:00:00 2001 From: Shinigami92 Date: Sat, 15 Apr 2023 17:45:56 +0200 Subject: [PATCH 1/4] refactor(location): street --- src/definitions/location.ts | 2 +- src/locales/af_ZA/location/index.ts | 4 ++-- .../af_ZA/location/{street.ts => street_pattern.ts} | 0 src/locales/ar/location/index.ts | 4 ++-- .../ar/location/{street.ts => street_pattern.ts} | 0 src/locales/az/location/index.ts | 4 ++-- .../az/location/{street.ts => street_pattern.ts} | 0 src/locales/cs_CZ/location/index.ts | 4 ++-- .../cs_CZ/location/{street.ts => street_pattern.ts} | 0 src/locales/de/location/index.ts | 4 ++-- .../de/location/{street.ts => street_pattern.ts} | 0 src/locales/de_AT/location/index.ts | 4 ++-- .../de_AT/location/{street.ts => street_pattern.ts} | 0 src/locales/de_CH/location/index.ts | 4 ++-- .../de_CH/location/{street.ts => street_pattern.ts} | 0 src/locales/dv/location/index.ts | 4 ++-- .../dv/location/{street.ts => street_pattern.ts} | 0 src/locales/el/location/index.ts | 4 ++-- .../el/location/{street.ts => street_pattern.ts} | 0 src/locales/en/location/index.ts | 4 ++-- .../en/location/{street.ts => street_pattern.ts} | 0 src/locales/en_AU/location/index.ts | 4 ++-- .../en_AU/location/{street.ts => street_pattern.ts} | 0 src/locales/en_AU_ocker/location/index.ts | 4 ++-- .../location/{street.ts => street_pattern.ts} | 0 src/locales/en_CA/location/index.ts | 4 ++-- .../en_CA/location/{street.ts => street_pattern.ts} | 0 src/locales/en_GB/location/index.ts | 4 ++-- .../en_GB/location/{street.ts => street_pattern.ts} | 0 src/locales/en_GH/location/index.ts | 4 ++-- .../en_GH/location/{street.ts => street_pattern.ts} | 0 src/locales/en_IE/location/index.ts | 4 ++-- .../en_IE/location/{street.ts => street_pattern.ts} | 0 src/locales/en_IN/location/index.ts | 4 ++-- .../en_IN/location/{street.ts => street_pattern.ts} | 0 src/locales/en_NG/location/index.ts | 4 ++-- .../en_NG/location/{street.ts => street_pattern.ts} | 0 src/locales/en_US/location/index.ts | 4 ++-- .../en_US/location/{street.ts => street_pattern.ts} | 0 src/locales/en_ZA/location/index.ts | 4 ++-- .../en_ZA/location/{street.ts => street_pattern.ts} | 0 src/locales/es/location/index.ts | 4 ++-- .../es/location/{street.ts => street_pattern.ts} | 0 src/locales/es_MX/location/index.ts | 4 ++-- .../es_MX/location/{street.ts => street_pattern.ts} | 0 src/locales/fa/location/index.ts | 4 ++-- .../fa/location/{street.ts => street_pattern.ts} | 0 src/locales/fr/location/index.ts | 4 ++-- .../fr/location/{street.ts => street_pattern.ts} | 0 src/locales/fr_BE/location/index.ts | 4 ++-- .../fr_BE/location/{street.ts => street_pattern.ts} | 0 src/locales/fr_CA/location/index.ts | 4 ++-- .../fr_CA/location/{street.ts => street_pattern.ts} | 0 src/locales/fr_CH/location/index.ts | 4 ++-- .../fr_CH/location/{street.ts => street_pattern.ts} | 0 src/locales/he/location/index.ts | 4 ++-- .../he/location/{street.ts => street_pattern.ts} | 0 src/locales/hr/location/index.ts | 4 ++-- .../hr/location/{street.ts => street_pattern.ts} | 0 src/locales/hy/location/index.ts | 4 ++-- .../hy/location/{street.ts => street_pattern.ts} | 0 src/locales/id_ID/location/index.ts | 4 ++-- .../id_ID/location/{street.ts => street_pattern.ts} | 0 src/locales/it/location/index.ts | 4 ++-- .../it/location/{street.ts => street_pattern.ts} | 0 src/locales/ja/location/index.ts | 4 ++-- .../ja/location/{street.ts => street_pattern.ts} | 0 src/locales/ka_GE/location/index.ts | 4 ++-- .../ka_GE/location/{street.ts => street_pattern.ts} | 0 src/locales/ko/location/index.ts | 4 ++-- .../ko/location/{street.ts => street_pattern.ts} | 0 src/locales/lv/location/index.ts | 4 ++-- .../lv/location/{street.ts => street_pattern.ts} | 0 src/locales/mk/location/index.ts | 4 ++-- .../mk/location/{street.ts => street_pattern.ts} | 0 src/locales/nb_NO/location/index.ts | 4 ++-- .../nb_NO/location/{street.ts => street_pattern.ts} | 0 src/locales/ne/location/index.ts | 4 ++-- .../ne/location/{street.ts => street_pattern.ts} | 0 src/locales/nl/location/index.ts | 4 ++-- .../nl/location/{street.ts => street_pattern.ts} | 0 src/locales/nl_BE/location/index.ts | 4 ++-- .../nl_BE/location/{street.ts => street_pattern.ts} | 0 src/locales/pl/location/index.ts | 4 ++-- .../pl/location/{street.ts => street_pattern.ts} | 0 src/locales/pt_BR/location/index.ts | 4 ++-- .../pt_BR/location/{street.ts => street_pattern.ts} | 0 src/locales/pt_PT/location/index.ts | 4 ++-- .../pt_PT/location/{street.ts => street_pattern.ts} | 0 src/locales/ro/location/index.ts | 4 ++-- .../ro/location/{street.ts => street_pattern.ts} | 0 src/locales/ru/location/index.ts | 4 ++-- .../ru/location/{street.ts => street_pattern.ts} | 0 src/locales/sk/location/index.ts | 4 ++-- .../sk/location/{street.ts => street_pattern.ts} | 0 src/locales/sr_RS_latin/location/index.ts | 4 ++-- .../location/{street.ts => street_pattern.ts} | 0 src/locales/sv/location/index.ts | 4 ++-- .../sv/location/{street.ts => street_pattern.ts} | 0 src/locales/th/location/index.ts | 2 ++ .../street.ts => th/location/street_pattern.ts} | 0 src/locales/tr/location/index.ts | 4 ++-- src/locales/tr/location/street_pattern.ts | 1 + src/locales/uk/location/index.ts | 4 ++-- .../uk/location/{street.ts => street_pattern.ts} | 0 src/locales/ur/location/index.ts | 4 ++-- .../ur/location/{street.ts => street_pattern.ts} | 0 src/locales/vi/location/index.ts | 4 ++-- .../vi/location/{street.ts => street_pattern.ts} | 0 src/locales/zh_CN/location/index.ts | 4 ++-- .../zh_CN/location/{street.ts => street_pattern.ts} | 0 src/locales/zh_TW/location/index.ts | 4 ++-- .../zh_TW/location/{street.ts => street_pattern.ts} | 0 src/locales/zu_ZA/location/index.ts | 4 ++-- .../zu_ZA/location/{street.ts => street_pattern.ts} | 0 src/modules/location/index.ts | 12 +++++++++++- 116 files changed, 127 insertions(+), 114 deletions(-) rename src/locales/af_ZA/location/{street.ts => street_pattern.ts} (100%) rename src/locales/ar/location/{street.ts => street_pattern.ts} (100%) rename src/locales/az/location/{street.ts => street_pattern.ts} (100%) rename src/locales/cs_CZ/location/{street.ts => street_pattern.ts} (100%) rename src/locales/de/location/{street.ts => street_pattern.ts} (100%) rename src/locales/de_AT/location/{street.ts => street_pattern.ts} (100%) rename src/locales/de_CH/location/{street.ts => street_pattern.ts} (100%) rename src/locales/dv/location/{street.ts => street_pattern.ts} (100%) rename src/locales/el/location/{street.ts => street_pattern.ts} (100%) rename src/locales/en/location/{street.ts => street_pattern.ts} (100%) rename src/locales/en_AU/location/{street.ts => street_pattern.ts} (100%) rename src/locales/en_AU_ocker/location/{street.ts => street_pattern.ts} (100%) rename src/locales/en_CA/location/{street.ts => street_pattern.ts} (100%) rename src/locales/en_GB/location/{street.ts => street_pattern.ts} (100%) rename src/locales/en_GH/location/{street.ts => street_pattern.ts} (100%) rename src/locales/en_IE/location/{street.ts => street_pattern.ts} (100%) rename src/locales/en_IN/location/{street.ts => street_pattern.ts} (100%) rename src/locales/en_NG/location/{street.ts => street_pattern.ts} (100%) rename src/locales/en_US/location/{street.ts => street_pattern.ts} (100%) rename src/locales/en_ZA/location/{street.ts => street_pattern.ts} (100%) rename src/locales/es/location/{street.ts => street_pattern.ts} (100%) rename src/locales/es_MX/location/{street.ts => street_pattern.ts} (100%) rename src/locales/fa/location/{street.ts => street_pattern.ts} (100%) rename src/locales/fr/location/{street.ts => street_pattern.ts} (100%) rename src/locales/fr_BE/location/{street.ts => street_pattern.ts} (100%) rename src/locales/fr_CA/location/{street.ts => street_pattern.ts} (100%) rename src/locales/fr_CH/location/{street.ts => street_pattern.ts} (100%) rename src/locales/he/location/{street.ts => street_pattern.ts} (100%) rename src/locales/hr/location/{street.ts => street_pattern.ts} (100%) rename src/locales/hy/location/{street.ts => street_pattern.ts} (100%) rename src/locales/id_ID/location/{street.ts => street_pattern.ts} (100%) rename src/locales/it/location/{street.ts => street_pattern.ts} (100%) rename src/locales/ja/location/{street.ts => street_pattern.ts} (100%) rename src/locales/ka_GE/location/{street.ts => street_pattern.ts} (100%) rename src/locales/ko/location/{street.ts => street_pattern.ts} (100%) rename src/locales/lv/location/{street.ts => street_pattern.ts} (100%) rename src/locales/mk/location/{street.ts => street_pattern.ts} (100%) rename src/locales/nb_NO/location/{street.ts => street_pattern.ts} (100%) rename src/locales/ne/location/{street.ts => street_pattern.ts} (100%) rename src/locales/nl/location/{street.ts => street_pattern.ts} (100%) rename src/locales/nl_BE/location/{street.ts => street_pattern.ts} (100%) rename src/locales/pl/location/{street.ts => street_pattern.ts} (100%) rename src/locales/pt_BR/location/{street.ts => street_pattern.ts} (100%) rename src/locales/pt_PT/location/{street.ts => street_pattern.ts} (100%) rename src/locales/ro/location/{street.ts => street_pattern.ts} (100%) rename src/locales/ru/location/{street.ts => street_pattern.ts} (100%) rename src/locales/sk/location/{street.ts => street_pattern.ts} (100%) rename src/locales/sr_RS_latin/location/{street.ts => street_pattern.ts} (100%) rename src/locales/sv/location/{street.ts => street_pattern.ts} (100%) rename src/locales/{tr/location/street.ts => th/location/street_pattern.ts} (100%) create mode 100644 src/locales/tr/location/street_pattern.ts rename src/locales/uk/location/{street.ts => street_pattern.ts} (100%) rename src/locales/ur/location/{street.ts => street_pattern.ts} (100%) rename src/locales/vi/location/{street.ts => street_pattern.ts} (100%) rename src/locales/zh_CN/location/{street.ts => street_pattern.ts} (100%) rename src/locales/zh_TW/location/{street.ts => street_pattern.ts} (100%) rename src/locales/zu_ZA/location/{street.ts => street_pattern.ts} (100%) diff --git a/src/definitions/location.ts b/src/definitions/location.ts index 6987327dbac..7e2403aa39c 100644 --- a/src/definitions/location.ts +++ b/src/definitions/location.ts @@ -79,7 +79,7 @@ export type LocationDefinitions = LocaleEntry<{ /** * The patterns to generate street names. */ - street: string[]; + street_pattern: string[]; /** * The names of actual streets. diff --git a/src/locales/af_ZA/location/index.ts b/src/locales/af_ZA/location/index.ts index b34a7a06b0c..5c4d4277a59 100644 --- a/src/locales/af_ZA/location/index.ts +++ b/src/locales/af_ZA/location/index.ts @@ -7,14 +7,14 @@ import city from './city'; import default_country from './default_country'; import postcode from './postcode'; import state from './state'; -import street from './street'; +import street_pattern from './street_pattern'; const location: LocationDefinitions = { city, default_country, postcode, state, - street, + street_pattern, }; export default location; diff --git a/src/locales/af_ZA/location/street.ts b/src/locales/af_ZA/location/street_pattern.ts similarity index 100% rename from src/locales/af_ZA/location/street.ts rename to src/locales/af_ZA/location/street_pattern.ts diff --git a/src/locales/ar/location/index.ts b/src/locales/ar/location/index.ts index c24a8ac58c3..80517bb2277 100644 --- a/src/locales/ar/location/index.ts +++ b/src/locales/ar/location/index.ts @@ -11,8 +11,8 @@ import default_country from './default_country'; import postcode from './postcode'; import secondary_address from './secondary_address'; import state from './state'; -import street from './street'; import street_address from './street_address'; +import street_pattern from './street_pattern'; import street_prefix from './street_prefix'; const location: LocationDefinitions = { @@ -24,8 +24,8 @@ const location: LocationDefinitions = { postcode, secondary_address, state, - street, street_address, + street_pattern, street_prefix, }; diff --git a/src/locales/ar/location/street.ts b/src/locales/ar/location/street_pattern.ts similarity index 100% rename from src/locales/ar/location/street.ts rename to src/locales/ar/location/street_pattern.ts diff --git a/src/locales/az/location/index.ts b/src/locales/az/location/index.ts index b28b0dfbfb3..c7940e2a076 100644 --- a/src/locales/az/location/index.ts +++ b/src/locales/az/location/index.ts @@ -11,9 +11,9 @@ import default_country from './default_country'; import postcode from './postcode'; import secondary_address from './secondary_address'; import state from './state'; -import street from './street'; import street_address from './street_address'; import street_name from './street_name'; +import street_pattern from './street_pattern'; import street_suffix from './street_suffix'; const location: LocationDefinitions = { @@ -25,9 +25,9 @@ const location: LocationDefinitions = { postcode, secondary_address, state, - street, street_address, street_name, + street_pattern, street_suffix, }; diff --git a/src/locales/az/location/street.ts b/src/locales/az/location/street_pattern.ts similarity index 100% rename from src/locales/az/location/street.ts rename to src/locales/az/location/street_pattern.ts diff --git a/src/locales/cs_CZ/location/index.ts b/src/locales/cs_CZ/location/index.ts index 7dd25913a27..f519be9bca5 100644 --- a/src/locales/cs_CZ/location/index.ts +++ b/src/locales/cs_CZ/location/index.ts @@ -12,9 +12,9 @@ import postcode from './postcode'; import secondary_address from './secondary_address'; import state from './state'; import state_abbr from './state_abbr'; -import street from './street'; import street_address from './street_address'; import street_name from './street_name'; +import street_pattern from './street_pattern'; const location: LocationDefinitions = { building_number, @@ -26,9 +26,9 @@ const location: LocationDefinitions = { secondary_address, state, state_abbr, - street, street_address, street_name, + street_pattern, }; export default location; diff --git a/src/locales/cs_CZ/location/street.ts b/src/locales/cs_CZ/location/street_pattern.ts similarity index 100% rename from src/locales/cs_CZ/location/street.ts rename to src/locales/cs_CZ/location/street_pattern.ts diff --git a/src/locales/de/location/index.ts b/src/locales/de/location/index.ts index 93f5515ec57..73024bf21c5 100644 --- a/src/locales/de/location/index.ts +++ b/src/locales/de/location/index.ts @@ -14,9 +14,9 @@ import postcode from './postcode'; import secondary_address from './secondary_address'; import state from './state'; import state_abbr from './state_abbr'; -import street from './street'; import street_address from './street_address'; import street_name from './street_name'; +import street_pattern from './street_pattern'; const location: LocationDefinitions = { building_number, @@ -30,9 +30,9 @@ const location: LocationDefinitions = { secondary_address, state, state_abbr, - street, street_address, street_name, + street_pattern, }; export default location; diff --git a/src/locales/de/location/street.ts b/src/locales/de/location/street_pattern.ts similarity index 100% rename from src/locales/de/location/street.ts rename to src/locales/de/location/street_pattern.ts diff --git a/src/locales/de_AT/location/index.ts b/src/locales/de_AT/location/index.ts index 7dd25913a27..f519be9bca5 100644 --- a/src/locales/de_AT/location/index.ts +++ b/src/locales/de_AT/location/index.ts @@ -12,9 +12,9 @@ import postcode from './postcode'; import secondary_address from './secondary_address'; import state from './state'; import state_abbr from './state_abbr'; -import street from './street'; import street_address from './street_address'; import street_name from './street_name'; +import street_pattern from './street_pattern'; const location: LocationDefinitions = { building_number, @@ -26,9 +26,9 @@ const location: LocationDefinitions = { secondary_address, state, state_abbr, - street, street_address, street_name, + street_pattern, }; export default location; diff --git a/src/locales/de_AT/location/street.ts b/src/locales/de_AT/location/street_pattern.ts similarity index 100% rename from src/locales/de_AT/location/street.ts rename to src/locales/de_AT/location/street_pattern.ts diff --git a/src/locales/de_CH/location/index.ts b/src/locales/de_CH/location/index.ts index 02cfc8da023..1f624f34ab0 100644 --- a/src/locales/de_CH/location/index.ts +++ b/src/locales/de_CH/location/index.ts @@ -10,8 +10,8 @@ import default_country from './default_country'; import postcode from './postcode'; import state from './state'; import state_abbr from './state_abbr'; -import street from './street'; import street_name from './street_name'; +import street_pattern from './street_pattern'; const location: LocationDefinitions = { city, @@ -21,8 +21,8 @@ const location: LocationDefinitions = { postcode, state, state_abbr, - street, street_name, + street_pattern, }; export default location; diff --git a/src/locales/de_CH/location/street.ts b/src/locales/de_CH/location/street_pattern.ts similarity index 100% rename from src/locales/de_CH/location/street.ts rename to src/locales/de_CH/location/street_pattern.ts diff --git a/src/locales/dv/location/index.ts b/src/locales/dv/location/index.ts index d022fc52ee8..8b722ee3bfb 100644 --- a/src/locales/dv/location/index.ts +++ b/src/locales/dv/location/index.ts @@ -9,7 +9,7 @@ import city_prefix from './city_prefix'; import city_suffix from './city_suffix'; import default_country from './default_country'; import postcode from './postcode'; -import street from './street'; +import street_pattern from './street_pattern'; import street_suffix from './street_suffix'; const location: LocationDefinitions = { @@ -19,7 +19,7 @@ const location: LocationDefinitions = { city_suffix, default_country, postcode, - street, + street_pattern, street_suffix, }; diff --git a/src/locales/dv/location/street.ts b/src/locales/dv/location/street_pattern.ts similarity index 100% rename from src/locales/dv/location/street.ts rename to src/locales/dv/location/street_pattern.ts diff --git a/src/locales/el/location/index.ts b/src/locales/el/location/index.ts index 8db1a9fb8d0..e9bd80bfba0 100644 --- a/src/locales/el/location/index.ts +++ b/src/locales/el/location/index.ts @@ -6,13 +6,13 @@ import type { LocationDefinitions } from '../../..'; import city from './city'; import county from './county'; import default_country from './default_country'; -import street from './street'; +import street_pattern from './street_pattern'; const location: LocationDefinitions = { city, county, default_country, - street, + street_pattern, }; export default location; diff --git a/src/locales/el/location/street.ts b/src/locales/el/location/street_pattern.ts similarity index 100% rename from src/locales/el/location/street.ts rename to src/locales/el/location/street_pattern.ts diff --git a/src/locales/en/location/index.ts b/src/locales/en/location/index.ts index 397bee86628..06406c63c04 100644 --- a/src/locales/en/location/index.ts +++ b/src/locales/en/location/index.ts @@ -17,8 +17,8 @@ import postcode from './postcode'; import secondary_address from './secondary_address'; import state from './state'; import state_abbr from './state_abbr'; -import street from './street'; import street_address from './street_address'; +import street_pattern from './street_pattern'; import street_suffix from './street_suffix'; const location: LocationDefinitions = { @@ -36,8 +36,8 @@ const location: LocationDefinitions = { secondary_address, state, state_abbr, - street, street_address, + street_pattern, street_suffix, }; diff --git a/src/locales/en/location/street.ts b/src/locales/en/location/street_pattern.ts similarity index 100% rename from src/locales/en/location/street.ts rename to src/locales/en/location/street_pattern.ts diff --git a/src/locales/en_AU/location/index.ts b/src/locales/en_AU/location/index.ts index 35b03195f4d..4e2d8a67607 100644 --- a/src/locales/en_AU/location/index.ts +++ b/src/locales/en_AU/location/index.ts @@ -9,7 +9,7 @@ import default_country from './default_country'; import postcode from './postcode'; import state from './state'; import state_abbr from './state_abbr'; -import street from './street'; +import street_pattern from './street_pattern'; import street_suffix from './street_suffix'; const location: LocationDefinitions = { @@ -19,7 +19,7 @@ const location: LocationDefinitions = { postcode, state, state_abbr, - street, + street_pattern, street_suffix, }; diff --git a/src/locales/en_AU/location/street.ts b/src/locales/en_AU/location/street_pattern.ts similarity index 100% rename from src/locales/en_AU/location/street.ts rename to src/locales/en_AU/location/street_pattern.ts diff --git a/src/locales/en_AU_ocker/location/index.ts b/src/locales/en_AU_ocker/location/index.ts index 1699c653eda..7660613e08e 100644 --- a/src/locales/en_AU_ocker/location/index.ts +++ b/src/locales/en_AU_ocker/location/index.ts @@ -11,8 +11,8 @@ import postcode from './postcode'; import region from './region'; import state from './state'; import state_abbr from './state_abbr'; -import street from './street'; import street_name from './street_name'; +import street_pattern from './street_pattern'; import street_suffix from './street_suffix'; const location: LocationDefinitions = { @@ -24,8 +24,8 @@ const location: LocationDefinitions = { region, state, state_abbr, - street, street_name, + street_pattern, street_suffix, }; diff --git a/src/locales/en_AU_ocker/location/street.ts b/src/locales/en_AU_ocker/location/street_pattern.ts similarity index 100% rename from src/locales/en_AU_ocker/location/street.ts rename to src/locales/en_AU_ocker/location/street_pattern.ts diff --git a/src/locales/en_CA/location/index.ts b/src/locales/en_CA/location/index.ts index 840bad876b8..05bfd853d02 100644 --- a/src/locales/en_CA/location/index.ts +++ b/src/locales/en_CA/location/index.ts @@ -9,7 +9,7 @@ import default_country from './default_country'; import postcode from './postcode'; import state from './state'; import state_abbr from './state_abbr'; -import street from './street'; +import street_pattern from './street_pattern'; const location: LocationDefinitions = { city, @@ -18,7 +18,7 @@ const location: LocationDefinitions = { postcode, state, state_abbr, - street, + street_pattern, }; export default location; diff --git a/src/locales/en_CA/location/street.ts b/src/locales/en_CA/location/street_pattern.ts similarity index 100% rename from src/locales/en_CA/location/street.ts rename to src/locales/en_CA/location/street_pattern.ts diff --git a/src/locales/en_GB/location/index.ts b/src/locales/en_GB/location/index.ts index a4c8822b40e..29e876985e3 100644 --- a/src/locales/en_GB/location/index.ts +++ b/src/locales/en_GB/location/index.ts @@ -12,7 +12,7 @@ import county from './county'; import default_country from './default_country'; import postcode from './postcode'; import state from './state'; -import street from './street'; +import street_pattern from './street_pattern'; import street_suffix from './street_suffix'; const location: LocationDefinitions = { @@ -25,7 +25,7 @@ const location: LocationDefinitions = { default_country, postcode, state, - street, + street_pattern, street_suffix, }; diff --git a/src/locales/en_GB/location/street.ts b/src/locales/en_GB/location/street_pattern.ts similarity index 100% rename from src/locales/en_GB/location/street.ts rename to src/locales/en_GB/location/street_pattern.ts diff --git a/src/locales/en_GH/location/index.ts b/src/locales/en_GH/location/index.ts index 32b659ebedc..98d17a79a19 100644 --- a/src/locales/en_GH/location/index.ts +++ b/src/locales/en_GH/location/index.ts @@ -9,8 +9,8 @@ import city_name from './city_name'; import default_country from './default_country'; import postcode from './postcode'; import state from './state'; -import street from './street'; import street_address from './street_address'; +import street_pattern from './street_pattern'; import street_prefix from './street_prefix'; import street_suffix from './street_suffix'; @@ -21,8 +21,8 @@ const location: LocationDefinitions = { default_country, postcode, state, - street, street_address, + street_pattern, street_prefix, street_suffix, }; diff --git a/src/locales/en_GH/location/street.ts b/src/locales/en_GH/location/street_pattern.ts similarity index 100% rename from src/locales/en_GH/location/street.ts rename to src/locales/en_GH/location/street_pattern.ts diff --git a/src/locales/en_IE/location/index.ts b/src/locales/en_IE/location/index.ts index 8db1a9fb8d0..e9bd80bfba0 100644 --- a/src/locales/en_IE/location/index.ts +++ b/src/locales/en_IE/location/index.ts @@ -6,13 +6,13 @@ import type { LocationDefinitions } from '../../..'; import city from './city'; import county from './county'; import default_country from './default_country'; -import street from './street'; +import street_pattern from './street_pattern'; const location: LocationDefinitions = { city, county, default_country, - street, + street_pattern, }; export default location; diff --git a/src/locales/en_IE/location/street.ts b/src/locales/en_IE/location/street_pattern.ts similarity index 100% rename from src/locales/en_IE/location/street.ts rename to src/locales/en_IE/location/street_pattern.ts diff --git a/src/locales/en_IN/location/index.ts b/src/locales/en_IN/location/index.ts index 840bad876b8..05bfd853d02 100644 --- a/src/locales/en_IN/location/index.ts +++ b/src/locales/en_IN/location/index.ts @@ -9,7 +9,7 @@ import default_country from './default_country'; import postcode from './postcode'; import state from './state'; import state_abbr from './state_abbr'; -import street from './street'; +import street_pattern from './street_pattern'; const location: LocationDefinitions = { city, @@ -18,7 +18,7 @@ const location: LocationDefinitions = { postcode, state, state_abbr, - street, + street_pattern, }; export default location; diff --git a/src/locales/en_IN/location/street.ts b/src/locales/en_IN/location/street_pattern.ts similarity index 100% rename from src/locales/en_IN/location/street.ts rename to src/locales/en_IN/location/street_pattern.ts diff --git a/src/locales/en_NG/location/index.ts b/src/locales/en_NG/location/index.ts index 2c76e5915ea..58310282075 100644 --- a/src/locales/en_NG/location/index.ts +++ b/src/locales/en_NG/location/index.ts @@ -8,7 +8,7 @@ import city_prefix from './city_prefix'; import default_country from './default_country'; import postcode from './postcode'; import state from './state'; -import street from './street'; +import street_pattern from './street_pattern'; const location: LocationDefinitions = { city, @@ -16,7 +16,7 @@ const location: LocationDefinitions = { default_country, postcode, state, - street, + street_pattern, }; export default location; diff --git a/src/locales/en_NG/location/street.ts b/src/locales/en_NG/location/street_pattern.ts similarity index 100% rename from src/locales/en_NG/location/street.ts rename to src/locales/en_NG/location/street_pattern.ts diff --git a/src/locales/en_US/location/index.ts b/src/locales/en_US/location/index.ts index d2e817abe24..7f98dae9836 100644 --- a/src/locales/en_US/location/index.ts +++ b/src/locales/en_US/location/index.ts @@ -7,14 +7,14 @@ import city from './city'; import county from './county'; import default_country from './default_country'; import postcode_by_state from './postcode_by_state'; -import street from './street'; +import street_pattern from './street_pattern'; const location: LocationDefinitions = { city, county, default_country, postcode_by_state, - street, + street_pattern, }; export default location; diff --git a/src/locales/en_US/location/street.ts b/src/locales/en_US/location/street_pattern.ts similarity index 100% rename from src/locales/en_US/location/street.ts rename to src/locales/en_US/location/street_pattern.ts diff --git a/src/locales/en_ZA/location/index.ts b/src/locales/en_ZA/location/index.ts index 2c76e5915ea..58310282075 100644 --- a/src/locales/en_ZA/location/index.ts +++ b/src/locales/en_ZA/location/index.ts @@ -8,7 +8,7 @@ import city_prefix from './city_prefix'; import default_country from './default_country'; import postcode from './postcode'; import state from './state'; -import street from './street'; +import street_pattern from './street_pattern'; const location: LocationDefinitions = { city, @@ -16,7 +16,7 @@ const location: LocationDefinitions = { default_country, postcode, state, - street, + street_pattern, }; export default location; diff --git a/src/locales/en_ZA/location/street.ts b/src/locales/en_ZA/location/street_pattern.ts similarity index 100% rename from src/locales/en_ZA/location/street.ts rename to src/locales/en_ZA/location/street_pattern.ts diff --git a/src/locales/es/location/index.ts b/src/locales/es/location/index.ts index a2e96b31a47..459c2dca2e6 100644 --- a/src/locales/es/location/index.ts +++ b/src/locales/es/location/index.ts @@ -13,8 +13,8 @@ import province from './province'; import secondary_address from './secondary_address'; import state from './state'; import state_abbr from './state_abbr'; -import street from './street'; import street_address from './street_address'; +import street_pattern from './street_pattern'; import street_suffix from './street_suffix'; const location: LocationDefinitions = { @@ -28,8 +28,8 @@ const location: LocationDefinitions = { secondary_address, state, state_abbr, - street, street_address, + street_pattern, street_suffix, }; diff --git a/src/locales/es/location/street.ts b/src/locales/es/location/street_pattern.ts similarity index 100% rename from src/locales/es/location/street.ts rename to src/locales/es/location/street_pattern.ts diff --git a/src/locales/es_MX/location/index.ts b/src/locales/es_MX/location/index.ts index b7646887fd4..38a55583fe1 100644 --- a/src/locales/es_MX/location/index.ts +++ b/src/locales/es_MX/location/index.ts @@ -13,9 +13,9 @@ import postcode from './postcode'; import secondary_address from './secondary_address'; import state from './state'; import state_abbr from './state_abbr'; -import street from './street'; import street_address from './street_address'; import street_name from './street_name'; +import street_pattern from './street_pattern'; import street_suffix from './street_suffix'; const location: LocationDefinitions = { @@ -29,9 +29,9 @@ const location: LocationDefinitions = { secondary_address, state, state_abbr, - street, street_address, street_name, + street_pattern, street_suffix, }; diff --git a/src/locales/es_MX/location/street.ts b/src/locales/es_MX/location/street_pattern.ts similarity index 100% rename from src/locales/es_MX/location/street.ts rename to src/locales/es_MX/location/street_pattern.ts diff --git a/src/locales/fa/location/index.ts b/src/locales/fa/location/index.ts index 9b50f3a0385..543c2da02d8 100644 --- a/src/locales/fa/location/index.ts +++ b/src/locales/fa/location/index.ts @@ -14,8 +14,8 @@ import direction from './direction'; import postcode from './postcode'; import secondary_address from './secondary_address'; import state from './state'; -import street from './street'; import street_address from './street_address'; +import street_pattern from './street_pattern'; import street_prefix from './street_prefix'; import street_suffix from './street_suffix'; @@ -31,8 +31,8 @@ const location: LocationDefinitions = { postcode, secondary_address, state, - street, street_address, + street_pattern, street_prefix, street_suffix, }; diff --git a/src/locales/fa/location/street.ts b/src/locales/fa/location/street_pattern.ts similarity index 100% rename from src/locales/fa/location/street.ts rename to src/locales/fa/location/street_pattern.ts diff --git a/src/locales/fr/location/index.ts b/src/locales/fr/location/index.ts index 9beb335b5c9..6e9ff89a0de 100644 --- a/src/locales/fr/location/index.ts +++ b/src/locales/fr/location/index.ts @@ -12,8 +12,8 @@ import direction from './direction'; import postcode from './postcode'; import secondary_address from './secondary_address'; import state from './state'; -import street from './street'; import street_address from './street_address'; +import street_pattern from './street_pattern'; import street_prefix from './street_prefix'; import street_suffix from './street_suffix'; @@ -27,8 +27,8 @@ const location: LocationDefinitions = { postcode, secondary_address, state, - street, street_address, + street_pattern, street_prefix, street_suffix, }; diff --git a/src/locales/fr/location/street.ts b/src/locales/fr/location/street_pattern.ts similarity index 100% rename from src/locales/fr/location/street.ts rename to src/locales/fr/location/street_pattern.ts diff --git a/src/locales/fr_BE/location/index.ts b/src/locales/fr_BE/location/index.ts index 3ce44af55d0..f465c55889f 100644 --- a/src/locales/fr_BE/location/index.ts +++ b/src/locales/fr_BE/location/index.ts @@ -11,8 +11,8 @@ import default_country from './default_country'; import postcode from './postcode'; import state from './state'; import state_abbr from './state_abbr'; -import street from './street'; import street_address from './street_address'; +import street_pattern from './street_pattern'; import street_prefix from './street_prefix'; import street_suffix from './street_suffix'; @@ -25,8 +25,8 @@ const location: LocationDefinitions = { postcode, state, state_abbr, - street, street_address, + street_pattern, street_prefix, street_suffix, }; diff --git a/src/locales/fr_BE/location/street.ts b/src/locales/fr_BE/location/street_pattern.ts similarity index 100% rename from src/locales/fr_BE/location/street.ts rename to src/locales/fr_BE/location/street_pattern.ts diff --git a/src/locales/fr_CA/location/index.ts b/src/locales/fr_CA/location/index.ts index c685ad07de5..dc1d228acc6 100644 --- a/src/locales/fr_CA/location/index.ts +++ b/src/locales/fr_CA/location/index.ts @@ -8,7 +8,7 @@ import default_country from './default_country'; import postcode from './postcode'; import state from './state'; import state_abbr from './state_abbr'; -import street from './street'; +import street_pattern from './street_pattern'; const location: LocationDefinitions = { city, @@ -16,7 +16,7 @@ const location: LocationDefinitions = { postcode, state, state_abbr, - street, + street_pattern, }; export default location; diff --git a/src/locales/fr_CA/location/street.ts b/src/locales/fr_CA/location/street_pattern.ts similarity index 100% rename from src/locales/fr_CA/location/street.ts rename to src/locales/fr_CA/location/street_pattern.ts diff --git a/src/locales/fr_CH/location/index.ts b/src/locales/fr_CH/location/index.ts index fd3b57e96bd..490386bc263 100644 --- a/src/locales/fr_CH/location/index.ts +++ b/src/locales/fr_CH/location/index.ts @@ -14,8 +14,8 @@ import postcode from './postcode'; import secondary_address from './secondary_address'; import state from './state'; import state_abbr from './state_abbr'; -import street from './street'; import street_address from './street_address'; +import street_pattern from './street_pattern'; import street_prefix from './street_prefix'; import street_suffix from './street_suffix'; @@ -31,8 +31,8 @@ const location: LocationDefinitions = { secondary_address, state, state_abbr, - street, street_address, + street_pattern, street_prefix, street_suffix, }; diff --git a/src/locales/fr_CH/location/street.ts b/src/locales/fr_CH/location/street_pattern.ts similarity index 100% rename from src/locales/fr_CH/location/street.ts rename to src/locales/fr_CH/location/street_pattern.ts diff --git a/src/locales/he/location/index.ts b/src/locales/he/location/index.ts index ecad5d07256..8ee11cff379 100644 --- a/src/locales/he/location/index.ts +++ b/src/locales/he/location/index.ts @@ -15,9 +15,9 @@ import postcode from './postcode'; import secondary_address from './secondary_address'; import state from './state'; import state_abbr from './state_abbr'; -import street from './street'; import street_address from './street_address'; import street_name from './street_name'; +import street_pattern from './street_pattern'; import street_prefix from './street_prefix'; const location: LocationDefinitions = { @@ -33,9 +33,9 @@ const location: LocationDefinitions = { secondary_address, state, state_abbr, - street, street_address, street_name, + street_pattern, street_prefix, }; diff --git a/src/locales/he/location/street.ts b/src/locales/he/location/street_pattern.ts similarity index 100% rename from src/locales/he/location/street.ts rename to src/locales/he/location/street_pattern.ts diff --git a/src/locales/hr/location/index.ts b/src/locales/hr/location/index.ts index 7b286a9d3ac..220f6fea8b6 100644 --- a/src/locales/hr/location/index.ts +++ b/src/locales/hr/location/index.ts @@ -10,9 +10,9 @@ import country from './country'; import default_country from './default_country'; import postcode from './postcode'; import secondary_address from './secondary_address'; -import street from './street'; import street_address from './street_address'; import street_name from './street_name'; +import street_pattern from './street_pattern'; const location: LocationDefinitions = { building_number, @@ -22,9 +22,9 @@ const location: LocationDefinitions = { default_country, postcode, secondary_address, - street, street_address, street_name, + street_pattern, }; export default location; diff --git a/src/locales/hr/location/street.ts b/src/locales/hr/location/street_pattern.ts similarity index 100% rename from src/locales/hr/location/street.ts rename to src/locales/hr/location/street_pattern.ts diff --git a/src/locales/hy/location/index.ts b/src/locales/hy/location/index.ts index 9262f395f7d..cb874da5f1b 100644 --- a/src/locales/hy/location/index.ts +++ b/src/locales/hy/location/index.ts @@ -12,8 +12,8 @@ import default_country from './default_country'; import direction from './direction'; import secondary_address from './secondary_address'; import state from './state'; -import street from './street'; import street_address from './street_address'; +import street_pattern from './street_pattern'; import street_suffix from './street_suffix'; const location: LocationDefinitions = { @@ -26,8 +26,8 @@ const location: LocationDefinitions = { direction, secondary_address, state, - street, street_address, + street_pattern, street_suffix, }; diff --git a/src/locales/hy/location/street.ts b/src/locales/hy/location/street_pattern.ts similarity index 100% rename from src/locales/hy/location/street.ts rename to src/locales/hy/location/street_pattern.ts diff --git a/src/locales/id_ID/location/index.ts b/src/locales/id_ID/location/index.ts index a3f135fac8d..de016532dde 100644 --- a/src/locales/id_ID/location/index.ts +++ b/src/locales/id_ID/location/index.ts @@ -9,8 +9,8 @@ import city_name from './city_name'; import default_country from './default_country'; import postcode from './postcode'; import state from './state'; -import street from './street'; import street_address from './street_address'; +import street_pattern from './street_pattern'; import street_prefix from './street_prefix'; const location: LocationDefinitions = { @@ -20,8 +20,8 @@ const location: LocationDefinitions = { default_country, postcode, state, - street, street_address, + street_pattern, street_prefix, }; diff --git a/src/locales/id_ID/location/street.ts b/src/locales/id_ID/location/street_pattern.ts similarity index 100% rename from src/locales/id_ID/location/street.ts rename to src/locales/id_ID/location/street_pattern.ts diff --git a/src/locales/it/location/index.ts b/src/locales/it/location/index.ts index 2b51af88861..3a5cf17d703 100644 --- a/src/locales/it/location/index.ts +++ b/src/locales/it/location/index.ts @@ -14,8 +14,8 @@ import postcode from './postcode'; import secondary_address from './secondary_address'; import state from './state'; import state_abbr from './state_abbr'; -import street from './street'; import street_address from './street_address'; +import street_pattern from './street_pattern'; import street_suffix from './street_suffix'; const location: LocationDefinitions = { @@ -30,8 +30,8 @@ const location: LocationDefinitions = { secondary_address, state, state_abbr, - street, street_address, + street_pattern, street_suffix, }; diff --git a/src/locales/it/location/street.ts b/src/locales/it/location/street_pattern.ts similarity index 100% rename from src/locales/it/location/street.ts rename to src/locales/it/location/street_pattern.ts diff --git a/src/locales/ja/location/index.ts b/src/locales/ja/location/index.ts index 8911dd7ae04..bfa9651d5b2 100644 --- a/src/locales/ja/location/index.ts +++ b/src/locales/ja/location/index.ts @@ -10,7 +10,7 @@ import country from './country'; import postcode from './postcode'; import state from './state'; import state_abbr from './state_abbr'; -import street from './street'; +import street_pattern from './street_pattern'; const location: LocationDefinitions = { city, @@ -20,7 +20,7 @@ const location: LocationDefinitions = { postcode, state, state_abbr, - street, + street_pattern, }; export default location; diff --git a/src/locales/ja/location/street.ts b/src/locales/ja/location/street_pattern.ts similarity index 100% rename from src/locales/ja/location/street.ts rename to src/locales/ja/location/street_pattern.ts diff --git a/src/locales/ka_GE/location/index.ts b/src/locales/ka_GE/location/index.ts index 8263218507c..ebc8d0c1dca 100644 --- a/src/locales/ka_GE/location/index.ts +++ b/src/locales/ka_GE/location/index.ts @@ -12,9 +12,9 @@ import country from './country'; import default_country from './default_country'; import postcode from './postcode'; import secondary_address from './secondary_address'; -import street from './street'; import street_address from './street_address'; import street_name from './street_name'; +import street_pattern from './street_pattern'; import street_suffix from './street_suffix'; const location: LocationDefinitions = { @@ -27,9 +27,9 @@ const location: LocationDefinitions = { default_country, postcode, secondary_address, - street, street_address, street_name, + street_pattern, street_suffix, }; diff --git a/src/locales/ka_GE/location/street.ts b/src/locales/ka_GE/location/street_pattern.ts similarity index 100% rename from src/locales/ka_GE/location/street.ts rename to src/locales/ka_GE/location/street_pattern.ts diff --git a/src/locales/ko/location/index.ts b/src/locales/ko/location/index.ts index 3d3789970c1..278d9b1ee13 100644 --- a/src/locales/ko/location/index.ts +++ b/src/locales/ko/location/index.ts @@ -10,8 +10,8 @@ import postcode from './postcode'; import secondary_address from './secondary_address'; import state from './state'; import state_abbr from './state_abbr'; -import street from './street'; import street_name from './street_name'; +import street_pattern from './street_pattern'; import street_suffix from './street_suffix'; const location: LocationDefinitions = { @@ -22,8 +22,8 @@ const location: LocationDefinitions = { secondary_address, state, state_abbr, - street, street_name, + street_pattern, street_suffix, }; diff --git a/src/locales/ko/location/street.ts b/src/locales/ko/location/street_pattern.ts similarity index 100% rename from src/locales/ko/location/street.ts rename to src/locales/ko/location/street_pattern.ts diff --git a/src/locales/lv/location/index.ts b/src/locales/lv/location/index.ts index b28b0dfbfb3..c7940e2a076 100644 --- a/src/locales/lv/location/index.ts +++ b/src/locales/lv/location/index.ts @@ -11,9 +11,9 @@ import default_country from './default_country'; import postcode from './postcode'; import secondary_address from './secondary_address'; import state from './state'; -import street from './street'; import street_address from './street_address'; import street_name from './street_name'; +import street_pattern from './street_pattern'; import street_suffix from './street_suffix'; const location: LocationDefinitions = { @@ -25,9 +25,9 @@ const location: LocationDefinitions = { postcode, secondary_address, state, - street, street_address, street_name, + street_pattern, street_suffix, }; diff --git a/src/locales/lv/location/street.ts b/src/locales/lv/location/street_pattern.ts similarity index 100% rename from src/locales/lv/location/street.ts rename to src/locales/lv/location/street_pattern.ts diff --git a/src/locales/mk/location/index.ts b/src/locales/mk/location/index.ts index 7b286a9d3ac..220f6fea8b6 100644 --- a/src/locales/mk/location/index.ts +++ b/src/locales/mk/location/index.ts @@ -10,9 +10,9 @@ import country from './country'; import default_country from './default_country'; import postcode from './postcode'; import secondary_address from './secondary_address'; -import street from './street'; import street_address from './street_address'; import street_name from './street_name'; +import street_pattern from './street_pattern'; const location: LocationDefinitions = { building_number, @@ -22,9 +22,9 @@ const location: LocationDefinitions = { default_country, postcode, secondary_address, - street, street_address, street_name, + street_pattern, }; export default location; diff --git a/src/locales/mk/location/street.ts b/src/locales/mk/location/street_pattern.ts similarity index 100% rename from src/locales/mk/location/street.ts rename to src/locales/mk/location/street_pattern.ts diff --git a/src/locales/nb_NO/location/index.ts b/src/locales/nb_NO/location/index.ts index c571f6bc3ff..17255e9a3b1 100644 --- a/src/locales/nb_NO/location/index.ts +++ b/src/locales/nb_NO/location/index.ts @@ -12,9 +12,9 @@ import default_country from './default_country'; import postcode from './postcode'; import secondary_address from './secondary_address'; import state from './state'; -import street from './street'; import street_address from './street_address'; import street_name from './street_name'; +import street_pattern from './street_pattern'; import street_prefix from './street_prefix'; import street_suffix from './street_suffix'; @@ -28,9 +28,9 @@ const location: LocationDefinitions = { postcode, secondary_address, state, - street, street_address, street_name, + street_pattern, street_prefix, street_suffix, }; diff --git a/src/locales/nb_NO/location/street.ts b/src/locales/nb_NO/location/street_pattern.ts similarity index 100% rename from src/locales/nb_NO/location/street.ts rename to src/locales/nb_NO/location/street_pattern.ts diff --git a/src/locales/ne/location/index.ts b/src/locales/ne/location/index.ts index 7ca1578ad39..f732e6e374e 100644 --- a/src/locales/ne/location/index.ts +++ b/src/locales/ne/location/index.ts @@ -7,14 +7,14 @@ import city from './city'; import city_name from './city_name'; import default_country from './default_country'; import state from './state'; -import street from './street'; +import street_pattern from './street_pattern'; const location: LocationDefinitions = { city, city_name, default_country, state, - street, + street_pattern, }; export default location; diff --git a/src/locales/ne/location/street.ts b/src/locales/ne/location/street_pattern.ts similarity index 100% rename from src/locales/ne/location/street.ts rename to src/locales/ne/location/street_pattern.ts diff --git a/src/locales/nl/location/index.ts b/src/locales/nl/location/index.ts index 08afa1555b8..fd0195d2314 100644 --- a/src/locales/nl/location/index.ts +++ b/src/locales/nl/location/index.ts @@ -12,8 +12,8 @@ import default_country from './default_country'; import postcode from './postcode'; import secondary_address from './secondary_address'; import state from './state'; -import street from './street'; import street_address from './street_address'; +import street_pattern from './street_pattern'; import street_suffix from './street_suffix'; const location: LocationDefinitions = { @@ -26,8 +26,8 @@ const location: LocationDefinitions = { postcode, secondary_address, state, - street, street_address, + street_pattern, street_suffix, }; diff --git a/src/locales/nl/location/street.ts b/src/locales/nl/location/street_pattern.ts similarity index 100% rename from src/locales/nl/location/street.ts rename to src/locales/nl/location/street_pattern.ts diff --git a/src/locales/nl_BE/location/index.ts b/src/locales/nl_BE/location/index.ts index 9b3006476ab..9aefddb03c6 100644 --- a/src/locales/nl_BE/location/index.ts +++ b/src/locales/nl_BE/location/index.ts @@ -12,8 +12,8 @@ import postcode from './postcode'; import secondary_address from './secondary_address'; import state from './state'; import state_abbr from './state_abbr'; -import street from './street'; import street_address from './street_address'; +import street_pattern from './street_pattern'; import street_suffix from './street_suffix'; const location: LocationDefinitions = { @@ -26,8 +26,8 @@ const location: LocationDefinitions = { secondary_address, state, state_abbr, - street, street_address, + street_pattern, street_suffix, }; diff --git a/src/locales/nl_BE/location/street.ts b/src/locales/nl_BE/location/street_pattern.ts similarity index 100% rename from src/locales/nl_BE/location/street.ts rename to src/locales/nl_BE/location/street_pattern.ts diff --git a/src/locales/pl/location/index.ts b/src/locales/pl/location/index.ts index 1985d6e2010..870efa9baa0 100644 --- a/src/locales/pl/location/index.ts +++ b/src/locales/pl/location/index.ts @@ -14,8 +14,8 @@ import postcode from './postcode'; import secondary_address from './secondary_address'; import state from './state'; import state_abbr from './state_abbr'; -import street from './street'; import street_address from './street_address'; +import street_pattern from './street_pattern'; import street_prefix from './street_prefix'; const location: LocationDefinitions = { @@ -30,8 +30,8 @@ const location: LocationDefinitions = { secondary_address, state, state_abbr, - street, street_address, + street_pattern, street_prefix, }; diff --git a/src/locales/pl/location/street.ts b/src/locales/pl/location/street_pattern.ts similarity index 100% rename from src/locales/pl/location/street.ts rename to src/locales/pl/location/street_pattern.ts diff --git a/src/locales/pt_BR/location/index.ts b/src/locales/pt_BR/location/index.ts index b7bdee9b7ad..d886fa657bf 100644 --- a/src/locales/pt_BR/location/index.ts +++ b/src/locales/pt_BR/location/index.ts @@ -13,7 +13,7 @@ import postcode from './postcode'; import secondary_address from './secondary_address'; import state from './state'; import state_abbr from './state_abbr'; -import street from './street'; +import street_pattern from './street_pattern'; import street_suffix from './street_suffix'; const location: LocationDefinitions = { @@ -27,7 +27,7 @@ const location: LocationDefinitions = { secondary_address, state, state_abbr, - street, + street_pattern, street_suffix, }; diff --git a/src/locales/pt_BR/location/street.ts b/src/locales/pt_BR/location/street_pattern.ts similarity index 100% rename from src/locales/pt_BR/location/street.ts rename to src/locales/pt_BR/location/street_pattern.ts diff --git a/src/locales/pt_PT/location/index.ts b/src/locales/pt_PT/location/index.ts index 7c894b5caef..8182c3209a7 100644 --- a/src/locales/pt_PT/location/index.ts +++ b/src/locales/pt_PT/location/index.ts @@ -13,8 +13,8 @@ import default_country from './default_country'; import direction from './direction'; import postcode from './postcode'; import secondary_address from './secondary_address'; -import street from './street'; import street_address from './street_address'; +import street_pattern from './street_pattern'; import street_prefix from './street_prefix'; const location: LocationDefinitions = { @@ -28,8 +28,8 @@ const location: LocationDefinitions = { direction, postcode, secondary_address, - street, street_address, + street_pattern, street_prefix, }; diff --git a/src/locales/pt_PT/location/street.ts b/src/locales/pt_PT/location/street_pattern.ts similarity index 100% rename from src/locales/pt_PT/location/street.ts rename to src/locales/pt_PT/location/street_pattern.ts diff --git a/src/locales/ro/location/index.ts b/src/locales/ro/location/index.ts index bc610ff8efe..1a36f1b2293 100644 --- a/src/locales/ro/location/index.ts +++ b/src/locales/ro/location/index.ts @@ -12,9 +12,9 @@ import postcode from './postcode'; import secondary_address from './secondary_address'; import state from './state'; import state_abbr from './state_abbr'; -import street from './street'; import street_address from './street_address'; import street_name from './street_name'; +import street_pattern from './street_pattern'; import street_suffix from './street_suffix'; const location: LocationDefinitions = { @@ -27,9 +27,9 @@ const location: LocationDefinitions = { secondary_address, state, state_abbr, - street, street_address, street_name, + street_pattern, street_suffix, }; diff --git a/src/locales/ro/location/street.ts b/src/locales/ro/location/street_pattern.ts similarity index 100% rename from src/locales/ro/location/street.ts rename to src/locales/ro/location/street_pattern.ts diff --git a/src/locales/ru/location/index.ts b/src/locales/ru/location/index.ts index b28b0dfbfb3..c7940e2a076 100644 --- a/src/locales/ru/location/index.ts +++ b/src/locales/ru/location/index.ts @@ -11,9 +11,9 @@ import default_country from './default_country'; import postcode from './postcode'; import secondary_address from './secondary_address'; import state from './state'; -import street from './street'; import street_address from './street_address'; import street_name from './street_name'; +import street_pattern from './street_pattern'; import street_suffix from './street_suffix'; const location: LocationDefinitions = { @@ -25,9 +25,9 @@ const location: LocationDefinitions = { postcode, secondary_address, state, - street, street_address, street_name, + street_pattern, street_suffix, }; diff --git a/src/locales/ru/location/street.ts b/src/locales/ru/location/street_pattern.ts similarity index 100% rename from src/locales/ru/location/street.ts rename to src/locales/ru/location/street_pattern.ts diff --git a/src/locales/sk/location/index.ts b/src/locales/sk/location/index.ts index 93f5515ec57..73024bf21c5 100644 --- a/src/locales/sk/location/index.ts +++ b/src/locales/sk/location/index.ts @@ -14,9 +14,9 @@ import postcode from './postcode'; import secondary_address from './secondary_address'; import state from './state'; import state_abbr from './state_abbr'; -import street from './street'; import street_address from './street_address'; import street_name from './street_name'; +import street_pattern from './street_pattern'; const location: LocationDefinitions = { building_number, @@ -30,9 +30,9 @@ const location: LocationDefinitions = { secondary_address, state, state_abbr, - street, street_address, street_name, + street_pattern, }; export default location; diff --git a/src/locales/sk/location/street.ts b/src/locales/sk/location/street_pattern.ts similarity index 100% rename from src/locales/sk/location/street.ts rename to src/locales/sk/location/street_pattern.ts diff --git a/src/locales/sr_RS_latin/location/index.ts b/src/locales/sr_RS_latin/location/index.ts index 7b286a9d3ac..220f6fea8b6 100644 --- a/src/locales/sr_RS_latin/location/index.ts +++ b/src/locales/sr_RS_latin/location/index.ts @@ -10,9 +10,9 @@ import country from './country'; import default_country from './default_country'; import postcode from './postcode'; import secondary_address from './secondary_address'; -import street from './street'; import street_address from './street_address'; import street_name from './street_name'; +import street_pattern from './street_pattern'; const location: LocationDefinitions = { building_number, @@ -22,9 +22,9 @@ const location: LocationDefinitions = { default_country, postcode, secondary_address, - street, street_address, street_name, + street_pattern, }; export default location; diff --git a/src/locales/sr_RS_latin/location/street.ts b/src/locales/sr_RS_latin/location/street_pattern.ts similarity index 100% rename from src/locales/sr_RS_latin/location/street.ts rename to src/locales/sr_RS_latin/location/street_pattern.ts diff --git a/src/locales/sv/location/index.ts b/src/locales/sv/location/index.ts index e243b6bd9a0..fb913904ee9 100644 --- a/src/locales/sv/location/index.ts +++ b/src/locales/sv/location/index.ts @@ -13,9 +13,9 @@ import default_country from './default_country'; import postcode from './postcode'; import secondary_address from './secondary_address'; import state from './state'; -import street from './street'; import street_address from './street_address'; import street_name from './street_name'; +import street_pattern from './street_pattern'; import street_prefix from './street_prefix'; import street_suffix from './street_suffix'; @@ -30,9 +30,9 @@ const location: LocationDefinitions = { postcode, secondary_address, state, - street, street_address, street_name, + street_pattern, street_prefix, street_suffix, }; diff --git a/src/locales/sv/location/street.ts b/src/locales/sv/location/street_pattern.ts similarity index 100% rename from src/locales/sv/location/street.ts rename to src/locales/sv/location/street_pattern.ts diff --git a/src/locales/th/location/index.ts b/src/locales/th/location/index.ts index d9d54753352..59ec807e1ff 100644 --- a/src/locales/th/location/index.ts +++ b/src/locales/th/location/index.ts @@ -11,6 +11,7 @@ import default_country from './default_country'; import postcode from './postcode'; import state from './state'; import street_name from './street_name'; +import street_pattern from './street_pattern'; const location: LocationDefinitions = { building_number, @@ -21,6 +22,7 @@ const location: LocationDefinitions = { postcode, state, street_name, + street_pattern, }; export default location; diff --git a/src/locales/tr/location/street.ts b/src/locales/th/location/street_pattern.ts similarity index 100% rename from src/locales/tr/location/street.ts rename to src/locales/th/location/street_pattern.ts diff --git a/src/locales/tr/location/index.ts b/src/locales/tr/location/index.ts index 3554b1a9c71..536ab73ba37 100644 --- a/src/locales/tr/location/index.ts +++ b/src/locales/tr/location/index.ts @@ -9,9 +9,9 @@ import city_name from './city_name'; import country from './country'; import default_country from './default_country'; import postcode from './postcode'; -import street from './street'; import street_address from './street_address'; import street_name from './street_name'; +import street_pattern from './street_pattern'; const location: LocationDefinitions = { building_number, @@ -20,9 +20,9 @@ const location: LocationDefinitions = { country, default_country, postcode, - street, street_address, street_name, + street_pattern, }; export default location; diff --git a/src/locales/tr/location/street_pattern.ts b/src/locales/tr/location/street_pattern.ts new file mode 100644 index 00000000000..30a9a5ddf99 --- /dev/null +++ b/src/locales/tr/location/street_pattern.ts @@ -0,0 +1 @@ +export default ['{{location.street_name}}']; diff --git a/src/locales/uk/location/index.ts b/src/locales/uk/location/index.ts index 17e4efa9dd3..3506c54d4c3 100644 --- a/src/locales/uk/location/index.ts +++ b/src/locales/uk/location/index.ts @@ -13,9 +13,9 @@ import default_country from './default_country'; import postcode from './postcode'; import secondary_address from './secondary_address'; import state from './state'; -import street from './street'; import street_address from './street_address'; import street_name from './street_name'; +import street_pattern from './street_pattern'; import street_prefix from './street_prefix'; import street_suffix from './street_suffix'; @@ -30,9 +30,9 @@ const location: LocationDefinitions = { postcode, secondary_address, state, - street, street_address, street_name, + street_pattern, street_prefix, street_suffix, }; diff --git a/src/locales/uk/location/street.ts b/src/locales/uk/location/street_pattern.ts similarity index 100% rename from src/locales/uk/location/street.ts rename to src/locales/uk/location/street_pattern.ts diff --git a/src/locales/ur/location/index.ts b/src/locales/ur/location/index.ts index 73478f51613..83bacdb2c03 100644 --- a/src/locales/ur/location/index.ts +++ b/src/locales/ur/location/index.ts @@ -15,8 +15,8 @@ import postcode from './postcode'; import secondary_address from './secondary_address'; import state from './state'; import state_abbr from './state_abbr'; -import street from './street'; import street_address from './street_address'; +import street_pattern from './street_pattern'; import street_suffix from './street_suffix'; const location: LocationDefinitions = { @@ -32,8 +32,8 @@ const location: LocationDefinitions = { secondary_address, state, state_abbr, - street, street_address, + street_pattern, street_suffix, }; diff --git a/src/locales/ur/location/street.ts b/src/locales/ur/location/street_pattern.ts similarity index 100% rename from src/locales/ur/location/street.ts rename to src/locales/ur/location/street_pattern.ts diff --git a/src/locales/vi/location/index.ts b/src/locales/vi/location/index.ts index 37ed9c7d150..513e1fffed0 100644 --- a/src/locales/vi/location/index.ts +++ b/src/locales/vi/location/index.ts @@ -8,7 +8,7 @@ import city_name from './city_name'; import country from './country'; import default_country from './default_country'; import postcode from './postcode'; -import street from './street'; +import street_pattern from './street_pattern'; const location: LocationDefinitions = { city, @@ -16,7 +16,7 @@ const location: LocationDefinitions = { country, default_country, postcode, - street, + street_pattern, }; export default location; diff --git a/src/locales/vi/location/street.ts b/src/locales/vi/location/street_pattern.ts similarity index 100% rename from src/locales/vi/location/street.ts rename to src/locales/vi/location/street_pattern.ts diff --git a/src/locales/zh_CN/location/index.ts b/src/locales/zh_CN/location/index.ts index 51788277b7d..7c1a84d12ee 100644 --- a/src/locales/zh_CN/location/index.ts +++ b/src/locales/zh_CN/location/index.ts @@ -11,8 +11,8 @@ import default_country from './default_country'; import postcode from './postcode'; import state from './state'; import state_abbr from './state_abbr'; -import street from './street'; import street_address from './street_address'; +import street_pattern from './street_pattern'; import street_suffix from './street_suffix'; const location: LocationDefinitions = { @@ -24,8 +24,8 @@ const location: LocationDefinitions = { postcode, state, state_abbr, - street, street_address, + street_pattern, street_suffix, }; diff --git a/src/locales/zh_CN/location/street.ts b/src/locales/zh_CN/location/street_pattern.ts similarity index 100% rename from src/locales/zh_CN/location/street.ts rename to src/locales/zh_CN/location/street_pattern.ts diff --git a/src/locales/zh_TW/location/index.ts b/src/locales/zh_TW/location/index.ts index 51788277b7d..7c1a84d12ee 100644 --- a/src/locales/zh_TW/location/index.ts +++ b/src/locales/zh_TW/location/index.ts @@ -11,8 +11,8 @@ import default_country from './default_country'; import postcode from './postcode'; import state from './state'; import state_abbr from './state_abbr'; -import street from './street'; import street_address from './street_address'; +import street_pattern from './street_pattern'; import street_suffix from './street_suffix'; const location: LocationDefinitions = { @@ -24,8 +24,8 @@ const location: LocationDefinitions = { postcode, state, state_abbr, - street, street_address, + street_pattern, street_suffix, }; diff --git a/src/locales/zh_TW/location/street.ts b/src/locales/zh_TW/location/street_pattern.ts similarity index 100% rename from src/locales/zh_TW/location/street.ts rename to src/locales/zh_TW/location/street_pattern.ts diff --git a/src/locales/zu_ZA/location/index.ts b/src/locales/zu_ZA/location/index.ts index b34a7a06b0c..5c4d4277a59 100644 --- a/src/locales/zu_ZA/location/index.ts +++ b/src/locales/zu_ZA/location/index.ts @@ -7,14 +7,14 @@ import city from './city'; import default_country from './default_country'; import postcode from './postcode'; import state from './state'; -import street from './street'; +import street_pattern from './street_pattern'; const location: LocationDefinitions = { city, default_country, postcode, state, - street, + street_pattern, }; export default location; diff --git a/src/locales/zu_ZA/location/street.ts b/src/locales/zu_ZA/location/street_pattern.ts similarity index 100% rename from src/locales/zu_ZA/location/street.ts rename to src/locales/zu_ZA/location/street_pattern.ts diff --git a/src/modules/location/index.ts b/src/modules/location/index.ts index 0709796097f..59225ed544f 100644 --- a/src/modules/location/index.ts +++ b/src/modules/location/index.ts @@ -193,7 +193,9 @@ export class LocationModule { * @since 8.0.0 */ street(): string { - return this.faker.helpers.fake(this.faker.definitions.location.street); + return this.faker.helpers.fake( + this.faker.definitions.location.street_pattern + ); } /** @@ -203,8 +205,16 @@ export class LocationModule { * fakerDE.location.streetName() // 'Cavill Avenue' * * @since 8.0.0 + * + * @deprecated Use `faker.location.street()` instead. */ streetName(): string { + deprecated({ + deprecated: 'faker.location.streetName', + proposed: 'faker.location.street', + since: '8.0', + until: '9.0', + }); return this.faker.helpers.arrayElement( this.faker.definitions.location.street_name ); From d26974e014483a37bd539c1b479c7a4b940e79e0 Mon Sep 17 00:00:00 2001 From: Shinigami92 Date: Sun, 16 Apr 2023 12:11:52 +0200 Subject: [PATCH 2/4] add @see --- src/modules/location/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/location/index.ts b/src/modules/location/index.ts index 59225ed544f..de47beb8e19 100644 --- a/src/modules/location/index.ts +++ b/src/modules/location/index.ts @@ -206,6 +206,8 @@ export class LocationModule { * * @since 8.0.0 * + * @see faker.location.street() + * * @deprecated Use `faker.location.street()` instead. */ streetName(): string { From 2b64eb76dc301b33d1613727e107ce18f2999810 Mon Sep 17 00:00:00 2001 From: Shinigami92 Date: Sun, 16 Apr 2023 12:17:58 +0200 Subject: [PATCH 3/4] fix sort jsdoc tags --- src/modules/location/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/location/index.ts b/src/modules/location/index.ts index de47beb8e19..a014436d280 100644 --- a/src/modules/location/index.ts +++ b/src/modules/location/index.ts @@ -201,12 +201,13 @@ export class LocationModule { /** * Returns a random localized street name. * + * @see faker.location.street() + * * @example * fakerDE.location.streetName() // 'Cavill Avenue' * * @since 8.0.0 * - * @see faker.location.street() * * @deprecated Use `faker.location.street()` instead. */ From 63eec9d689f6d39d7e197d4d6e9fbd97c27bb700 Mon Sep 17 00:00:00 2001 From: Shinigami92 Date: Sun, 16 Apr 2023 15:20:46 +0200 Subject: [PATCH 4/4] fix blank line --- src/modules/location/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/modules/location/index.ts b/src/modules/location/index.ts index a014436d280..b82556becd6 100644 --- a/src/modules/location/index.ts +++ b/src/modules/location/index.ts @@ -208,7 +208,6 @@ export class LocationModule { * * @since 8.0.0 * - * * @deprecated Use `faker.location.street()` instead. */ streetName(): string {