diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7566476e660..665030879d5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -437,7 +437,7 @@ feat: add casing option feat(locale): extend Hebrew (he) fix: lower target to support Webpack 4 chore: add naming convention rule -refactor(address): deprecate streetPrefix and streetSuffix +refactor(location): deprecate streetPrefix and streetSuffix docs: remove unused playground test: validate @see contents ci: allow breaking change commits diff --git a/README.md b/README.md index 1051d96c680..2bf22eb4d2f 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ ## 🚀 Features -- 💌 Addresses - Generate valid looking Addresses, Zip Codes, Street Names, States, and Countries! +- 💌 Locations - Generate valid looking Addresses, Zip Codes, Street Names, States, and Countries! - ⏰ Time-based Data - Past, present, future, recent, soon... whenever! - 🌏 Localization - Set a locale to generate realistic looking Names, Addresses, and Phone Numbers. - 💸 Finance - Create stubbed out Account Details, Transactions, and Crypto Addresses. @@ -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/docs/.vitepress/api-pages.ts b/docs/.vitepress/api-pages.ts index a4446a22ffe..69bb49644c7 100644 --- a/docs/.vitepress/api-pages.ts +++ b/docs/.vitepress/api-pages.ts @@ -2,7 +2,6 @@ // Run 'pnpm run generate:api-docs' to update export const apiPages = [ { text: 'Overview', link: '/api/' }, - { text: 'Address', link: '/api/address.html' }, { text: 'Animal', link: '/api/animal.html' }, { text: 'Color', link: '/api/color.html' }, { text: 'Commerce', link: '/api/commerce.html' }, @@ -16,6 +15,7 @@ export const apiPages = [ { text: 'Helpers', link: '/api/helpers.html' }, { text: 'Image', link: '/api/image.html' }, { text: 'Internet', link: '/api/internet.html' }, + { text: 'Location', link: '/api/location.html' }, { text: 'Lorem', link: '/api/lorem.html' }, { text: 'Music', link: '/api/music.html' }, { text: 'Person', link: '/api/person.html' }, diff --git a/docs/index.md b/docs/index.md index 8f5f6b552af..61d97443344 100644 --- a/docs/index.md +++ b/docs/index.md @@ -24,7 +24,7 @@ features: title: Finance details: Create stubbed out Account Details, Transactions, and Crypto Addresses. - icon: 💌 - title: Addresses + title: Locations details: Generate valid Addresses, Zip Codes, Street Names, States, and Countries! - icon: 👾 title: Hacker Jargon diff --git a/scripts/apidoc/moduleMethods.ts b/scripts/apidoc/moduleMethods.ts index 7e78298e808..10bce054735 100644 --- a/scripts/apidoc/moduleMethods.ts +++ b/scripts/apidoc/moduleMethods.ts @@ -41,7 +41,9 @@ export function extractModuleName(module: DeclarationReflection): string { const { name } = module; // TODO @ST-DDT 2022-10-16: Remove in v10. // Typedoc prefers the name of the module that is exported first. - if (name === 'NameModule') { + if (name === 'AddressModule') { + return 'Location'; + } else if (name === 'NameModule') { return 'Person'; } return name.replace(/Module$/, ''); diff --git a/scripts/generateLocales.ts b/scripts/generateLocales.ts index f187b4f684f..d5540672b31 100644 --- a/scripts/generateLocales.ts +++ b/scripts/generateLocales.ts @@ -45,7 +45,6 @@ type DefinitionsType = { * The types of the definitions. */ const definitionsTypes: DefinitionsType = { - address: 'AddressDefinitions', animal: 'AnimalDefinitions', color: 'ColorDefinitions', commerce: 'CommerceDefinitions', @@ -55,6 +54,7 @@ const definitionsTypes: DefinitionsType = { finance: 'FinanceDefinitions', hacker: 'HackerDefinitions', internet: 'InternetDefinitions', + location: 'LocationDefinitions', lorem: 'LoremDefinitions', music: 'MusicDefinitions', person: 'PersonDefinitions', diff --git a/src/definitions/definitions.ts b/src/definitions/definitions.ts index 7d8113dab35..59c133eb77b 100644 --- a/src/definitions/definitions.ts +++ b/src/definitions/definitions.ts @@ -1,4 +1,3 @@ -import type { AddressDefinitions } from './address'; import type { AnimalDefinitions } from './animal'; import type { ColorDefinitions } from './color'; import type { CommerceDefinitions } from './commerce'; @@ -8,6 +7,7 @@ import type { DateDefinitions } from './date'; import type { FinanceDefinitions } from './finance'; import type { HackerDefinitions } from './hacker'; import type { InternetDefinitions } from './internet'; +import type { LocationDefinitions } from './location'; import type { LoremDefinitions } from './lorem'; import type { MusicDefinitions } from './music'; import type { PersonDefinitions } from './person'; @@ -26,7 +26,6 @@ export type LocaleEntry = Partial & * The definitions as used by the Faker modules. */ export interface Definitions { - address: AddressDefinitions; animal: AnimalDefinitions; color: ColorDefinitions; commerce: CommerceDefinitions; @@ -36,6 +35,7 @@ export interface Definitions { finance: FinanceDefinitions; hacker: HackerDefinitions; internet: InternetDefinitions; + location: LocationDefinitions; lorem: LoremDefinitions; music: MusicDefinitions; person: PersonDefinitions; diff --git a/src/definitions/index.ts b/src/definitions/index.ts index fc27ba8f463..230a19fb2c6 100644 --- a/src/definitions/index.ts +++ b/src/definitions/index.ts @@ -1,4 +1,3 @@ -export type { AddressDefinitions } from './address'; export type { AnimalDefinitions } from './animal'; export type { ColorDefinitions } from './color'; export type { @@ -15,6 +14,7 @@ export type { } from './finance'; export type { HackerDefinitions } from './hacker'; export type { InternetDefinitions } from './internet'; +export type { LocationDefinitions } from './location'; export type { LoremDefinitions } from './lorem'; export type { MusicDefinitions } from './music'; export type { PersonDefinitions, PersonTitleDefinitions } from './person'; diff --git a/src/definitions/address.ts b/src/definitions/location.ts similarity index 95% rename from src/definitions/address.ts rename to src/definitions/location.ts index ad3bd319592..95362eddebc 100644 --- a/src/definitions/address.ts +++ b/src/definitions/location.ts @@ -1,9 +1,9 @@ import type { LocaleEntry } from './definitions'; /** - * The possible definitions related to addresses. + * The possible definitions related to addresses and locations. */ -export type AddressDefinitions = LocaleEntry<{ +export type LocationDefinitions = LocaleEntry<{ /** * Postcodes patterns by state */ diff --git a/src/faker.ts b/src/faker.ts index 3452ae49866..f8a46511882 100644 --- a/src/faker.ts +++ b/src/faker.ts @@ -3,7 +3,6 @@ import { FakerError } from './errors/faker-error'; import { deprecated } from './internal/deprecated'; import { MersenneModule } from './internal/mersenne/mersenne'; import type { KnownLocale } from './locales'; -import { AddressModule } from './modules/address'; import { AnimalModule } from './modules/animal'; import { ColorModule } from './modules/color'; import { CommerceModule } from './modules/commerce'; @@ -17,6 +16,8 @@ import { HackerModule } from './modules/hacker'; import { HelpersModule } from './modules/helpers'; import { ImageModule } from './modules/image'; import { InternetModule } from './modules/internet'; +import type { LocationModule as AddressModule } from './modules/location'; +import { LocationModule } from './modules/location'; import { LoremModule } from './modules/lorem'; import { MusicModule } from './modules/music'; import type { PersonModule as NameModule } from './modules/person'; @@ -86,7 +87,6 @@ export class Faker { readonly datatype: DatatypeModule = new DatatypeModule(this); - readonly address: AddressModule = new AddressModule(this); readonly animal: AnimalModule = new AnimalModule(this); readonly color: ColorModule = new ColorModule(this); readonly commerce: CommerceModule = new CommerceModule(this); @@ -98,6 +98,7 @@ export class Faker { readonly hacker: HackerModule = new HackerModule(this); readonly image: ImageModule = new ImageModule(this); readonly internet: InternetModule = new InternetModule(this); + readonly location: LocationModule = new LocationModule(this); readonly lorem: LoremModule = new LoremModule(this); readonly music: MusicModule = new MusicModule(this); readonly person: PersonModule = new PersonModule(this); @@ -109,13 +110,24 @@ export class Faker { readonly word: WordModule = new WordModule(this); // Aliases + /** @deprecated Use {@link location} instead */ + get address(): AddressModule { + deprecated({ + deprecated: 'faker.address', + proposed: 'faker.location', + since: '8.0', + until: '10.0', + }); + return this.location; + } + /** @deprecated Use {@link person} instead */ get name(): NameModule { deprecated({ deprecated: 'faker.name', proposed: 'faker.person', - since: '8.0.0', - until: '10.0.0', + since: '8.0', + until: '10.0', }); return this.person; } @@ -175,13 +187,21 @@ export class Faker { return new Proxy({} as LocaleDefinition, { get(target: LocaleDefinition, module: string): unknown { // Support aliases - if (module === 'name') { + if (module === 'address') { + module = 'location'; + deprecated({ + deprecated: `faker.helpers.fake('{{address.*}}') or faker.definitions.address`, + proposed: `faker.helpers.fake('{{location.*}}') or faker.definitions.location`, + since: '8.0', + until: '10.0', + }); + } else if (module === 'name') { module = 'person'; deprecated({ deprecated: `faker.helpers.fake('{{name.*}}') or faker.definitions.name`, proposed: `faker.helpers.fake('{{person.*}}') or faker.definitions.person`, - since: '8.0.0', - until: '10.0.0', + since: '8.0', + until: '10.0', }); } diff --git a/src/index.ts b/src/index.ts index f0b87953a2b..9589c25750b 100644 --- a/src/index.ts +++ b/src/index.ts @@ -2,7 +2,6 @@ import { Faker } from './faker'; import allLocales from './locales'; export type { - AddressDefinitions, AnimalDefinitions, ColorDefinitions, CommerceDefinitions, @@ -16,6 +15,9 @@ export type { HackerDefinitions, InternetDefinitions, LocaleDefinition, + /** @deprecated Use LocationDefinitions instead */ + LocationDefinitions as AddressDefinitions, + LocationDefinitions, LoremDefinitions, MusicDefinitions, /** @deprecated Use PersonDefinitions instead */ @@ -33,7 +35,6 @@ export type { } from './definitions'; export { FakerError } from './errors/faker-error'; export type { FakerOptions, UsableLocale, UsedLocales } from './faker'; -export type { AddressModule } from './modules/address'; export type { AnimalModule } from './modules/animal'; export type { Casing, @@ -55,6 +56,11 @@ export type { HackerModule } from './modules/hacker'; export type { HelpersModule } from './modules/helpers'; export type { ImageModule } from './modules/image'; export type { InternetModule } from './modules/internet'; +export type { + /** @deprecated Use LocationModule instead */ + LocationModule as AddressModule, + LocationModule, +} from './modules/location'; export type { LoremModule } from './modules/lorem'; export type { MusicModule } from './modules/music'; export { Sex } from './modules/person'; diff --git a/src/locales/af_ZA/address/city.ts b/src/locales/af_ZA/address/city.ts deleted file mode 100644 index ea6ea950e46..00000000000 --- a/src/locales/af_ZA/address/city.ts +++ /dev/null @@ -1,6 +0,0 @@ -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}}', -]; diff --git a/src/locales/af_ZA/address/street.ts b/src/locales/af_ZA/address/street.ts deleted file mode 100644 index f7dd9d3b3aa..00000000000 --- a/src/locales/af_ZA/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', -]; diff --git a/src/locales/af_ZA/index.ts b/src/locales/af_ZA/index.ts index f0829959e39..884b94695d8 100644 --- a/src/locales/af_ZA/index.ts +++ b/src/locales/af_ZA/index.ts @@ -3,19 +3,19 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import cell_phone from './cell_phone'; import company from './company'; import internet from './internet'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; const af_ZA: LocaleDefinition = { title: 'Afrikaans', - address, cell_phone, company, internet, + location, person, phone_number, }; diff --git a/src/locales/af_ZA/location/city.ts b/src/locales/af_ZA/location/city.ts new file mode 100644 index 00000000000..7375aa8378a --- /dev/null +++ b/src/locales/af_ZA/location/city.ts @@ -0,0 +1,6 @@ +export default [ + '{{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/address/default_country.ts b/src/locales/af_ZA/location/default_country.ts similarity index 100% rename from src/locales/af_ZA/address/default_country.ts rename to src/locales/af_ZA/location/default_country.ts diff --git a/src/locales/zu_ZA/address/index.ts b/src/locales/af_ZA/location/index.ts similarity index 71% rename from src/locales/zu_ZA/address/index.ts rename to src/locales/af_ZA/location/index.ts index c1739ea56b7..112133b4b72 100644 --- a/src/locales/zu_ZA/address/index.ts +++ b/src/locales/af_ZA/location/index.ts @@ -2,17 +2,17 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import city from './city'; import default_country from './default_country'; import postcode from './postcode'; import street from './street'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { city, default_country, postcode, street, }; -export default address; +export default location; diff --git a/src/locales/af_ZA/address/postcode.ts b/src/locales/af_ZA/location/postcode.ts similarity index 100% rename from src/locales/af_ZA/address/postcode.ts rename to src/locales/af_ZA/location/postcode.ts diff --git a/src/locales/af_ZA/location/street.ts b/src/locales/af_ZA/location/street.ts new file mode 100644 index 00000000000..af32d0c4248 --- /dev/null +++ b/src/locales/af_ZA/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', +]; diff --git a/src/locales/ar/address/city.ts b/src/locales/ar/address/city.ts deleted file mode 100644 index e3da346bd1e..00000000000 --- a/src/locales/ar/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_name}}']; diff --git a/src/locales/ar/address/street.ts b/src/locales/ar/address/street.ts deleted file mode 100644 index 5db4f5be71f..00000000000 --- a/src/locales/ar/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{address.street_prefix}} {{person.first_name}}', - '{{address.street_prefix}} {{person.last_name}}', -]; diff --git a/src/locales/ar/address/street_address.ts b/src/locales/ar/address/street_address.ts deleted file mode 100644 index 55bed3628b9..00000000000 --- a/src/locales/ar/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.buildingNumber}} {{address.street}}', - full: '{{address.buildingNumber}} {{address.street}} {{address.secondaryAddress}}', -}; diff --git a/src/locales/ar/index.ts b/src/locales/ar/index.ts index c052dc37dd1..7b81efd8db5 100644 --- a/src/locales/ar/index.ts +++ b/src/locales/ar/index.ts @@ -3,11 +3,11 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import cell_phone from './cell_phone'; import color from './color'; import commerce from './commerce'; import date from './date'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; import team from './team'; @@ -16,11 +16,11 @@ import vehicle from './vehicle'; const ar: LocaleDefinition = { title: 'Arabic', separator: ' & ', - address, cell_phone, color, commerce, date, + location, person, phone_number, team, diff --git a/src/locales/ar/address/building_number.ts b/src/locales/ar/location/building_number.ts similarity index 100% rename from src/locales/ar/address/building_number.ts rename to src/locales/ar/location/building_number.ts diff --git a/src/locales/ar/location/city.ts b/src/locales/ar/location/city.ts new file mode 100644 index 00000000000..ad43b68fc5c --- /dev/null +++ b/src/locales/ar/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_name}}']; diff --git a/src/locales/ar/address/city_name.ts b/src/locales/ar/location/city_name.ts similarity index 100% rename from src/locales/ar/address/city_name.ts rename to src/locales/ar/location/city_name.ts diff --git a/src/locales/ar/address/country.ts b/src/locales/ar/location/country.ts similarity index 100% rename from src/locales/ar/address/country.ts rename to src/locales/ar/location/country.ts diff --git a/src/locales/ar/address/default_country.ts b/src/locales/ar/location/default_country.ts similarity index 100% rename from src/locales/ar/address/default_country.ts rename to src/locales/ar/location/default_country.ts diff --git a/src/locales/ar/address/index.ts b/src/locales/ar/location/index.ts similarity index 85% rename from src/locales/ar/address/index.ts rename to src/locales/ar/location/index.ts index c67148a7e88..c24a8ac58c3 100644 --- a/src/locales/ar/address/index.ts +++ b/src/locales/ar/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_name from './city_name'; @@ -15,7 +15,7 @@ import street from './street'; import street_address from './street_address'; import street_prefix from './street_prefix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_name, @@ -29,4 +29,4 @@ const address: AddressDefinitions = { street_prefix, }; -export default address; +export default location; diff --git a/src/locales/ar/address/postcode.ts b/src/locales/ar/location/postcode.ts similarity index 100% rename from src/locales/ar/address/postcode.ts rename to src/locales/ar/location/postcode.ts diff --git a/src/locales/ar/address/secondary_address.ts b/src/locales/ar/location/secondary_address.ts similarity index 100% rename from src/locales/ar/address/secondary_address.ts rename to src/locales/ar/location/secondary_address.ts diff --git a/src/locales/ar/address/state.ts b/src/locales/ar/location/state.ts similarity index 100% rename from src/locales/ar/address/state.ts rename to src/locales/ar/location/state.ts diff --git a/src/locales/ar/location/street.ts b/src/locales/ar/location/street.ts new file mode 100644 index 00000000000..c182e83762a --- /dev/null +++ b/src/locales/ar/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{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 new file mode 100644 index 00000000000..2e1a661d418 --- /dev/null +++ b/src/locales/ar/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.buildingNumber}} {{location.street}}', + full: '{{location.buildingNumber}} {{location.street}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/ar/address/street_prefix.ts b/src/locales/ar/location/street_prefix.ts similarity index 100% rename from src/locales/ar/address/street_prefix.ts rename to src/locales/ar/location/street_prefix.ts 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/address/city.ts b/src/locales/az/address/city.ts deleted file mode 100644 index e3da346bd1e..00000000000 --- a/src/locales/az/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_name}}']; diff --git a/src/locales/az/address/street.ts b/src/locales/az/address/street.ts deleted file mode 100644 index bddea6b0e50..00000000000 --- a/src/locales/az/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{address.street_suffix}} {{address.street_name}}', - '{{address.street_name}} {{address.street_suffix}}', -]; diff --git a/src/locales/az/address/street_address.ts b/src/locales/az/address/street_address.ts deleted file mode 100644 index 9a8e4da4839..00000000000 --- a/src/locales/az/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}}, {{address.buildingNumber}}', - full: '{{address.street}}, {{address.buildingNumber}} {{address.secondaryAddress}}', -}; 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/index.ts b/src/locales/az/index.ts index b48e7235693..fe89852b943 100644 --- a/src/locales/az/index.ts +++ b/src/locales/az/index.ts @@ -3,24 +3,24 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import color from './color'; import commerce from './commerce'; import company from './company'; import date from './date'; import internet from './internet'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; const az: LocaleDefinition = { title: 'Azerbaijani', separator: ' və ', - address, color, commerce, company, date, internet, + location, person, phone_number, }; diff --git a/src/locales/az/address/building_number.ts b/src/locales/az/location/building_number.ts similarity index 100% rename from src/locales/az/address/building_number.ts rename to src/locales/az/location/building_number.ts diff --git a/src/locales/az/location/city.ts b/src/locales/az/location/city.ts new file mode 100644 index 00000000000..ad43b68fc5c --- /dev/null +++ b/src/locales/az/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_name}}']; diff --git a/src/locales/az/address/city_name.ts b/src/locales/az/location/city_name.ts similarity index 100% rename from src/locales/az/address/city_name.ts rename to src/locales/az/location/city_name.ts diff --git a/src/locales/az/address/country.ts b/src/locales/az/location/country.ts similarity index 100% rename from src/locales/az/address/country.ts rename to src/locales/az/location/country.ts diff --git a/src/locales/az/address/default_country.ts b/src/locales/az/location/default_country.ts similarity index 100% rename from src/locales/az/address/default_country.ts rename to src/locales/az/location/default_country.ts diff --git a/src/locales/lv/address/index.ts b/src/locales/az/location/index.ts similarity index 86% rename from src/locales/lv/address/index.ts rename to src/locales/az/location/index.ts index 3c37ba5f4fa..b28b0dfbfb3 100644 --- a/src/locales/lv/address/index.ts +++ b/src/locales/az/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_name from './city_name'; @@ -16,7 +16,7 @@ import street_address from './street_address'; import street_name from './street_name'; import street_suffix from './street_suffix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_name, @@ -31,4 +31,4 @@ const address: AddressDefinitions = { street_suffix, }; -export default address; +export default location; diff --git a/src/locales/az/address/postcode.ts b/src/locales/az/location/postcode.ts similarity index 100% rename from src/locales/az/address/postcode.ts rename to src/locales/az/location/postcode.ts diff --git a/src/locales/az/address/secondary_address.ts b/src/locales/az/location/secondary_address.ts similarity index 100% rename from src/locales/az/address/secondary_address.ts rename to src/locales/az/location/secondary_address.ts diff --git a/src/locales/az/address/state.ts b/src/locales/az/location/state.ts similarity index 100% rename from src/locales/az/address/state.ts rename to src/locales/az/location/state.ts diff --git a/src/locales/az/location/street.ts b/src/locales/az/location/street.ts new file mode 100644 index 00000000000..523f81653d1 --- /dev/null +++ b/src/locales/az/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{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 new file mode 100644 index 00000000000..3394fef6dc2 --- /dev/null +++ b/src/locales/az/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}}, {{location.buildingNumber}}', + full: '{{location.street}}, {{location.buildingNumber}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/az/address/street_name.ts b/src/locales/az/location/street_name.ts similarity index 100% rename from src/locales/az/address/street_name.ts rename to src/locales/az/location/street_name.ts diff --git a/src/locales/az/address/street_suffix.ts b/src/locales/az/location/street_suffix.ts similarity index 100% rename from src/locales/az/address/street_suffix.ts rename to src/locales/az/location/street_suffix.ts diff --git a/src/locales/cz/address/city.ts b/src/locales/cz/address/city.ts deleted file mode 100644 index e3da346bd1e..00000000000 --- a/src/locales/cz/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_name}}']; diff --git a/src/locales/cz/address/street.ts b/src/locales/cz/address/street.ts deleted file mode 100644 index 30ba73fc997..00000000000 --- a/src/locales/cz/address/street.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.street_name}}']; diff --git a/src/locales/cz/address/street_address.ts b/src/locales/cz/address/street_address.ts deleted file mode 100644 index d1e8da38725..00000000000 --- a/src/locales/cz/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', -}; diff --git a/src/locales/cz/index.ts b/src/locales/cz/index.ts index c9c7ab54e66..bfac022ce31 100644 --- a/src/locales/cz/index.ts +++ b/src/locales/cz/index.ts @@ -3,20 +3,20 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import company from './company'; import date from './date'; import internet from './internet'; +import location from './location'; import lorem from './lorem'; import person from './person'; import phone_number from './phone_number'; const cz: LocaleDefinition = { title: 'Czech', - address, company, date, internet, + location, lorem, person, phone_number, diff --git a/src/locales/cz/address/building_number.ts b/src/locales/cz/location/building_number.ts similarity index 100% rename from src/locales/cz/address/building_number.ts rename to src/locales/cz/location/building_number.ts diff --git a/src/locales/cz/location/city.ts b/src/locales/cz/location/city.ts new file mode 100644 index 00000000000..ad43b68fc5c --- /dev/null +++ b/src/locales/cz/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_name}}']; diff --git a/src/locales/cz/address/city_name.ts b/src/locales/cz/location/city_name.ts similarity index 100% rename from src/locales/cz/address/city_name.ts rename to src/locales/cz/location/city_name.ts diff --git a/src/locales/cz/address/country.ts b/src/locales/cz/location/country.ts similarity index 100% rename from src/locales/cz/address/country.ts rename to src/locales/cz/location/country.ts diff --git a/src/locales/cz/address/default_country.ts b/src/locales/cz/location/default_country.ts similarity index 100% rename from src/locales/cz/address/default_country.ts rename to src/locales/cz/location/default_country.ts diff --git a/src/locales/de_AT/address/index.ts b/src/locales/cz/location/index.ts similarity index 86% rename from src/locales/de_AT/address/index.ts rename to src/locales/cz/location/index.ts index 8222f8097a8..7dd25913a27 100644 --- a/src/locales/de_AT/address/index.ts +++ b/src/locales/cz/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_name from './city_name'; @@ -16,7 +16,7 @@ import street from './street'; import street_address from './street_address'; import street_name from './street_name'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_name, @@ -31,4 +31,4 @@ const address: AddressDefinitions = { street_name, }; -export default address; +export default location; diff --git a/src/locales/cz/address/postcode.ts b/src/locales/cz/location/postcode.ts similarity index 100% rename from src/locales/cz/address/postcode.ts rename to src/locales/cz/location/postcode.ts diff --git a/src/locales/cz/address/secondary_address.ts b/src/locales/cz/location/secondary_address.ts similarity index 100% rename from src/locales/cz/address/secondary_address.ts rename to src/locales/cz/location/secondary_address.ts diff --git a/src/locales/cz/address/state.ts b/src/locales/cz/location/state.ts similarity index 100% rename from src/locales/cz/address/state.ts rename to src/locales/cz/location/state.ts diff --git a/src/locales/cz/address/state_abbr.ts b/src/locales/cz/location/state_abbr.ts similarity index 100% rename from src/locales/cz/address/state_abbr.ts rename to src/locales/cz/location/state_abbr.ts diff --git a/src/locales/cz/location/street.ts b/src/locales/cz/location/street.ts new file mode 100644 index 00000000000..30a9a5ddf99 --- /dev/null +++ b/src/locales/cz/location/street.ts @@ -0,0 +1 @@ +export default ['{{location.street_name}}']; diff --git a/src/locales/cz/location/street_address.ts b/src/locales/cz/location/street_address.ts new file mode 100644 index 00000000000..437f20dd91a --- /dev/null +++ b/src/locales/cz/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/cz/address/street_name.ts b/src/locales/cz/location/street_name.ts similarity index 100% rename from src/locales/cz/address/street_name.ts rename to src/locales/cz/location/street_name.ts diff --git a/src/locales/de/address/city.ts b/src/locales/de/address/city.ts deleted file mode 100644 index 27a932f1459..00000000000 --- a/src/locales/de/address/city.ts +++ /dev/null @@ -1,6 +0,0 @@ -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}}', -]; diff --git a/src/locales/de/address/street.ts b/src/locales/de/address/street.ts deleted file mode 100644 index 30ba73fc997..00000000000 --- a/src/locales/de/address/street.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.street_name}}']; diff --git a/src/locales/de/address/street_address.ts b/src/locales/de/address/street_address.ts deleted file mode 100644 index d1e8da38725..00000000000 --- a/src/locales/de/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', -}; diff --git a/src/locales/de/index.ts b/src/locales/de/index.ts index 49b98452c5d..4961854c608 100644 --- a/src/locales/de/index.ts +++ b/src/locales/de/index.ts @@ -3,11 +3,11 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import cell_phone from './cell_phone'; import company from './company'; import date from './date'; import internet from './internet'; +import location from './location'; import lorem from './lorem'; import person from './person'; import phone_number from './phone_number'; @@ -15,11 +15,11 @@ import word from './word'; const de: LocaleDefinition = { title: 'German', - address, cell_phone, company, date, internet, + location, lorem, person, phone_number, diff --git a/src/locales/de/address/building_number.ts b/src/locales/de/location/building_number.ts similarity index 100% rename from src/locales/de/address/building_number.ts rename to src/locales/de/location/building_number.ts diff --git a/src/locales/de/location/city.ts b/src/locales/de/location/city.ts new file mode 100644 index 00000000000..d744d882361 --- /dev/null +++ b/src/locales/de/location/city.ts @@ -0,0 +1,6 @@ +export default [ + '{{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/address/city_name.ts b/src/locales/de/location/city_name.ts similarity index 100% rename from src/locales/de/address/city_name.ts rename to src/locales/de/location/city_name.ts diff --git a/src/locales/de/address/city_prefix.ts b/src/locales/de/location/city_prefix.ts similarity index 100% rename from src/locales/de/address/city_prefix.ts rename to src/locales/de/location/city_prefix.ts diff --git a/src/locales/de/address/city_suffix.ts b/src/locales/de/location/city_suffix.ts similarity index 100% rename from src/locales/de/address/city_suffix.ts rename to src/locales/de/location/city_suffix.ts diff --git a/src/locales/de/address/country.ts b/src/locales/de/location/country.ts similarity index 100% rename from src/locales/de/address/country.ts rename to src/locales/de/location/country.ts diff --git a/src/locales/de/address/default_country.ts b/src/locales/de/location/default_country.ts similarity index 100% rename from src/locales/de/address/default_country.ts rename to src/locales/de/location/default_country.ts diff --git a/src/locales/sk/address/index.ts b/src/locales/de/location/index.ts similarity index 87% rename from src/locales/sk/address/index.ts rename to src/locales/de/location/index.ts index 2551894c00d..93f5515ec57 100644 --- a/src/locales/sk/address/index.ts +++ b/src/locales/de/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_name from './city_name'; @@ -18,7 +18,7 @@ import street from './street'; import street_address from './street_address'; import street_name from './street_name'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_name, @@ -35,4 +35,4 @@ const address: AddressDefinitions = { street_name, }; -export default address; +export default location; diff --git a/src/locales/de/address/postcode.ts b/src/locales/de/location/postcode.ts similarity index 100% rename from src/locales/de/address/postcode.ts rename to src/locales/de/location/postcode.ts diff --git a/src/locales/de/address/secondary_address.ts b/src/locales/de/location/secondary_address.ts similarity index 100% rename from src/locales/de/address/secondary_address.ts rename to src/locales/de/location/secondary_address.ts diff --git a/src/locales/de/address/state.ts b/src/locales/de/location/state.ts similarity index 100% rename from src/locales/de/address/state.ts rename to src/locales/de/location/state.ts diff --git a/src/locales/de/address/state_abbr.ts b/src/locales/de/location/state_abbr.ts similarity index 100% rename from src/locales/de/address/state_abbr.ts rename to src/locales/de/location/state_abbr.ts diff --git a/src/locales/de/location/street.ts b/src/locales/de/location/street.ts new file mode 100644 index 00000000000..30a9a5ddf99 --- /dev/null +++ b/src/locales/de/location/street.ts @@ -0,0 +1 @@ +export default ['{{location.street_name}}']; diff --git a/src/locales/de/location/street_address.ts b/src/locales/de/location/street_address.ts new file mode 100644 index 00000000000..437f20dd91a --- /dev/null +++ b/src/locales/de/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/de/address/street_name.ts b/src/locales/de/location/street_name.ts similarity index 100% rename from src/locales/de/address/street_name.ts rename to src/locales/de/location/street_name.ts diff --git a/src/locales/de_AT/address/city.ts b/src/locales/de_AT/address/city.ts deleted file mode 100644 index e3da346bd1e..00000000000 --- a/src/locales/de_AT/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_name}}']; diff --git a/src/locales/de_AT/address/street.ts b/src/locales/de_AT/address/street.ts deleted file mode 100644 index 30ba73fc997..00000000000 --- a/src/locales/de_AT/address/street.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.street_name}}']; diff --git a/src/locales/de_AT/address/street_address.ts b/src/locales/de_AT/address/street_address.ts deleted file mode 100644 index d1e8da38725..00000000000 --- a/src/locales/de_AT/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', -}; diff --git a/src/locales/de_AT/index.ts b/src/locales/de_AT/index.ts index 3789ea88de7..8fdfae132b7 100644 --- a/src/locales/de_AT/index.ts +++ b/src/locales/de_AT/index.ts @@ -3,20 +3,20 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import cell_phone from './cell_phone'; import company from './company'; import internet from './internet'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; import word from './word'; const de_AT: LocaleDefinition = { title: 'German (Austria)', - address, cell_phone, company, internet, + location, person, phone_number, word, diff --git a/src/locales/de_AT/address/building_number.ts b/src/locales/de_AT/location/building_number.ts similarity index 100% rename from src/locales/de_AT/address/building_number.ts rename to src/locales/de_AT/location/building_number.ts diff --git a/src/locales/de_AT/location/city.ts b/src/locales/de_AT/location/city.ts new file mode 100644 index 00000000000..ad43b68fc5c --- /dev/null +++ b/src/locales/de_AT/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_name}}']; diff --git a/src/locales/de_AT/address/city_name.ts b/src/locales/de_AT/location/city_name.ts similarity index 100% rename from src/locales/de_AT/address/city_name.ts rename to src/locales/de_AT/location/city_name.ts diff --git a/src/locales/de_AT/address/country.ts b/src/locales/de_AT/location/country.ts similarity index 100% rename from src/locales/de_AT/address/country.ts rename to src/locales/de_AT/location/country.ts diff --git a/src/locales/de_AT/address/default_country.ts b/src/locales/de_AT/location/default_country.ts similarity index 100% rename from src/locales/de_AT/address/default_country.ts rename to src/locales/de_AT/location/default_country.ts diff --git a/src/locales/cz/address/index.ts b/src/locales/de_AT/location/index.ts similarity index 86% rename from src/locales/cz/address/index.ts rename to src/locales/de_AT/location/index.ts index 8222f8097a8..7dd25913a27 100644 --- a/src/locales/cz/address/index.ts +++ b/src/locales/de_AT/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_name from './city_name'; @@ -16,7 +16,7 @@ import street from './street'; import street_address from './street_address'; import street_name from './street_name'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_name, @@ -31,4 +31,4 @@ const address: AddressDefinitions = { street_name, }; -export default address; +export default location; diff --git a/src/locales/de_AT/address/postcode.ts b/src/locales/de_AT/location/postcode.ts similarity index 100% rename from src/locales/de_AT/address/postcode.ts rename to src/locales/de_AT/location/postcode.ts diff --git a/src/locales/de_AT/address/secondary_address.ts b/src/locales/de_AT/location/secondary_address.ts similarity index 100% rename from src/locales/de_AT/address/secondary_address.ts rename to src/locales/de_AT/location/secondary_address.ts diff --git a/src/locales/de_AT/address/state.ts b/src/locales/de_AT/location/state.ts similarity index 100% rename from src/locales/de_AT/address/state.ts rename to src/locales/de_AT/location/state.ts diff --git a/src/locales/de_AT/address/state_abbr.ts b/src/locales/de_AT/location/state_abbr.ts similarity index 100% rename from src/locales/de_AT/address/state_abbr.ts rename to src/locales/de_AT/location/state_abbr.ts diff --git a/src/locales/de_AT/location/street.ts b/src/locales/de_AT/location/street.ts new file mode 100644 index 00000000000..30a9a5ddf99 --- /dev/null +++ b/src/locales/de_AT/location/street.ts @@ -0,0 +1 @@ +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 new file mode 100644 index 00000000000..437f20dd91a --- /dev/null +++ b/src/locales/de_AT/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/de_AT/address/street_name.ts b/src/locales/de_AT/location/street_name.ts similarity index 100% rename from src/locales/de_AT/address/street_name.ts rename to src/locales/de_AT/location/street_name.ts diff --git a/src/locales/de_CH/address/city.ts b/src/locales/de_CH/address/city.ts deleted file mode 100644 index e3da346bd1e..00000000000 --- a/src/locales/de_CH/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_name}}']; diff --git a/src/locales/de_CH/address/street.ts b/src/locales/de_CH/address/street.ts deleted file mode 100644 index f7dd9d3b3aa..00000000000 --- a/src/locales/de_CH/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', -]; diff --git a/src/locales/de_CH/index.ts b/src/locales/de_CH/index.ts index 4abc4e32328..bb6d4972d32 100644 --- a/src/locales/de_CH/index.ts +++ b/src/locales/de_CH/index.ts @@ -3,17 +3,17 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import company from './company'; import internet from './internet'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; const de_CH: LocaleDefinition = { title: 'German (Switzerland)', - address, company, internet, + location, person, phone_number, }; diff --git a/src/locales/de_CH/location/city.ts b/src/locales/de_CH/location/city.ts new file mode 100644 index 00000000000..ad43b68fc5c --- /dev/null +++ b/src/locales/de_CH/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_name}}']; diff --git a/src/locales/de_CH/address/city_name.ts b/src/locales/de_CH/location/city_name.ts similarity index 100% rename from src/locales/de_CH/address/city_name.ts rename to src/locales/de_CH/location/city_name.ts diff --git a/src/locales/de_CH/address/country_code.ts b/src/locales/de_CH/location/country_code.ts similarity index 100% rename from src/locales/de_CH/address/country_code.ts rename to src/locales/de_CH/location/country_code.ts diff --git a/src/locales/de_CH/address/default_country.ts b/src/locales/de_CH/location/default_country.ts similarity index 100% rename from src/locales/de_CH/address/default_country.ts rename to src/locales/de_CH/location/default_country.ts diff --git a/src/locales/de_CH/address/index.ts b/src/locales/de_CH/location/index.ts similarity index 80% rename from src/locales/de_CH/address/index.ts rename to src/locales/de_CH/location/index.ts index 217b2cf6ccb..6b6259fc411 100644 --- a/src/locales/de_CH/address/index.ts +++ b/src/locales/de_CH/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import city from './city'; import city_name from './city_name'; import country_code from './country_code'; @@ -12,7 +12,7 @@ import state from './state'; import state_abbr from './state_abbr'; import street from './street'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { city, city_name, country_code, @@ -23,4 +23,4 @@ const address: AddressDefinitions = { street, }; -export default address; +export default location; diff --git a/src/locales/de_CH/address/postcode.ts b/src/locales/de_CH/location/postcode.ts similarity index 100% rename from src/locales/de_CH/address/postcode.ts rename to src/locales/de_CH/location/postcode.ts diff --git a/src/locales/de_CH/address/state.ts b/src/locales/de_CH/location/state.ts similarity index 100% rename from src/locales/de_CH/address/state.ts rename to src/locales/de_CH/location/state.ts diff --git a/src/locales/de_CH/address/state_abbr.ts b/src/locales/de_CH/location/state_abbr.ts similarity index 100% rename from src/locales/de_CH/address/state_abbr.ts rename to src/locales/de_CH/location/state_abbr.ts diff --git a/src/locales/de_CH/location/street.ts b/src/locales/de_CH/location/street.ts new file mode 100644 index 00000000000..af32d0c4248 --- /dev/null +++ b/src/locales/de_CH/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', +]; diff --git a/src/locales/el/address/city.ts b/src/locales/el/address/city.ts deleted file mode 100644 index ea6ea950e46..00000000000 --- a/src/locales/el/address/city.ts +++ /dev/null @@ -1,6 +0,0 @@ -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}}', -]; diff --git a/src/locales/el/address/street.ts b/src/locales/el/address/street.ts deleted file mode 100644 index f7dd9d3b3aa..00000000000 --- a/src/locales/el/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', -]; diff --git a/src/locales/el/index.ts b/src/locales/el/index.ts index aea4beed8fa..4c235730818 100644 --- a/src/locales/el/index.ts +++ b/src/locales/el/index.ts @@ -3,7 +3,6 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import app from './app'; import business from './business'; import cell_phone from './cell_phone'; @@ -13,6 +12,7 @@ import company from './company'; import finance from './finance'; import hacker from './hacker'; import internet from './internet'; +import location from './location'; import lorem from './lorem'; import person from './person'; import phone_number from './phone_number'; @@ -21,7 +21,6 @@ import team from './team'; const el: LocaleDefinition = { title: 'Greek', separator: ' & ', - address, app, business, cell_phone, @@ -31,6 +30,7 @@ const el: LocaleDefinition = { finance, hacker, internet, + location, lorem, person, phone_number, diff --git a/src/locales/el/location/city.ts b/src/locales/el/location/city.ts new file mode 100644 index 00000000000..7375aa8378a --- /dev/null +++ b/src/locales/el/location/city.ts @@ -0,0 +1,6 @@ +export default [ + '{{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/address/county.ts b/src/locales/el/location/county.ts similarity index 100% rename from src/locales/el/address/county.ts rename to src/locales/el/location/county.ts diff --git a/src/locales/el/address/default_country.ts b/src/locales/el/location/default_country.ts similarity index 100% rename from src/locales/el/address/default_country.ts rename to src/locales/el/location/default_country.ts diff --git a/src/locales/el/address/index.ts b/src/locales/el/location/index.ts similarity index 70% rename from src/locales/el/address/index.ts rename to src/locales/el/location/index.ts index 4fa3a9ba0cd..8db1a9fb8d0 100644 --- a/src/locales/el/address/index.ts +++ b/src/locales/el/location/index.ts @@ -2,17 +2,17 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import city from './city'; import county from './county'; import default_country from './default_country'; import street from './street'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { city, county, default_country, street, }; -export default address; +export default location; diff --git a/src/locales/el/location/street.ts b/src/locales/el/location/street.ts new file mode 100644 index 00000000000..af32d0c4248 --- /dev/null +++ b/src/locales/el/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{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/address/city.ts b/src/locales/en/address/city.ts deleted file mode 100644 index 9a277b6fda7..00000000000 --- a/src/locales/en/address/city.ts +++ /dev/null @@ -1,7 +0,0 @@ -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}}', -]; diff --git a/src/locales/en/address/street.ts b/src/locales/en/address/street.ts deleted file mode 100644 index 5e9ca1171d0..00000000000 --- a/src/locales/en/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{person.first_name}} {{address.street_suffix}}', - '{{person.last_name}} {{address.street_suffix}}', -]; diff --git a/src/locales/en/address/street_address.ts b/src/locales/en/address/street_address.ts deleted file mode 100644 index 55bed3628b9..00000000000 --- a/src/locales/en/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.buildingNumber}} {{address.street}}', - full: '{{address.buildingNumber}} {{address.street}} {{address.secondaryAddress}}', -}; diff --git a/src/locales/en/index.ts b/src/locales/en/index.ts index 242b4cd995f..3cd7a1b69ff 100644 --- a/src/locales/en/index.ts +++ b/src/locales/en/index.ts @@ -3,7 +3,6 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import animal from './animal'; import app from './app'; import business from './business'; @@ -16,6 +15,7 @@ import date from './date'; import finance from './finance'; import hacker from './hacker'; import internet from './internet'; +import location from './location'; import lorem from './lorem'; import music from './music'; import person from './person'; @@ -29,7 +29,6 @@ import word from './word'; const en: LocaleDefinition = { title: 'English', separator: ' & ', - address, animal, app, business, @@ -42,6 +41,7 @@ const en: LocaleDefinition = { finance, hacker, internet, + location, lorem, music, person, diff --git a/src/locales/en/address/building_number.ts b/src/locales/en/location/building_number.ts similarity index 100% rename from src/locales/en/address/building_number.ts rename to src/locales/en/location/building_number.ts diff --git a/src/locales/en/location/city.ts b/src/locales/en/location/city.ts new file mode 100644 index 00000000000..8d70128e688 --- /dev/null +++ b/src/locales/en/location/city.ts @@ -0,0 +1,7 @@ +export default [ + '{{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/address/city_name.ts b/src/locales/en/location/city_name.ts similarity index 100% rename from src/locales/en/address/city_name.ts rename to src/locales/en/location/city_name.ts diff --git a/src/locales/en/address/city_prefix.ts b/src/locales/en/location/city_prefix.ts similarity index 100% rename from src/locales/en/address/city_prefix.ts rename to src/locales/en/location/city_prefix.ts diff --git a/src/locales/en/address/city_suffix.ts b/src/locales/en/location/city_suffix.ts similarity index 100% rename from src/locales/en/address/city_suffix.ts rename to src/locales/en/location/city_suffix.ts diff --git a/src/locales/en/address/country.ts b/src/locales/en/location/country.ts similarity index 100% rename from src/locales/en/address/country.ts rename to src/locales/en/location/country.ts diff --git a/src/locales/en/address/country_code.ts b/src/locales/en/location/country_code.ts similarity index 100% rename from src/locales/en/address/country_code.ts rename to src/locales/en/location/country_code.ts diff --git a/src/locales/en/address/country_code_alpha_3.ts b/src/locales/en/location/country_code_alpha_3.ts similarity index 100% rename from src/locales/en/address/country_code_alpha_3.ts rename to src/locales/en/location/country_code_alpha_3.ts diff --git a/src/locales/en/address/county.ts b/src/locales/en/location/county.ts similarity index 100% rename from src/locales/en/address/county.ts rename to src/locales/en/location/county.ts diff --git a/src/locales/en/address/default_country.ts b/src/locales/en/location/default_country.ts similarity index 100% rename from src/locales/en/address/default_country.ts rename to src/locales/en/location/default_country.ts diff --git a/src/locales/en/address/direction.ts b/src/locales/en/location/direction.ts similarity index 100% rename from src/locales/en/address/direction.ts rename to src/locales/en/location/direction.ts diff --git a/src/locales/en/address/direction_abbr.ts b/src/locales/en/location/direction_abbr.ts similarity index 100% rename from src/locales/en/address/direction_abbr.ts rename to src/locales/en/location/direction_abbr.ts diff --git a/src/locales/en/address/index.ts b/src/locales/en/location/index.ts similarity index 91% rename from src/locales/en/address/index.ts rename to src/locales/en/location/index.ts index 6bc94e09f2d..5fd8af21c1e 100644 --- a/src/locales/en/address/index.ts +++ b/src/locales/en/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_name from './city_name'; @@ -24,7 +24,7 @@ import street_address from './street_address'; import street_suffix from './street_suffix'; import time_zone from './time_zone'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_name, @@ -47,4 +47,4 @@ const address: AddressDefinitions = { time_zone, }; -export default address; +export default location; diff --git a/src/locales/en/address/postcode.ts b/src/locales/en/location/postcode.ts similarity index 100% rename from src/locales/en/address/postcode.ts rename to src/locales/en/location/postcode.ts diff --git a/src/locales/en/address/secondary_address.ts b/src/locales/en/location/secondary_address.ts similarity index 100% rename from src/locales/en/address/secondary_address.ts rename to src/locales/en/location/secondary_address.ts diff --git a/src/locales/en/address/state.ts b/src/locales/en/location/state.ts similarity index 100% rename from src/locales/en/address/state.ts rename to src/locales/en/location/state.ts diff --git a/src/locales/en/address/state_abbr.ts b/src/locales/en/location/state_abbr.ts similarity index 100% rename from src/locales/en/address/state_abbr.ts rename to src/locales/en/location/state_abbr.ts diff --git a/src/locales/en/location/street.ts b/src/locales/en/location/street.ts new file mode 100644 index 00000000000..b5fcd9fea0f --- /dev/null +++ b/src/locales/en/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{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 new file mode 100644 index 00000000000..2e1a661d418 --- /dev/null +++ b/src/locales/en/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.buildingNumber}} {{location.street}}', + full: '{{location.buildingNumber}} {{location.street}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/en/address/street_suffix.ts b/src/locales/en/location/street_suffix.ts similarity index 100% rename from src/locales/en/address/street_suffix.ts rename to src/locales/en/location/street_suffix.ts diff --git a/src/locales/en/address/time_zone.ts b/src/locales/en/location/time_zone.ts similarity index 100% rename from src/locales/en/address/time_zone.ts rename to src/locales/en/location/time_zone.ts 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/address/city.ts b/src/locales/en_AU/address/city.ts deleted file mode 100644 index ea6ea950e46..00000000000 --- a/src/locales/en_AU/address/city.ts +++ /dev/null @@ -1,6 +0,0 @@ -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}}', -]; diff --git a/src/locales/en_AU/address/street.ts b/src/locales/en_AU/address/street.ts deleted file mode 100644 index f7dd9d3b3aa..00000000000 --- a/src/locales/en_AU/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', -]; diff --git a/src/locales/en_AU/index.ts b/src/locales/en_AU/index.ts index 82f106d0768..18643c85ae2 100644 --- a/src/locales/en_AU/index.ts +++ b/src/locales/en_AU/index.ts @@ -3,17 +3,17 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import company from './company'; import internet from './internet'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; const en_AU: LocaleDefinition = { title: 'English (Australia)', - address, company, internet, + location, person, phone_number, }; diff --git a/src/locales/en_AU/address/building_number.ts b/src/locales/en_AU/location/building_number.ts similarity index 100% rename from src/locales/en_AU/address/building_number.ts rename to src/locales/en_AU/location/building_number.ts diff --git a/src/locales/en_AU/location/city.ts b/src/locales/en_AU/location/city.ts new file mode 100644 index 00000000000..7375aa8378a --- /dev/null +++ b/src/locales/en_AU/location/city.ts @@ -0,0 +1,6 @@ +export default [ + '{{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/address/default_country.ts b/src/locales/en_AU/location/default_country.ts similarity index 100% rename from src/locales/en_AU/address/default_country.ts rename to src/locales/en_AU/location/default_country.ts diff --git a/src/locales/en_AU/address/index.ts b/src/locales/en_AU/location/index.ts similarity index 81% rename from src/locales/en_AU/address/index.ts rename to src/locales/en_AU/location/index.ts index dabc415d20e..35b03195f4d 100644 --- a/src/locales/en_AU/address/index.ts +++ b/src/locales/en_AU/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import default_country from './default_country'; @@ -12,7 +12,7 @@ import state_abbr from './state_abbr'; import street from './street'; import street_suffix from './street_suffix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, default_country, @@ -23,4 +23,4 @@ const address: AddressDefinitions = { street_suffix, }; -export default address; +export default location; diff --git a/src/locales/en_AU/address/postcode.ts b/src/locales/en_AU/location/postcode.ts similarity index 100% rename from src/locales/en_AU/address/postcode.ts rename to src/locales/en_AU/location/postcode.ts diff --git a/src/locales/en_AU/address/state.ts b/src/locales/en_AU/location/state.ts similarity index 100% rename from src/locales/en_AU/address/state.ts rename to src/locales/en_AU/location/state.ts diff --git a/src/locales/en_AU/address/state_abbr.ts b/src/locales/en_AU/location/state_abbr.ts similarity index 100% rename from src/locales/en_AU/address/state_abbr.ts rename to src/locales/en_AU/location/state_abbr.ts diff --git a/src/locales/en_AU/location/street.ts b/src/locales/en_AU/location/street.ts new file mode 100644 index 00000000000..af32d0c4248 --- /dev/null +++ b/src/locales/en_AU/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', +]; diff --git a/src/locales/en_AU/address/street_suffix.ts b/src/locales/en_AU/location/street_suffix.ts similarity index 100% rename from src/locales/en_AU/address/street_suffix.ts rename to src/locales/en_AU/location/street_suffix.ts diff --git a/src/locales/en_AU_ocker/address/city.ts b/src/locales/en_AU_ocker/address/city.ts deleted file mode 100644 index db6c26ccbd2..00000000000 --- a/src/locales/en_AU_ocker/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_prefix}}']; diff --git a/src/locales/en_AU_ocker/address/street.ts b/src/locales/en_AU_ocker/address/street.ts deleted file mode 100644 index 30ba73fc997..00000000000 --- a/src/locales/en_AU_ocker/address/street.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.street_name}}']; diff --git a/src/locales/en_AU_ocker/index.ts b/src/locales/en_AU_ocker/index.ts index 9dab70cb50e..df9313ca0ad 100644 --- a/src/locales/en_AU_ocker/index.ts +++ b/src/locales/en_AU_ocker/index.ts @@ -3,17 +3,17 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import company from './company'; import internet from './internet'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; const en_AU_ocker: LocaleDefinition = { title: 'English (Australia Ocker)', - address, company, internet, + location, person, phone_number, }; diff --git a/src/locales/en_AU_ocker/address/building_number.ts b/src/locales/en_AU_ocker/location/building_number.ts similarity index 100% rename from src/locales/en_AU_ocker/address/building_number.ts rename to src/locales/en_AU_ocker/location/building_number.ts diff --git a/src/locales/en_AU_ocker/location/city.ts b/src/locales/en_AU_ocker/location/city.ts new file mode 100644 index 00000000000..16c4830e472 --- /dev/null +++ b/src/locales/en_AU_ocker/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_prefix}}']; diff --git a/src/locales/en_AU_ocker/address/city_prefix.ts b/src/locales/en_AU_ocker/location/city_prefix.ts similarity index 100% rename from src/locales/en_AU_ocker/address/city_prefix.ts rename to src/locales/en_AU_ocker/location/city_prefix.ts diff --git a/src/locales/en_AU_ocker/address/default_country.ts b/src/locales/en_AU_ocker/location/default_country.ts similarity index 100% rename from src/locales/en_AU_ocker/address/default_country.ts rename to src/locales/en_AU_ocker/location/default_country.ts diff --git a/src/locales/en_AU_ocker/address/index.ts b/src/locales/en_AU_ocker/location/index.ts similarity index 84% rename from src/locales/en_AU_ocker/address/index.ts rename to src/locales/en_AU_ocker/location/index.ts index 5522e6c785d..1699c653eda 100644 --- a/src/locales/en_AU_ocker/address/index.ts +++ b/src/locales/en_AU_ocker/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_prefix from './city_prefix'; @@ -15,7 +15,7 @@ import street from './street'; import street_name from './street_name'; import street_suffix from './street_suffix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_prefix, @@ -29,4 +29,4 @@ const address: AddressDefinitions = { street_suffix, }; -export default address; +export default location; diff --git a/src/locales/en_AU_ocker/address/postcode.ts b/src/locales/en_AU_ocker/location/postcode.ts similarity index 100% rename from src/locales/en_AU_ocker/address/postcode.ts rename to src/locales/en_AU_ocker/location/postcode.ts diff --git a/src/locales/en_AU_ocker/address/region.ts b/src/locales/en_AU_ocker/location/region.ts similarity index 100% rename from src/locales/en_AU_ocker/address/region.ts rename to src/locales/en_AU_ocker/location/region.ts diff --git a/src/locales/en_AU_ocker/address/state.ts b/src/locales/en_AU_ocker/location/state.ts similarity index 100% rename from src/locales/en_AU_ocker/address/state.ts rename to src/locales/en_AU_ocker/location/state.ts diff --git a/src/locales/en_AU_ocker/address/state_abbr.ts b/src/locales/en_AU_ocker/location/state_abbr.ts similarity index 100% rename from src/locales/en_AU_ocker/address/state_abbr.ts rename to src/locales/en_AU_ocker/location/state_abbr.ts diff --git a/src/locales/en_AU_ocker/location/street.ts b/src/locales/en_AU_ocker/location/street.ts new file mode 100644 index 00000000000..30a9a5ddf99 --- /dev/null +++ b/src/locales/en_AU_ocker/location/street.ts @@ -0,0 +1 @@ +export default ['{{location.street_name}}']; diff --git a/src/locales/en_AU_ocker/address/street_name.ts b/src/locales/en_AU_ocker/location/street_name.ts similarity index 100% rename from src/locales/en_AU_ocker/address/street_name.ts rename to src/locales/en_AU_ocker/location/street_name.ts diff --git a/src/locales/en_AU_ocker/address/street_suffix.ts b/src/locales/en_AU_ocker/location/street_suffix.ts similarity index 100% rename from src/locales/en_AU_ocker/address/street_suffix.ts rename to src/locales/en_AU_ocker/location/street_suffix.ts diff --git a/src/locales/en_CA/address/city.ts b/src/locales/en_CA/address/city.ts deleted file mode 100644 index ea6ea950e46..00000000000 --- a/src/locales/en_CA/address/city.ts +++ /dev/null @@ -1,6 +0,0 @@ -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}}', -]; diff --git a/src/locales/en_CA/address/street.ts b/src/locales/en_CA/address/street.ts deleted file mode 100644 index f7dd9d3b3aa..00000000000 --- a/src/locales/en_CA/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', -]; diff --git a/src/locales/en_CA/index.ts b/src/locales/en_CA/index.ts index dd400c7f6e2..e4ea807f7cd 100644 --- a/src/locales/en_CA/index.ts +++ b/src/locales/en_CA/index.ts @@ -3,14 +3,14 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import internet from './internet'; +import location from './location'; import phone_number from './phone_number'; const en_CA: LocaleDefinition = { title: 'English (Canada)', - address, internet, + location, phone_number, }; diff --git a/src/locales/en_CA/location/city.ts b/src/locales/en_CA/location/city.ts new file mode 100644 index 00000000000..7375aa8378a --- /dev/null +++ b/src/locales/en_CA/location/city.ts @@ -0,0 +1,6 @@ +export default [ + '{{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/address/city_name.ts b/src/locales/en_CA/location/city_name.ts similarity index 100% rename from src/locales/en_CA/address/city_name.ts rename to src/locales/en_CA/location/city_name.ts diff --git a/src/locales/en_CA/address/default_country.ts b/src/locales/en_CA/location/default_country.ts similarity index 100% rename from src/locales/en_CA/address/default_country.ts rename to src/locales/en_CA/location/default_country.ts diff --git a/src/locales/en_IN/address/index.ts b/src/locales/en_CA/location/index.ts similarity index 78% rename from src/locales/en_IN/address/index.ts rename to src/locales/en_CA/location/index.ts index 25d1a04747a..840bad876b8 100644 --- a/src/locales/en_IN/address/index.ts +++ b/src/locales/en_CA/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import city from './city'; import city_name from './city_name'; import default_country from './default_country'; @@ -11,7 +11,7 @@ import state from './state'; import state_abbr from './state_abbr'; import street from './street'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { city, city_name, default_country, @@ -21,4 +21,4 @@ const address: AddressDefinitions = { street, }; -export default address; +export default location; diff --git a/src/locales/en_CA/address/postcode.ts b/src/locales/en_CA/location/postcode.ts similarity index 100% rename from src/locales/en_CA/address/postcode.ts rename to src/locales/en_CA/location/postcode.ts diff --git a/src/locales/en_CA/address/state.ts b/src/locales/en_CA/location/state.ts similarity index 100% rename from src/locales/en_CA/address/state.ts rename to src/locales/en_CA/location/state.ts diff --git a/src/locales/en_CA/address/state_abbr.ts b/src/locales/en_CA/location/state_abbr.ts similarity index 100% rename from src/locales/en_CA/address/state_abbr.ts rename to src/locales/en_CA/location/state_abbr.ts diff --git a/src/locales/en_CA/location/street.ts b/src/locales/en_CA/location/street.ts new file mode 100644 index 00000000000..af32d0c4248 --- /dev/null +++ b/src/locales/en_CA/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', +]; diff --git a/src/locales/en_GB/address/city.ts b/src/locales/en_GB/address/city.ts deleted file mode 100644 index ea6ea950e46..00000000000 --- a/src/locales/en_GB/address/city.ts +++ /dev/null @@ -1,6 +0,0 @@ -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}}', -]; diff --git a/src/locales/en_GB/address/street.ts b/src/locales/en_GB/address/street.ts deleted file mode 100644 index f7dd9d3b3aa..00000000000 --- a/src/locales/en_GB/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', -]; diff --git a/src/locales/en_GB/index.ts b/src/locales/en_GB/index.ts index f138a612bc2..d800b9767ca 100644 --- a/src/locales/en_GB/index.ts +++ b/src/locales/en_GB/index.ts @@ -3,16 +3,16 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import cell_phone from './cell_phone'; import internet from './internet'; +import location from './location'; import phone_number from './phone_number'; const en_GB: LocaleDefinition = { title: 'English (Great Britain)', - address, cell_phone, internet, + location, phone_number, }; diff --git a/src/locales/en_GB/location/city.ts b/src/locales/en_GB/location/city.ts new file mode 100644 index 00000000000..7375aa8378a --- /dev/null +++ b/src/locales/en_GB/location/city.ts @@ -0,0 +1,6 @@ +export default [ + '{{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/address/county.ts b/src/locales/en_GB/location/county.ts similarity index 100% rename from src/locales/en_GB/address/county.ts rename to src/locales/en_GB/location/county.ts diff --git a/src/locales/en_GB/address/default_country.ts b/src/locales/en_GB/location/default_country.ts similarity index 100% rename from src/locales/en_GB/address/default_country.ts rename to src/locales/en_GB/location/default_country.ts diff --git a/src/locales/en_GB/address/index.ts b/src/locales/en_GB/location/index.ts similarity index 76% rename from src/locales/en_GB/address/index.ts rename to src/locales/en_GB/location/index.ts index f31585cee65..6a7064fa214 100644 --- a/src/locales/en_GB/address/index.ts +++ b/src/locales/en_GB/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import city from './city'; import county from './county'; import default_country from './default_country'; @@ -10,7 +10,7 @@ import postcode from './postcode'; import street from './street'; import uk_country from './uk_country'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { city, county, default_country, @@ -19,4 +19,4 @@ const address: AddressDefinitions = { uk_country, }; -export default address; +export default location; diff --git a/src/locales/en_GB/address/postcode.ts b/src/locales/en_GB/location/postcode.ts similarity index 100% rename from src/locales/en_GB/address/postcode.ts rename to src/locales/en_GB/location/postcode.ts diff --git a/src/locales/en_GB/location/street.ts b/src/locales/en_GB/location/street.ts new file mode 100644 index 00000000000..af32d0c4248 --- /dev/null +++ b/src/locales/en_GB/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', +]; diff --git a/src/locales/en_GB/address/uk_country.ts b/src/locales/en_GB/location/uk_country.ts similarity index 100% rename from src/locales/en_GB/address/uk_country.ts rename to src/locales/en_GB/location/uk_country.ts diff --git a/src/locales/en_GH/address/city.ts b/src/locales/en_GH/address/city.ts deleted file mode 100644 index e3da346bd1e..00000000000 --- a/src/locales/en_GH/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_name}}']; diff --git a/src/locales/en_GH/address/street.ts b/src/locales/en_GH/address/street.ts deleted file mode 100644 index 0c511a22161..00000000000 --- a/src/locales/en_GH/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{person.last_name}} {{address.street_suffix}}', - '{{address.street_prefix}} {{address.street_suffix}}', -]; diff --git a/src/locales/en_GH/address/street_address.ts b/src/locales/en_GH/address/street_address.ts deleted file mode 100644 index 55bed3628b9..00000000000 --- a/src/locales/en_GH/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.buildingNumber}} {{address.street}}', - full: '{{address.buildingNumber}} {{address.street}} {{address.secondaryAddress}}', -}; diff --git a/src/locales/en_GH/index.ts b/src/locales/en_GH/index.ts index 0769e50afe5..e6126eb8a37 100644 --- a/src/locales/en_GH/index.ts +++ b/src/locales/en_GH/index.ts @@ -3,17 +3,17 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import company from './company'; import internet from './internet'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; const en_GH: LocaleDefinition = { title: 'English (Ghana)', - address, company, internet, + location, person, phone_number, }; diff --git a/src/locales/en_GH/address/building_number.ts b/src/locales/en_GH/location/building_number.ts similarity index 100% rename from src/locales/en_GH/address/building_number.ts rename to src/locales/en_GH/location/building_number.ts diff --git a/src/locales/en_GH/location/city.ts b/src/locales/en_GH/location/city.ts new file mode 100644 index 00000000000..ad43b68fc5c --- /dev/null +++ b/src/locales/en_GH/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_name}}']; diff --git a/src/locales/en_GH/address/city_name.ts b/src/locales/en_GH/location/city_name.ts similarity index 100% rename from src/locales/en_GH/address/city_name.ts rename to src/locales/en_GH/location/city_name.ts diff --git a/src/locales/en_GH/address/default_country.ts b/src/locales/en_GH/location/default_country.ts similarity index 100% rename from src/locales/en_GH/address/default_country.ts rename to src/locales/en_GH/location/default_country.ts diff --git a/src/locales/en_GH/address/index.ts b/src/locales/en_GH/location/index.ts similarity index 84% rename from src/locales/en_GH/address/index.ts rename to src/locales/en_GH/location/index.ts index 4cec21540ae..32b659ebedc 100644 --- a/src/locales/en_GH/address/index.ts +++ b/src/locales/en_GH/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_name from './city_name'; @@ -14,7 +14,7 @@ import street_address from './street_address'; import street_prefix from './street_prefix'; import street_suffix from './street_suffix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_name, @@ -27,4 +27,4 @@ const address: AddressDefinitions = { street_suffix, }; -export default address; +export default location; diff --git a/src/locales/en_GH/address/postcode.ts b/src/locales/en_GH/location/postcode.ts similarity index 100% rename from src/locales/en_GH/address/postcode.ts rename to src/locales/en_GH/location/postcode.ts diff --git a/src/locales/en_GH/address/state.ts b/src/locales/en_GH/location/state.ts similarity index 100% rename from src/locales/en_GH/address/state.ts rename to src/locales/en_GH/location/state.ts diff --git a/src/locales/en_GH/location/street.ts b/src/locales/en_GH/location/street.ts new file mode 100644 index 00000000000..94323faf368 --- /dev/null +++ b/src/locales/en_GH/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{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 new file mode 100644 index 00000000000..2e1a661d418 --- /dev/null +++ b/src/locales/en_GH/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.buildingNumber}} {{location.street}}', + full: '{{location.buildingNumber}} {{location.street}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/en_GH/address/street_prefix.ts b/src/locales/en_GH/location/street_prefix.ts similarity index 100% rename from src/locales/en_GH/address/street_prefix.ts rename to src/locales/en_GH/location/street_prefix.ts diff --git a/src/locales/en_GH/address/street_suffix.ts b/src/locales/en_GH/location/street_suffix.ts similarity index 100% rename from src/locales/en_GH/address/street_suffix.ts rename to src/locales/en_GH/location/street_suffix.ts diff --git a/src/locales/en_IE/address/city.ts b/src/locales/en_IE/address/city.ts deleted file mode 100644 index ea6ea950e46..00000000000 --- a/src/locales/en_IE/address/city.ts +++ /dev/null @@ -1,6 +0,0 @@ -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}}', -]; diff --git a/src/locales/en_IE/address/street.ts b/src/locales/en_IE/address/street.ts deleted file mode 100644 index f7dd9d3b3aa..00000000000 --- a/src/locales/en_IE/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', -]; diff --git a/src/locales/en_IE/index.ts b/src/locales/en_IE/index.ts index 84527b0e413..5181faef868 100644 --- a/src/locales/en_IE/index.ts +++ b/src/locales/en_IE/index.ts @@ -3,16 +3,16 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import cell_phone from './cell_phone'; import internet from './internet'; +import location from './location'; import phone_number from './phone_number'; const en_IE: LocaleDefinition = { title: 'English (Ireland)', - address, cell_phone, internet, + location, phone_number, }; diff --git a/src/locales/en_IE/location/city.ts b/src/locales/en_IE/location/city.ts new file mode 100644 index 00000000000..7375aa8378a --- /dev/null +++ b/src/locales/en_IE/location/city.ts @@ -0,0 +1,6 @@ +export default [ + '{{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/address/county.ts b/src/locales/en_IE/location/county.ts similarity index 100% rename from src/locales/en_IE/address/county.ts rename to src/locales/en_IE/location/county.ts diff --git a/src/locales/en_IE/address/default_country.ts b/src/locales/en_IE/location/default_country.ts similarity index 100% rename from src/locales/en_IE/address/default_country.ts rename to src/locales/en_IE/location/default_country.ts diff --git a/src/locales/en_IE/address/index.ts b/src/locales/en_IE/location/index.ts similarity index 70% rename from src/locales/en_IE/address/index.ts rename to src/locales/en_IE/location/index.ts index 4fa3a9ba0cd..8db1a9fb8d0 100644 --- a/src/locales/en_IE/address/index.ts +++ b/src/locales/en_IE/location/index.ts @@ -2,17 +2,17 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import city from './city'; import county from './county'; import default_country from './default_country'; import street from './street'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { city, county, default_country, street, }; -export default address; +export default location; diff --git a/src/locales/en_IE/location/street.ts b/src/locales/en_IE/location/street.ts new file mode 100644 index 00000000000..af32d0c4248 --- /dev/null +++ b/src/locales/en_IE/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', +]; diff --git a/src/locales/en_IN/address/city.ts b/src/locales/en_IN/address/city.ts deleted file mode 100644 index e3da346bd1e..00000000000 --- a/src/locales/en_IN/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_name}}']; diff --git a/src/locales/en_IN/address/street.ts b/src/locales/en_IN/address/street.ts deleted file mode 100644 index f7dd9d3b3aa..00000000000 --- a/src/locales/en_IN/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', -]; diff --git a/src/locales/en_IN/index.ts b/src/locales/en_IN/index.ts index 8e92298ca9f..3a99b4238f5 100644 --- a/src/locales/en_IN/index.ts +++ b/src/locales/en_IN/index.ts @@ -3,17 +3,17 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import company from './company'; import internet from './internet'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; const en_IN: LocaleDefinition = { title: 'English (India)', - address, company, internet, + location, person, phone_number, }; diff --git a/src/locales/en_IN/location/city.ts b/src/locales/en_IN/location/city.ts new file mode 100644 index 00000000000..ad43b68fc5c --- /dev/null +++ b/src/locales/en_IN/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_name}}']; diff --git a/src/locales/en_IN/address/city_name.ts b/src/locales/en_IN/location/city_name.ts similarity index 100% rename from src/locales/en_IN/address/city_name.ts rename to src/locales/en_IN/location/city_name.ts diff --git a/src/locales/en_IN/address/default_country.ts b/src/locales/en_IN/location/default_country.ts similarity index 100% rename from src/locales/en_IN/address/default_country.ts rename to src/locales/en_IN/location/default_country.ts diff --git a/src/locales/en_CA/address/index.ts b/src/locales/en_IN/location/index.ts similarity index 78% rename from src/locales/en_CA/address/index.ts rename to src/locales/en_IN/location/index.ts index 25d1a04747a..840bad876b8 100644 --- a/src/locales/en_CA/address/index.ts +++ b/src/locales/en_IN/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import city from './city'; import city_name from './city_name'; import default_country from './default_country'; @@ -11,7 +11,7 @@ import state from './state'; import state_abbr from './state_abbr'; import street from './street'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { city, city_name, default_country, @@ -21,4 +21,4 @@ const address: AddressDefinitions = { street, }; -export default address; +export default location; diff --git a/src/locales/en_IN/address/postcode.ts b/src/locales/en_IN/location/postcode.ts similarity index 100% rename from src/locales/en_IN/address/postcode.ts rename to src/locales/en_IN/location/postcode.ts diff --git a/src/locales/en_IN/address/state.ts b/src/locales/en_IN/location/state.ts similarity index 100% rename from src/locales/en_IN/address/state.ts rename to src/locales/en_IN/location/state.ts diff --git a/src/locales/en_IN/address/state_abbr.ts b/src/locales/en_IN/location/state_abbr.ts similarity index 100% rename from src/locales/en_IN/address/state_abbr.ts rename to src/locales/en_IN/location/state_abbr.ts diff --git a/src/locales/en_IN/location/street.ts b/src/locales/en_IN/location/street.ts new file mode 100644 index 00000000000..af32d0c4248 --- /dev/null +++ b/src/locales/en_IN/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', +]; diff --git a/src/locales/en_NG/address/city.ts b/src/locales/en_NG/address/city.ts deleted file mode 100644 index db6c26ccbd2..00000000000 --- a/src/locales/en_NG/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_prefix}}']; diff --git a/src/locales/en_NG/address/street.ts b/src/locales/en_NG/address/street.ts deleted file mode 100644 index f7dd9d3b3aa..00000000000 --- a/src/locales/en_NG/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', -]; diff --git a/src/locales/en_NG/index.ts b/src/locales/en_NG/index.ts index 7ae85c95a42..91c1c64fa3e 100644 --- a/src/locales/en_NG/index.ts +++ b/src/locales/en_NG/index.ts @@ -3,17 +3,17 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import company from './company'; import internet from './internet'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; const en_NG: LocaleDefinition = { title: 'Nigeria (English)', - address, company, internet, + location, person, phone_number, }; diff --git a/src/locales/en_NG/location/city.ts b/src/locales/en_NG/location/city.ts new file mode 100644 index 00000000000..16c4830e472 --- /dev/null +++ b/src/locales/en_NG/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_prefix}}']; diff --git a/src/locales/en_NG/address/city_prefix.ts b/src/locales/en_NG/location/city_prefix.ts similarity index 100% rename from src/locales/en_NG/address/city_prefix.ts rename to src/locales/en_NG/location/city_prefix.ts diff --git a/src/locales/en_NG/address/default_country.ts b/src/locales/en_NG/location/default_country.ts similarity index 100% rename from src/locales/en_NG/address/default_country.ts rename to src/locales/en_NG/location/default_country.ts diff --git a/src/locales/en_NG/address/index.ts b/src/locales/en_NG/location/index.ts similarity index 76% rename from src/locales/en_NG/address/index.ts rename to src/locales/en_NG/location/index.ts index 69de53aa9e8..2c76e5915ea 100644 --- a/src/locales/en_NG/address/index.ts +++ b/src/locales/en_NG/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import city from './city'; import city_prefix from './city_prefix'; import default_country from './default_country'; @@ -10,7 +10,7 @@ import postcode from './postcode'; import state from './state'; import street from './street'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { city, city_prefix, default_country, @@ -19,4 +19,4 @@ const address: AddressDefinitions = { street, }; -export default address; +export default location; diff --git a/src/locales/en_NG/address/postcode.ts b/src/locales/en_NG/location/postcode.ts similarity index 100% rename from src/locales/en_NG/address/postcode.ts rename to src/locales/en_NG/location/postcode.ts diff --git a/src/locales/en_NG/address/state.ts b/src/locales/en_NG/location/state.ts similarity index 100% rename from src/locales/en_NG/address/state.ts rename to src/locales/en_NG/location/state.ts diff --git a/src/locales/en_NG/location/street.ts b/src/locales/en_NG/location/street.ts new file mode 100644 index 00000000000..af32d0c4248 --- /dev/null +++ b/src/locales/en_NG/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', +]; diff --git a/src/locales/en_US/address/city.ts b/src/locales/en_US/address/city.ts deleted file mode 100644 index ea6ea950e46..00000000000 --- a/src/locales/en_US/address/city.ts +++ /dev/null @@ -1,6 +0,0 @@ -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}}', -]; diff --git a/src/locales/en_US/address/street.ts b/src/locales/en_US/address/street.ts deleted file mode 100644 index f7dd9d3b3aa..00000000000 --- a/src/locales/en_US/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', -]; diff --git a/src/locales/en_US/index.ts b/src/locales/en_US/index.ts index 9714a45d920..727b1f283a6 100644 --- a/src/locales/en_US/index.ts +++ b/src/locales/en_US/index.ts @@ -3,14 +3,14 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import internet from './internet'; +import location from './location'; import phone_number from './phone_number'; const en_US: LocaleDefinition = { title: 'English (United States)', - address, internet, + location, phone_number, }; diff --git a/src/locales/en_US/location/city.ts b/src/locales/en_US/location/city.ts new file mode 100644 index 00000000000..7375aa8378a --- /dev/null +++ b/src/locales/en_US/location/city.ts @@ -0,0 +1,6 @@ +export default [ + '{{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/address/default_country.ts b/src/locales/en_US/location/default_country.ts similarity index 100% rename from src/locales/en_US/address/default_country.ts rename to src/locales/en_US/location/default_country.ts diff --git a/src/locales/en_US/address/index.ts b/src/locales/en_US/location/index.ts similarity index 72% rename from src/locales/en_US/address/index.ts rename to src/locales/en_US/location/index.ts index 7f09f5acf01..a2415a8c4f1 100644 --- a/src/locales/en_US/address/index.ts +++ b/src/locales/en_US/location/index.ts @@ -2,17 +2,17 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import city from './city'; import default_country from './default_country'; import postcode_by_state from './postcode_by_state'; import street from './street'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { city, default_country, postcode_by_state, street, }; -export default address; +export default location; diff --git a/src/locales/en_US/address/postcode_by_state.ts b/src/locales/en_US/location/postcode_by_state.ts similarity index 100% rename from src/locales/en_US/address/postcode_by_state.ts rename to src/locales/en_US/location/postcode_by_state.ts diff --git a/src/locales/en_US/location/street.ts b/src/locales/en_US/location/street.ts new file mode 100644 index 00000000000..af32d0c4248 --- /dev/null +++ b/src/locales/en_US/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', +]; diff --git a/src/locales/en_ZA/address/city.ts b/src/locales/en_ZA/address/city.ts deleted file mode 100644 index db6c26ccbd2..00000000000 --- a/src/locales/en_ZA/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_prefix}}']; diff --git a/src/locales/en_ZA/address/street.ts b/src/locales/en_ZA/address/street.ts deleted file mode 100644 index f7dd9d3b3aa..00000000000 --- a/src/locales/en_ZA/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', -]; diff --git a/src/locales/en_ZA/index.ts b/src/locales/en_ZA/index.ts index 114c9c0c5ad..17da07a9a86 100644 --- a/src/locales/en_ZA/index.ts +++ b/src/locales/en_ZA/index.ts @@ -3,19 +3,19 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import cell_phone from './cell_phone'; import company from './company'; import internet from './internet'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; const en_ZA: LocaleDefinition = { title: 'English (South Africa)', - address, cell_phone, company, internet, + location, person, phone_number, }; diff --git a/src/locales/en_ZA/location/city.ts b/src/locales/en_ZA/location/city.ts new file mode 100644 index 00000000000..16c4830e472 --- /dev/null +++ b/src/locales/en_ZA/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_prefix}}']; diff --git a/src/locales/en_ZA/address/city_prefix.ts b/src/locales/en_ZA/location/city_prefix.ts similarity index 100% rename from src/locales/en_ZA/address/city_prefix.ts rename to src/locales/en_ZA/location/city_prefix.ts diff --git a/src/locales/en_ZA/address/default_country.ts b/src/locales/en_ZA/location/default_country.ts similarity index 100% rename from src/locales/en_ZA/address/default_country.ts rename to src/locales/en_ZA/location/default_country.ts diff --git a/src/locales/en_ZA/address/index.ts b/src/locales/en_ZA/location/index.ts similarity index 76% rename from src/locales/en_ZA/address/index.ts rename to src/locales/en_ZA/location/index.ts index 69de53aa9e8..2c76e5915ea 100644 --- a/src/locales/en_ZA/address/index.ts +++ b/src/locales/en_ZA/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import city from './city'; import city_prefix from './city_prefix'; import default_country from './default_country'; @@ -10,7 +10,7 @@ import postcode from './postcode'; import state from './state'; import street from './street'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { city, city_prefix, default_country, @@ -19,4 +19,4 @@ const address: AddressDefinitions = { street, }; -export default address; +export default location; diff --git a/src/locales/en_ZA/address/postcode.ts b/src/locales/en_ZA/location/postcode.ts similarity index 100% rename from src/locales/en_ZA/address/postcode.ts rename to src/locales/en_ZA/location/postcode.ts diff --git a/src/locales/en_ZA/address/state.ts b/src/locales/en_ZA/location/state.ts similarity index 100% rename from src/locales/en_ZA/address/state.ts rename to src/locales/en_ZA/location/state.ts diff --git a/src/locales/en_ZA/location/street.ts b/src/locales/en_ZA/location/street.ts new file mode 100644 index 00000000000..af32d0c4248 --- /dev/null +++ b/src/locales/en_ZA/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', +]; diff --git a/src/locales/es/address/city.ts b/src/locales/es/address/city.ts deleted file mode 100644 index db6c26ccbd2..00000000000 --- a/src/locales/es/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_prefix}}']; diff --git a/src/locales/es/address/street.ts b/src/locales/es/address/street.ts deleted file mode 100644 index 36db82de5f0..00000000000 --- a/src/locales/es/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{address.street_suffix}} {{person.first_name}}', - '{{address.street_suffix}} {{person.first_name}} {{person.last_name}}', -]; diff --git a/src/locales/es/address/street_address.ts b/src/locales/es/address/street_address.ts deleted file mode 100644 index 23d3d2c1612..00000000000 --- a/src/locales/es/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}}{{address.buildingNumber}}', - full: '{{address.street}}{{address.buildingNumber}} {{address.secondaryAddress}}', -}; diff --git a/src/locales/es/index.ts b/src/locales/es/index.ts index 04b72f8e512..4d583dfae00 100644 --- a/src/locales/es/index.ts +++ b/src/locales/es/index.ts @@ -3,25 +3,25 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import cell_phone from './cell_phone'; import color from './color'; import commerce from './commerce'; import company from './company'; import date from './date'; import internet from './internet'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; const es: LocaleDefinition = { title: 'Spanish', - address, cell_phone, color, commerce, company, date, internet, + location, person, phone_number, }; diff --git a/src/locales/es/address/building_number.ts b/src/locales/es/location/building_number.ts similarity index 100% rename from src/locales/es/address/building_number.ts rename to src/locales/es/location/building_number.ts diff --git a/src/locales/es/location/city.ts b/src/locales/es/location/city.ts new file mode 100644 index 00000000000..16c4830e472 --- /dev/null +++ b/src/locales/es/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_prefix}}']; diff --git a/src/locales/es/address/city_prefix.ts b/src/locales/es/location/city_prefix.ts similarity index 100% rename from src/locales/es/address/city_prefix.ts rename to src/locales/es/location/city_prefix.ts diff --git a/src/locales/es/address/country.ts b/src/locales/es/location/country.ts similarity index 100% rename from src/locales/es/address/country.ts rename to src/locales/es/location/country.ts diff --git a/src/locales/es/address/default_country.ts b/src/locales/es/location/default_country.ts similarity index 100% rename from src/locales/es/address/default_country.ts rename to src/locales/es/location/default_country.ts diff --git a/src/locales/es/address/index.ts b/src/locales/es/location/index.ts similarity index 87% rename from src/locales/es/address/index.ts rename to src/locales/es/location/index.ts index db958157d0f..5d589f9c904 100644 --- a/src/locales/es/address/index.ts +++ b/src/locales/es/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_prefix from './city_prefix'; @@ -18,7 +18,7 @@ import street_address from './street_address'; import street_suffix from './street_suffix'; import time_zone from './time_zone'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_prefix, @@ -35,4 +35,4 @@ const address: AddressDefinitions = { time_zone, }; -export default address; +export default location; diff --git a/src/locales/es/address/postcode.ts b/src/locales/es/location/postcode.ts similarity index 100% rename from src/locales/es/address/postcode.ts rename to src/locales/es/location/postcode.ts diff --git a/src/locales/es/address/province.ts b/src/locales/es/location/province.ts similarity index 100% rename from src/locales/es/address/province.ts rename to src/locales/es/location/province.ts diff --git a/src/locales/es/address/secondary_address.ts b/src/locales/es/location/secondary_address.ts similarity index 100% rename from src/locales/es/address/secondary_address.ts rename to src/locales/es/location/secondary_address.ts diff --git a/src/locales/es/address/state.ts b/src/locales/es/location/state.ts similarity index 100% rename from src/locales/es/address/state.ts rename to src/locales/es/location/state.ts diff --git a/src/locales/es/address/state_abbr.ts b/src/locales/es/location/state_abbr.ts similarity index 100% rename from src/locales/es/address/state_abbr.ts rename to src/locales/es/location/state_abbr.ts diff --git a/src/locales/es/location/street.ts b/src/locales/es/location/street.ts new file mode 100644 index 00000000000..8454afa1f8f --- /dev/null +++ b/src/locales/es/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{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 new file mode 100644 index 00000000000..1b8de3d3d69 --- /dev/null +++ b/src/locales/es/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}}{{location.buildingNumber}}', + full: '{{location.street}}{{location.buildingNumber}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/es/address/street_suffix.ts b/src/locales/es/location/street_suffix.ts similarity index 100% rename from src/locales/es/address/street_suffix.ts rename to src/locales/es/location/street_suffix.ts diff --git a/src/locales/es/address/time_zone.ts b/src/locales/es/location/time_zone.ts similarity index 100% rename from src/locales/es/address/time_zone.ts rename to src/locales/es/location/time_zone.ts diff --git a/src/locales/es_MX/address/city.ts b/src/locales/es_MX/address/city.ts deleted file mode 100644 index db6c26ccbd2..00000000000 --- a/src/locales/es_MX/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_prefix}}']; diff --git a/src/locales/es_MX/address/street.ts b/src/locales/es_MX/address/street.ts deleted file mode 100644 index c831c9857b0..00000000000 --- a/src/locales/es_MX/address/street.ts +++ /dev/null @@ -1,5 +0,0 @@ -export default [ - '{{address.street_suffix}} {{person.first_name}}', - '{{address.street_suffix}} {{person.first_name}} {{person.last_name}}', - '{{address.street_suffix}} {{address.street_name}}', -]; diff --git a/src/locales/es_MX/address/street_address.ts b/src/locales/es_MX/address/street_address.ts deleted file mode 100644 index 23d3d2c1612..00000000000 --- a/src/locales/es_MX/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}}{{address.buildingNumber}}', - full: '{{address.street}}{{address.buildingNumber}} {{address.secondaryAddress}}', -}; diff --git a/src/locales/es_MX/index.ts b/src/locales/es_MX/index.ts index 27d43de0f4a..ef6ac63bd0d 100644 --- a/src/locales/es_MX/index.ts +++ b/src/locales/es_MX/index.ts @@ -3,12 +3,12 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import cell_phone from './cell_phone'; import color from './color'; import commerce from './commerce'; import company from './company'; import internet from './internet'; +import location from './location'; import lorem from './lorem'; import person from './person'; import phone_number from './phone_number'; @@ -17,12 +17,12 @@ import team from './team'; const es_MX: LocaleDefinition = { title: 'Spanish (Mexico)', separator: ' & ', - address, cell_phone, color, commerce, company, internet, + location, lorem, person, phone_number, diff --git a/src/locales/es_MX/address/building_number.ts b/src/locales/es_MX/location/building_number.ts similarity index 100% rename from src/locales/es_MX/address/building_number.ts rename to src/locales/es_MX/location/building_number.ts diff --git a/src/locales/es_MX/location/city.ts b/src/locales/es_MX/location/city.ts new file mode 100644 index 00000000000..16c4830e472 --- /dev/null +++ b/src/locales/es_MX/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_prefix}}']; diff --git a/src/locales/es_MX/address/city_prefix.ts b/src/locales/es_MX/location/city_prefix.ts similarity index 100% rename from src/locales/es_MX/address/city_prefix.ts rename to src/locales/es_MX/location/city_prefix.ts diff --git a/src/locales/es_MX/address/city_suffix.ts b/src/locales/es_MX/location/city_suffix.ts similarity index 100% rename from src/locales/es_MX/address/city_suffix.ts rename to src/locales/es_MX/location/city_suffix.ts diff --git a/src/locales/es_MX/address/country.ts b/src/locales/es_MX/location/country.ts similarity index 100% rename from src/locales/es_MX/address/country.ts rename to src/locales/es_MX/location/country.ts diff --git a/src/locales/es_MX/address/default_country.ts b/src/locales/es_MX/location/default_country.ts similarity index 100% rename from src/locales/es_MX/address/default_country.ts rename to src/locales/es_MX/location/default_country.ts diff --git a/src/locales/es_MX/address/index.ts b/src/locales/es_MX/location/index.ts similarity index 88% rename from src/locales/es_MX/address/index.ts rename to src/locales/es_MX/location/index.ts index a23b16099e0..c0728fac1ec 100644 --- a/src/locales/es_MX/address/index.ts +++ b/src/locales/es_MX/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_prefix from './city_prefix'; @@ -19,7 +19,7 @@ import street_name from './street_name'; import street_suffix from './street_suffix'; import time_zone from './time_zone'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_prefix, @@ -37,4 +37,4 @@ const address: AddressDefinitions = { time_zone, }; -export default address; +export default location; diff --git a/src/locales/es_MX/address/postcode.ts b/src/locales/es_MX/location/postcode.ts similarity index 100% rename from src/locales/es_MX/address/postcode.ts rename to src/locales/es_MX/location/postcode.ts diff --git a/src/locales/es_MX/address/secondary_address.ts b/src/locales/es_MX/location/secondary_address.ts similarity index 100% rename from src/locales/es_MX/address/secondary_address.ts rename to src/locales/es_MX/location/secondary_address.ts diff --git a/src/locales/es_MX/address/state.ts b/src/locales/es_MX/location/state.ts similarity index 100% rename from src/locales/es_MX/address/state.ts rename to src/locales/es_MX/location/state.ts diff --git a/src/locales/es_MX/address/state_abbr.ts b/src/locales/es_MX/location/state_abbr.ts similarity index 100% rename from src/locales/es_MX/address/state_abbr.ts rename to src/locales/es_MX/location/state_abbr.ts diff --git a/src/locales/es_MX/location/street.ts b/src/locales/es_MX/location/street.ts new file mode 100644 index 00000000000..a5b7686e731 --- /dev/null +++ b/src/locales/es_MX/location/street.ts @@ -0,0 +1,5 @@ +export default [ + '{{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 new file mode 100644 index 00000000000..1b8de3d3d69 --- /dev/null +++ b/src/locales/es_MX/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}}{{location.buildingNumber}}', + full: '{{location.street}}{{location.buildingNumber}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/es_MX/address/street_name.ts b/src/locales/es_MX/location/street_name.ts similarity index 100% rename from src/locales/es_MX/address/street_name.ts rename to src/locales/es_MX/location/street_name.ts diff --git a/src/locales/es_MX/address/street_suffix.ts b/src/locales/es_MX/location/street_suffix.ts similarity index 100% rename from src/locales/es_MX/address/street_suffix.ts rename to src/locales/es_MX/location/street_suffix.ts diff --git a/src/locales/es_MX/address/time_zone.ts b/src/locales/es_MX/location/time_zone.ts similarity index 100% rename from src/locales/es_MX/address/time_zone.ts rename to src/locales/es_MX/location/time_zone.ts 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/address/city.ts b/src/locales/fa/address/city.ts deleted file mode 100644 index e3da346bd1e..00000000000 --- a/src/locales/fa/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_name}}']; diff --git a/src/locales/fa/address/street.ts b/src/locales/fa/address/street.ts deleted file mode 100644 index 249fca8630b..00000000000 --- a/src/locales/fa/address/street.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.street_prefix}} {{address.street_suffix}}']; diff --git a/src/locales/fa/address/street_address.ts b/src/locales/fa/address/street_address.ts deleted file mode 100644 index a7f306b54c4..00000000000 --- a/src/locales/fa/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}}, پلاک {{address.buildingNumber}}', - full: '{{address.street}}, پلاک {{address.buildingNumber}} {{address.secondaryAddress}}', -}; diff --git a/src/locales/fa/index.ts b/src/locales/fa/index.ts index 27755669b5f..cb3e8f80082 100644 --- a/src/locales/fa/index.ts +++ b/src/locales/fa/index.ts @@ -3,7 +3,6 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import cell_phone from './cell_phone'; import color from './color'; import commerce from './commerce'; @@ -11,6 +10,7 @@ import company from './company'; import date from './date'; import finance from './finance'; import internet from './internet'; +import location from './location'; import lorem from './lorem'; import person from './person'; import phone_number from './phone_number'; @@ -18,7 +18,6 @@ import vehicle from './vehicle'; const fa: LocaleDefinition = { title: 'Farsi', - address, cell_phone, color, commerce, @@ -26,6 +25,7 @@ const fa: LocaleDefinition = { date, finance, internet, + location, lorem, person, phone_number, diff --git a/src/locales/fa/address/building_number.ts b/src/locales/fa/location/building_number.ts similarity index 100% rename from src/locales/fa/address/building_number.ts rename to src/locales/fa/location/building_number.ts diff --git a/src/locales/fa/location/city.ts b/src/locales/fa/location/city.ts new file mode 100644 index 00000000000..ad43b68fc5c --- /dev/null +++ b/src/locales/fa/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_name}}']; diff --git a/src/locales/fa/address/city_name.ts b/src/locales/fa/location/city_name.ts similarity index 100% rename from src/locales/fa/address/city_name.ts rename to src/locales/fa/location/city_name.ts diff --git a/src/locales/fa/address/city_prefix.ts b/src/locales/fa/location/city_prefix.ts similarity index 100% rename from src/locales/fa/address/city_prefix.ts rename to src/locales/fa/location/city_prefix.ts diff --git a/src/locales/fa/address/city_suffix.ts b/src/locales/fa/location/city_suffix.ts similarity index 100% rename from src/locales/fa/address/city_suffix.ts rename to src/locales/fa/location/city_suffix.ts diff --git a/src/locales/fa/address/country.ts b/src/locales/fa/location/country.ts similarity index 100% rename from src/locales/fa/address/country.ts rename to src/locales/fa/location/country.ts diff --git a/src/locales/fa/address/default_country.ts b/src/locales/fa/location/default_country.ts similarity index 100% rename from src/locales/fa/address/default_country.ts rename to src/locales/fa/location/default_country.ts diff --git a/src/locales/fa/address/direction.ts b/src/locales/fa/location/direction.ts similarity index 100% rename from src/locales/fa/address/direction.ts rename to src/locales/fa/location/direction.ts diff --git a/src/locales/fa/address/index.ts b/src/locales/fa/location/index.ts similarity index 88% rename from src/locales/fa/address/index.ts rename to src/locales/fa/location/index.ts index e6b93a65555..9b50f3a0385 100644 --- a/src/locales/fa/address/index.ts +++ b/src/locales/fa/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_name from './city_name'; @@ -19,7 +19,7 @@ import street_address from './street_address'; import street_prefix from './street_prefix'; import street_suffix from './street_suffix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_name, @@ -37,4 +37,4 @@ const address: AddressDefinitions = { street_suffix, }; -export default address; +export default location; diff --git a/src/locales/fa/address/postcode.ts b/src/locales/fa/location/postcode.ts similarity index 100% rename from src/locales/fa/address/postcode.ts rename to src/locales/fa/location/postcode.ts diff --git a/src/locales/fa/address/secondary_address.ts b/src/locales/fa/location/secondary_address.ts similarity index 100% rename from src/locales/fa/address/secondary_address.ts rename to src/locales/fa/location/secondary_address.ts diff --git a/src/locales/fa/address/state.ts b/src/locales/fa/location/state.ts similarity index 100% rename from src/locales/fa/address/state.ts rename to src/locales/fa/location/state.ts diff --git a/src/locales/fa/location/street.ts b/src/locales/fa/location/street.ts new file mode 100644 index 00000000000..f62f53f0931 --- /dev/null +++ b/src/locales/fa/location/street.ts @@ -0,0 +1 @@ +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 new file mode 100644 index 00000000000..eec0e19923e --- /dev/null +++ b/src/locales/fa/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}}, پلاک {{location.buildingNumber}}', + full: '{{location.street}}, پلاک {{location.buildingNumber}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/fa/address/street_prefix.ts b/src/locales/fa/location/street_prefix.ts similarity index 100% rename from src/locales/fa/address/street_prefix.ts rename to src/locales/fa/location/street_prefix.ts diff --git a/src/locales/fa/address/street_suffix.ts b/src/locales/fa/location/street_suffix.ts similarity index 100% rename from src/locales/fa/address/street_suffix.ts rename to src/locales/fa/location/street_suffix.ts diff --git a/src/locales/fr/address/city.ts b/src/locales/fr/address/city.ts deleted file mode 100644 index e3da346bd1e..00000000000 --- a/src/locales/fr/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_name}}']; diff --git a/src/locales/fr/address/street.ts b/src/locales/fr/address/street.ts deleted file mode 100644 index 249fca8630b..00000000000 --- a/src/locales/fr/address/street.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.street_prefix}} {{address.street_suffix}}']; diff --git a/src/locales/fr/address/street_address.ts b/src/locales/fr/address/street_address.ts deleted file mode 100644 index 55bed3628b9..00000000000 --- a/src/locales/fr/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.buildingNumber}} {{address.street}}', - full: '{{address.buildingNumber}} {{address.street}} {{address.secondaryAddress}}', -}; diff --git a/src/locales/fr/index.ts b/src/locales/fr/index.ts index 9beebf7f4cd..102d680cf3d 100644 --- a/src/locales/fr/index.ts +++ b/src/locales/fr/index.ts @@ -3,7 +3,6 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import animal from './animal'; import color from './color'; import commerce from './commerce'; @@ -11,6 +10,7 @@ import company from './company'; import date from './date'; import finance from './finance'; import internet from './internet'; +import location from './location'; import lorem from './lorem'; import music from './music'; import person from './person'; @@ -20,7 +20,6 @@ import word from './word'; const fr: LocaleDefinition = { title: 'French', - address, animal, color, commerce, @@ -28,6 +27,7 @@ const fr: LocaleDefinition = { date, finance, internet, + location, lorem, music, person, diff --git a/src/locales/fr/address/building_number.ts b/src/locales/fr/location/building_number.ts similarity index 100% rename from src/locales/fr/address/building_number.ts rename to src/locales/fr/location/building_number.ts diff --git a/src/locales/fr/location/city.ts b/src/locales/fr/location/city.ts new file mode 100644 index 00000000000..ad43b68fc5c --- /dev/null +++ b/src/locales/fr/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_name}}']; diff --git a/src/locales/fr/address/city_name.ts b/src/locales/fr/location/city_name.ts similarity index 100% rename from src/locales/fr/address/city_name.ts rename to src/locales/fr/location/city_name.ts diff --git a/src/locales/fr/address/country.ts b/src/locales/fr/location/country.ts similarity index 100% rename from src/locales/fr/address/country.ts rename to src/locales/fr/location/country.ts diff --git a/src/locales/fr/address/default_country.ts b/src/locales/fr/location/default_country.ts similarity index 100% rename from src/locales/fr/address/default_country.ts rename to src/locales/fr/location/default_country.ts diff --git a/src/locales/fr/address/direction.ts b/src/locales/fr/location/direction.ts similarity index 100% rename from src/locales/fr/address/direction.ts rename to src/locales/fr/location/direction.ts diff --git a/src/locales/fr/address/index.ts b/src/locales/fr/location/index.ts similarity index 87% rename from src/locales/fr/address/index.ts rename to src/locales/fr/location/index.ts index c88d26dcb94..9beb335b5c9 100644 --- a/src/locales/fr/address/index.ts +++ b/src/locales/fr/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_name from './city_name'; @@ -17,7 +17,7 @@ import street_address from './street_address'; import street_prefix from './street_prefix'; import street_suffix from './street_suffix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_name, @@ -33,4 +33,4 @@ const address: AddressDefinitions = { street_suffix, }; -export default address; +export default location; diff --git a/src/locales/fr/address/postcode.ts b/src/locales/fr/location/postcode.ts similarity index 100% rename from src/locales/fr/address/postcode.ts rename to src/locales/fr/location/postcode.ts diff --git a/src/locales/fr/address/secondary_address.ts b/src/locales/fr/location/secondary_address.ts similarity index 100% rename from src/locales/fr/address/secondary_address.ts rename to src/locales/fr/location/secondary_address.ts diff --git a/src/locales/fr/address/state.ts b/src/locales/fr/location/state.ts similarity index 100% rename from src/locales/fr/address/state.ts rename to src/locales/fr/location/state.ts diff --git a/src/locales/fr/location/street.ts b/src/locales/fr/location/street.ts new file mode 100644 index 00000000000..f62f53f0931 --- /dev/null +++ b/src/locales/fr/location/street.ts @@ -0,0 +1 @@ +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 new file mode 100644 index 00000000000..2e1a661d418 --- /dev/null +++ b/src/locales/fr/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.buildingNumber}} {{location.street}}', + full: '{{location.buildingNumber}} {{location.street}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/fr/address/street_prefix.ts b/src/locales/fr/location/street_prefix.ts similarity index 100% rename from src/locales/fr/address/street_prefix.ts rename to src/locales/fr/location/street_prefix.ts diff --git a/src/locales/fr/address/street_suffix.ts b/src/locales/fr/location/street_suffix.ts similarity index 100% rename from src/locales/fr/address/street_suffix.ts rename to src/locales/fr/location/street_suffix.ts diff --git a/src/locales/fr_BE/address/city.ts b/src/locales/fr_BE/address/city.ts deleted file mode 100644 index 5eaa0e417c3..00000000000 --- a/src/locales/fr_BE/address/city.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{address.city_prefix}}', - '{{address.city_prefix}}{{address.city_suffix}}', -]; diff --git a/src/locales/fr_BE/address/street.ts b/src/locales/fr_BE/address/street.ts deleted file mode 100644 index 00c17d59447..00000000000 --- a/src/locales/fr_BE/address/street.ts +++ /dev/null @@ -1,5 +0,0 @@ -export default [ - '{{address.street_prefix}} {{person.first_name}}', - '{{address.street_prefix}} {{person.last_name}}', - '{{address.street_prefix}} {{address.street_suffix}}', -]; diff --git a/src/locales/fr_BE/address/street_address.ts b/src/locales/fr_BE/address/street_address.ts deleted file mode 100644 index d1e8da38725..00000000000 --- a/src/locales/fr_BE/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', -}; diff --git a/src/locales/fr_BE/index.ts b/src/locales/fr_BE/index.ts index ed7167dffa0..cfbcf64bec2 100644 --- a/src/locales/fr_BE/index.ts +++ b/src/locales/fr_BE/index.ts @@ -3,17 +3,17 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import cell_phone from './cell_phone'; import internet from './internet'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; const fr_BE: LocaleDefinition = { title: 'Français (Belgique)', - address, cell_phone, internet, + location, person, phone_number, }; diff --git a/src/locales/fr_BE/address/building_number.ts b/src/locales/fr_BE/location/building_number.ts similarity index 100% rename from src/locales/fr_BE/address/building_number.ts rename to src/locales/fr_BE/location/building_number.ts diff --git a/src/locales/fr_BE/location/city.ts b/src/locales/fr_BE/location/city.ts new file mode 100644 index 00000000000..2bddf0f5f12 --- /dev/null +++ b/src/locales/fr_BE/location/city.ts @@ -0,0 +1,4 @@ +export default [ + '{{location.city_prefix}}', + '{{location.city_prefix}}{{location.city_suffix}}', +]; diff --git a/src/locales/fr_BE/address/city_prefix.ts b/src/locales/fr_BE/location/city_prefix.ts similarity index 100% rename from src/locales/fr_BE/address/city_prefix.ts rename to src/locales/fr_BE/location/city_prefix.ts diff --git a/src/locales/fr_BE/address/city_suffix.ts b/src/locales/fr_BE/location/city_suffix.ts similarity index 100% rename from src/locales/fr_BE/address/city_suffix.ts rename to src/locales/fr_BE/location/city_suffix.ts diff --git a/src/locales/fr_BE/address/default_country.ts b/src/locales/fr_BE/location/default_country.ts similarity index 100% rename from src/locales/fr_BE/address/default_country.ts rename to src/locales/fr_BE/location/default_country.ts diff --git a/src/locales/fr_BE/address/index.ts b/src/locales/fr_BE/location/index.ts similarity index 86% rename from src/locales/fr_BE/address/index.ts rename to src/locales/fr_BE/location/index.ts index 4c7a5896e9e..3ce44af55d0 100644 --- a/src/locales/fr_BE/address/index.ts +++ b/src/locales/fr_BE/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_prefix from './city_prefix'; @@ -16,7 +16,7 @@ import street_address from './street_address'; import street_prefix from './street_prefix'; import street_suffix from './street_suffix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_prefix, @@ -31,4 +31,4 @@ const address: AddressDefinitions = { street_suffix, }; -export default address; +export default location; diff --git a/src/locales/fr_BE/address/postcode.ts b/src/locales/fr_BE/location/postcode.ts similarity index 100% rename from src/locales/fr_BE/address/postcode.ts rename to src/locales/fr_BE/location/postcode.ts diff --git a/src/locales/fr_BE/address/state.ts b/src/locales/fr_BE/location/state.ts similarity index 100% rename from src/locales/fr_BE/address/state.ts rename to src/locales/fr_BE/location/state.ts diff --git a/src/locales/fr_BE/address/state_abbr.ts b/src/locales/fr_BE/location/state_abbr.ts similarity index 100% rename from src/locales/fr_BE/address/state_abbr.ts rename to src/locales/fr_BE/location/state_abbr.ts diff --git a/src/locales/fr_BE/location/street.ts b/src/locales/fr_BE/location/street.ts new file mode 100644 index 00000000000..47e60b56699 --- /dev/null +++ b/src/locales/fr_BE/location/street.ts @@ -0,0 +1,5 @@ +export default [ + '{{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 new file mode 100644 index 00000000000..437f20dd91a --- /dev/null +++ b/src/locales/fr_BE/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/fr_BE/address/street_prefix.ts b/src/locales/fr_BE/location/street_prefix.ts similarity index 100% rename from src/locales/fr_BE/address/street_prefix.ts rename to src/locales/fr_BE/location/street_prefix.ts diff --git a/src/locales/fr_BE/address/street_suffix.ts b/src/locales/fr_BE/location/street_suffix.ts similarity index 100% rename from src/locales/fr_BE/address/street_suffix.ts rename to src/locales/fr_BE/location/street_suffix.ts diff --git a/src/locales/fr_CA/address/city.ts b/src/locales/fr_CA/address/city.ts deleted file mode 100644 index ea6ea950e46..00000000000 --- a/src/locales/fr_CA/address/city.ts +++ /dev/null @@ -1,6 +0,0 @@ -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}}', -]; diff --git a/src/locales/fr_CA/address/street.ts b/src/locales/fr_CA/address/street.ts deleted file mode 100644 index f7dd9d3b3aa..00000000000 --- a/src/locales/fr_CA/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', -]; diff --git a/src/locales/fr_CA/index.ts b/src/locales/fr_CA/index.ts index e093f895f58..fff977a9cf3 100644 --- a/src/locales/fr_CA/index.ts +++ b/src/locales/fr_CA/index.ts @@ -3,14 +3,14 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import internet from './internet'; +import location from './location'; import phone_number from './phone_number'; const fr_CA: LocaleDefinition = { title: 'French (Canada)', - address, internet, + location, phone_number, }; diff --git a/src/locales/fr_CA/location/city.ts b/src/locales/fr_CA/location/city.ts new file mode 100644 index 00000000000..7375aa8378a --- /dev/null +++ b/src/locales/fr_CA/location/city.ts @@ -0,0 +1,6 @@ +export default [ + '{{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/address/default_country.ts b/src/locales/fr_CA/location/default_country.ts similarity index 100% rename from src/locales/fr_CA/address/default_country.ts rename to src/locales/fr_CA/location/default_country.ts diff --git a/src/locales/fr_CA/address/index.ts b/src/locales/fr_CA/location/index.ts similarity index 76% rename from src/locales/fr_CA/address/index.ts rename to src/locales/fr_CA/location/index.ts index f606bbc3c36..c685ad07de5 100644 --- a/src/locales/fr_CA/address/index.ts +++ b/src/locales/fr_CA/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import city from './city'; import default_country from './default_country'; import postcode from './postcode'; @@ -10,7 +10,7 @@ import state from './state'; import state_abbr from './state_abbr'; import street from './street'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { city, default_country, postcode, @@ -19,4 +19,4 @@ const address: AddressDefinitions = { street, }; -export default address; +export default location; diff --git a/src/locales/fr_CA/address/postcode.ts b/src/locales/fr_CA/location/postcode.ts similarity index 100% rename from src/locales/fr_CA/address/postcode.ts rename to src/locales/fr_CA/location/postcode.ts diff --git a/src/locales/fr_CA/address/state.ts b/src/locales/fr_CA/location/state.ts similarity index 100% rename from src/locales/fr_CA/address/state.ts rename to src/locales/fr_CA/location/state.ts diff --git a/src/locales/fr_CA/address/state_abbr.ts b/src/locales/fr_CA/location/state_abbr.ts similarity index 100% rename from src/locales/fr_CA/address/state_abbr.ts rename to src/locales/fr_CA/location/state_abbr.ts diff --git a/src/locales/fr_CA/location/street.ts b/src/locales/fr_CA/location/street.ts new file mode 100644 index 00000000000..af32d0c4248 --- /dev/null +++ b/src/locales/fr_CA/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', +]; diff --git a/src/locales/fr_CH/address/city.ts b/src/locales/fr_CH/address/city.ts deleted file mode 100644 index e3da346bd1e..00000000000 --- a/src/locales/fr_CH/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_name}}']; diff --git a/src/locales/fr_CH/address/street.ts b/src/locales/fr_CH/address/street.ts deleted file mode 100644 index 249fca8630b..00000000000 --- a/src/locales/fr_CH/address/street.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.street_prefix}} {{address.street_suffix}}']; diff --git a/src/locales/fr_CH/address/street_address.ts b/src/locales/fr_CH/address/street_address.ts deleted file mode 100644 index d6c5878a730..00000000000 --- a/src/locales/fr_CH/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.buildingNumber}} {{address.streetName}}', - full: '{{address.buildingNumber}} {{address.streetName}} {{address.secondaryAddress}}', -}; diff --git a/src/locales/fr_CH/index.ts b/src/locales/fr_CH/index.ts index 39f607f6962..1543c8c29e2 100644 --- a/src/locales/fr_CH/index.ts +++ b/src/locales/fr_CH/index.ts @@ -3,7 +3,6 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import animal from './animal'; import cell_phone from './cell_phone'; import color from './color'; @@ -11,6 +10,7 @@ import commerce from './commerce'; import date from './date'; import finance from './finance'; import internet from './internet'; +import location from './location'; import lorem from './lorem'; import music from './music'; import person from './person'; @@ -20,7 +20,6 @@ import word from './word'; const fr_CH: LocaleDefinition = { title: 'French (Switzerland)', - address, animal, cell_phone, color, @@ -28,6 +27,7 @@ const fr_CH: LocaleDefinition = { date, finance, internet, + location, lorem, music, person, diff --git a/src/locales/fr_CH/address/building_number.ts b/src/locales/fr_CH/location/building_number.ts similarity index 100% rename from src/locales/fr_CH/address/building_number.ts rename to src/locales/fr_CH/location/building_number.ts diff --git a/src/locales/fr_CH/location/city.ts b/src/locales/fr_CH/location/city.ts new file mode 100644 index 00000000000..ad43b68fc5c --- /dev/null +++ b/src/locales/fr_CH/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_name}}']; diff --git a/src/locales/fr_CH/address/city_name.ts b/src/locales/fr_CH/location/city_name.ts similarity index 100% rename from src/locales/fr_CH/address/city_name.ts rename to src/locales/fr_CH/location/city_name.ts diff --git a/src/locales/fr_CH/address/country.ts b/src/locales/fr_CH/location/country.ts similarity index 100% rename from src/locales/fr_CH/address/country.ts rename to src/locales/fr_CH/location/country.ts diff --git a/src/locales/fr_CH/address/country_code.ts b/src/locales/fr_CH/location/country_code.ts similarity index 100% rename from src/locales/fr_CH/address/country_code.ts rename to src/locales/fr_CH/location/country_code.ts diff --git a/src/locales/fr_CH/address/default_country.ts b/src/locales/fr_CH/location/default_country.ts similarity index 100% rename from src/locales/fr_CH/address/default_country.ts rename to src/locales/fr_CH/location/default_country.ts diff --git a/src/locales/fr_CH/address/direction.ts b/src/locales/fr_CH/location/direction.ts similarity index 100% rename from src/locales/fr_CH/address/direction.ts rename to src/locales/fr_CH/location/direction.ts diff --git a/src/locales/fr_CH/address/index.ts b/src/locales/fr_CH/location/index.ts similarity index 88% rename from src/locales/fr_CH/address/index.ts rename to src/locales/fr_CH/location/index.ts index f8e6849e4b4..fd3b57e96bd 100644 --- a/src/locales/fr_CH/address/index.ts +++ b/src/locales/fr_CH/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_name from './city_name'; @@ -19,7 +19,7 @@ import street_address from './street_address'; import street_prefix from './street_prefix'; import street_suffix from './street_suffix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_name, @@ -37,4 +37,4 @@ const address: AddressDefinitions = { street_suffix, }; -export default address; +export default location; diff --git a/src/locales/fr_CH/address/postcode.ts b/src/locales/fr_CH/location/postcode.ts similarity index 100% rename from src/locales/fr_CH/address/postcode.ts rename to src/locales/fr_CH/location/postcode.ts diff --git a/src/locales/fr_CH/address/secondary_address.ts b/src/locales/fr_CH/location/secondary_address.ts similarity index 100% rename from src/locales/fr_CH/address/secondary_address.ts rename to src/locales/fr_CH/location/secondary_address.ts diff --git a/src/locales/fr_CH/address/state.ts b/src/locales/fr_CH/location/state.ts similarity index 100% rename from src/locales/fr_CH/address/state.ts rename to src/locales/fr_CH/location/state.ts diff --git a/src/locales/fr_CH/address/state_abbr.ts b/src/locales/fr_CH/location/state_abbr.ts similarity index 100% rename from src/locales/fr_CH/address/state_abbr.ts rename to src/locales/fr_CH/location/state_abbr.ts diff --git a/src/locales/fr_CH/location/street.ts b/src/locales/fr_CH/location/street.ts new file mode 100644 index 00000000000..f62f53f0931 --- /dev/null +++ b/src/locales/fr_CH/location/street.ts @@ -0,0 +1 @@ +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 new file mode 100644 index 00000000000..3ee966e2703 --- /dev/null +++ b/src/locales/fr_CH/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.buildingNumber}} {{location.streetName}}', + full: '{{location.buildingNumber}} {{location.streetName}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/fr_CH/address/street_prefix.ts b/src/locales/fr_CH/location/street_prefix.ts similarity index 100% rename from src/locales/fr_CH/address/street_prefix.ts rename to src/locales/fr_CH/location/street_prefix.ts diff --git a/src/locales/fr_CH/address/street_suffix.ts b/src/locales/fr_CH/location/street_suffix.ts similarity index 100% rename from src/locales/fr_CH/address/street_suffix.ts rename to src/locales/fr_CH/location/street_suffix.ts diff --git a/src/locales/ge/address/city.ts b/src/locales/ge/address/city.ts deleted file mode 100644 index 27a932f1459..00000000000 --- a/src/locales/ge/address/city.ts +++ /dev/null @@ -1,6 +0,0 @@ -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}}', -]; diff --git a/src/locales/ge/address/street.ts b/src/locales/ge/address/street.ts deleted file mode 100644 index 75ceb113313..00000000000 --- a/src/locales/ge/address/street.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.street_name}} {{address.street_suffix}}']; diff --git a/src/locales/ge/address/street_address.ts b/src/locales/ge/address/street_address.ts deleted file mode 100644 index d1e8da38725..00000000000 --- a/src/locales/ge/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', -}; diff --git a/src/locales/ge/index.ts b/src/locales/ge/index.ts index 4b98ece6003..2b7b332d625 100644 --- a/src/locales/ge/index.ts +++ b/src/locales/ge/index.ts @@ -3,20 +3,20 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import cell_phone from './cell_phone'; import company from './company'; import internet from './internet'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; const ge: LocaleDefinition = { title: 'Georgian', separator: ' და ', - address, cell_phone, company, internet, + location, person, phone_number, }; diff --git a/src/locales/ge/address/building_number.ts b/src/locales/ge/location/building_number.ts similarity index 100% rename from src/locales/ge/address/building_number.ts rename to src/locales/ge/location/building_number.ts diff --git a/src/locales/ge/location/city.ts b/src/locales/ge/location/city.ts new file mode 100644 index 00000000000..d744d882361 --- /dev/null +++ b/src/locales/ge/location/city.ts @@ -0,0 +1,6 @@ +export default [ + '{{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/address/city_name.ts b/src/locales/ge/location/city_name.ts similarity index 100% rename from src/locales/ge/address/city_name.ts rename to src/locales/ge/location/city_name.ts diff --git a/src/locales/ge/address/city_prefix.ts b/src/locales/ge/location/city_prefix.ts similarity index 100% rename from src/locales/ge/address/city_prefix.ts rename to src/locales/ge/location/city_prefix.ts diff --git a/src/locales/ge/address/city_suffix.ts b/src/locales/ge/location/city_suffix.ts similarity index 100% rename from src/locales/ge/address/city_suffix.ts rename to src/locales/ge/location/city_suffix.ts diff --git a/src/locales/ge/address/country.ts b/src/locales/ge/location/country.ts similarity index 100% rename from src/locales/ge/address/country.ts rename to src/locales/ge/location/country.ts diff --git a/src/locales/ge/address/default_country.ts b/src/locales/ge/location/default_country.ts similarity index 100% rename from src/locales/ge/address/default_country.ts rename to src/locales/ge/location/default_country.ts diff --git a/src/locales/ge/address/index.ts b/src/locales/ge/location/index.ts similarity index 87% rename from src/locales/ge/address/index.ts rename to src/locales/ge/location/index.ts index 9ab559a8afa..8263218507c 100644 --- a/src/locales/ge/address/index.ts +++ b/src/locales/ge/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_name from './city_name'; @@ -17,7 +17,7 @@ import street_address from './street_address'; import street_name from './street_name'; import street_suffix from './street_suffix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_name, @@ -33,4 +33,4 @@ const address: AddressDefinitions = { street_suffix, }; -export default address; +export default location; diff --git a/src/locales/ge/address/postcode.ts b/src/locales/ge/location/postcode.ts similarity index 100% rename from src/locales/ge/address/postcode.ts rename to src/locales/ge/location/postcode.ts diff --git a/src/locales/ge/address/secondary_address.ts b/src/locales/ge/location/secondary_address.ts similarity index 100% rename from src/locales/ge/address/secondary_address.ts rename to src/locales/ge/location/secondary_address.ts diff --git a/src/locales/ge/location/street.ts b/src/locales/ge/location/street.ts new file mode 100644 index 00000000000..afbdb76e642 --- /dev/null +++ b/src/locales/ge/location/street.ts @@ -0,0 +1 @@ +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 new file mode 100644 index 00000000000..437f20dd91a --- /dev/null +++ b/src/locales/ge/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/ge/address/street_name.ts b/src/locales/ge/location/street_name.ts similarity index 100% rename from src/locales/ge/address/street_name.ts rename to src/locales/ge/location/street_name.ts diff --git a/src/locales/ge/address/street_suffix.ts b/src/locales/ge/location/street_suffix.ts similarity index 100% rename from src/locales/ge/address/street_suffix.ts rename to src/locales/ge/location/street_suffix.ts diff --git a/src/locales/he/address/city.ts b/src/locales/he/address/city.ts deleted file mode 100644 index e3da346bd1e..00000000000 --- a/src/locales/he/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_name}}']; diff --git a/src/locales/he/address/street.ts b/src/locales/he/address/street.ts deleted file mode 100644 index 86e124a5f65..00000000000 --- a/src/locales/he/address/street.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.street_prefix}} {{address.street_name}}']; diff --git a/src/locales/he/address/street_address.ts b/src/locales/he/address/street_address.ts deleted file mode 100644 index d1e8da38725..00000000000 --- a/src/locales/he/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', -}; diff --git a/src/locales/he/index.ts b/src/locales/he/index.ts index e17ddc73590..9720dce8e97 100644 --- a/src/locales/he/index.ts +++ b/src/locales/he/index.ts @@ -3,11 +3,11 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import cell_phone from './cell_phone'; import color from './color'; import commerce from './commerce'; import date from './date'; +import location from './location'; import lorem from './lorem'; import music from './music'; import person from './person'; @@ -16,11 +16,11 @@ import phone_number from './phone_number'; const he: LocaleDefinition = { title: 'Hebrew', separator: 'ו ', - address, cell_phone, color, commerce, date, + location, lorem, music, person, diff --git a/src/locales/he/address/building_number.ts b/src/locales/he/location/building_number.ts similarity index 100% rename from src/locales/he/address/building_number.ts rename to src/locales/he/location/building_number.ts diff --git a/src/locales/he/location/city.ts b/src/locales/he/location/city.ts new file mode 100644 index 00000000000..ad43b68fc5c --- /dev/null +++ b/src/locales/he/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_name}}']; diff --git a/src/locales/he/address/city_name.ts b/src/locales/he/location/city_name.ts similarity index 100% rename from src/locales/he/address/city_name.ts rename to src/locales/he/location/city_name.ts diff --git a/src/locales/he/address/country.ts b/src/locales/he/location/country.ts similarity index 100% rename from src/locales/he/address/country.ts rename to src/locales/he/location/country.ts diff --git a/src/locales/he/address/county.ts b/src/locales/he/location/county.ts similarity index 100% rename from src/locales/he/address/county.ts rename to src/locales/he/location/county.ts diff --git a/src/locales/he/address/default_country.ts b/src/locales/he/location/default_country.ts similarity index 100% rename from src/locales/he/address/default_country.ts rename to src/locales/he/location/default_country.ts diff --git a/src/locales/he/address/direction.ts b/src/locales/he/location/direction.ts similarity index 100% rename from src/locales/he/address/direction.ts rename to src/locales/he/location/direction.ts diff --git a/src/locales/he/address/direction_abbr.ts b/src/locales/he/location/direction_abbr.ts similarity index 100% rename from src/locales/he/address/direction_abbr.ts rename to src/locales/he/location/direction_abbr.ts diff --git a/src/locales/he/address/index.ts b/src/locales/he/location/index.ts similarity index 89% rename from src/locales/he/address/index.ts rename to src/locales/he/location/index.ts index a4cc4f87ee5..2a4aa12d314 100644 --- a/src/locales/he/address/index.ts +++ b/src/locales/he/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_name from './city_name'; @@ -21,7 +21,7 @@ import street_name from './street_name'; import street_prefix from './street_prefix'; import time_zone from './time_zone'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_name, @@ -41,4 +41,4 @@ const address: AddressDefinitions = { time_zone, }; -export default address; +export default location; diff --git a/src/locales/he/address/postcode.ts b/src/locales/he/location/postcode.ts similarity index 100% rename from src/locales/he/address/postcode.ts rename to src/locales/he/location/postcode.ts diff --git a/src/locales/he/address/secondary_address.ts b/src/locales/he/location/secondary_address.ts similarity index 100% rename from src/locales/he/address/secondary_address.ts rename to src/locales/he/location/secondary_address.ts diff --git a/src/locales/he/address/state.ts b/src/locales/he/location/state.ts similarity index 100% rename from src/locales/he/address/state.ts rename to src/locales/he/location/state.ts diff --git a/src/locales/he/address/state_abbr.ts b/src/locales/he/location/state_abbr.ts similarity index 100% rename from src/locales/he/address/state_abbr.ts rename to src/locales/he/location/state_abbr.ts diff --git a/src/locales/he/location/street.ts b/src/locales/he/location/street.ts new file mode 100644 index 00000000000..bfebd5b407d --- /dev/null +++ b/src/locales/he/location/street.ts @@ -0,0 +1 @@ +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 new file mode 100644 index 00000000000..437f20dd91a --- /dev/null +++ b/src/locales/he/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/he/address/street_name.ts b/src/locales/he/location/street_name.ts similarity index 100% rename from src/locales/he/address/street_name.ts rename to src/locales/he/location/street_name.ts diff --git a/src/locales/he/address/street_prefix.ts b/src/locales/he/location/street_prefix.ts similarity index 100% rename from src/locales/he/address/street_prefix.ts rename to src/locales/he/location/street_prefix.ts diff --git a/src/locales/he/address/time_zone.ts b/src/locales/he/location/time_zone.ts similarity index 100% rename from src/locales/he/address/time_zone.ts rename to src/locales/he/location/time_zone.ts diff --git a/src/locales/hr/address/city.ts b/src/locales/hr/address/city.ts deleted file mode 100644 index e3da346bd1e..00000000000 --- a/src/locales/hr/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_name}}']; diff --git a/src/locales/hr/address/street.ts b/src/locales/hr/address/street.ts deleted file mode 100644 index 30ba73fc997..00000000000 --- a/src/locales/hr/address/street.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.street_name}}']; diff --git a/src/locales/hr/address/street_address.ts b/src/locales/hr/address/street_address.ts deleted file mode 100644 index d1e8da38725..00000000000 --- a/src/locales/hr/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', -}; diff --git a/src/locales/hr/index.ts b/src/locales/hr/index.ts index 619d3f3ebe5..1ef899b500a 100644 --- a/src/locales/hr/index.ts +++ b/src/locales/hr/index.ts @@ -3,19 +3,19 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import cell_phone from './cell_phone'; import date from './date'; import internet from './internet'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; const hr: LocaleDefinition = { title: 'Hrvatski', - address, cell_phone, date, internet, + location, person, phone_number, }; diff --git a/src/locales/hr/address/building_number.ts b/src/locales/hr/location/building_number.ts similarity index 100% rename from src/locales/hr/address/building_number.ts rename to src/locales/hr/location/building_number.ts diff --git a/src/locales/hr/location/city.ts b/src/locales/hr/location/city.ts new file mode 100644 index 00000000000..ad43b68fc5c --- /dev/null +++ b/src/locales/hr/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_name}}']; diff --git a/src/locales/hr/address/city_name.ts b/src/locales/hr/location/city_name.ts similarity index 100% rename from src/locales/hr/address/city_name.ts rename to src/locales/hr/location/city_name.ts diff --git a/src/locales/hr/address/country.ts b/src/locales/hr/location/country.ts similarity index 100% rename from src/locales/hr/address/country.ts rename to src/locales/hr/location/country.ts diff --git a/src/locales/hr/address/default_country.ts b/src/locales/hr/location/default_country.ts similarity index 100% rename from src/locales/hr/address/default_country.ts rename to src/locales/hr/location/default_country.ts diff --git a/src/locales/hr/address/index.ts b/src/locales/hr/location/index.ts similarity index 85% rename from src/locales/hr/address/index.ts rename to src/locales/hr/location/index.ts index 895b8d982f3..28fdcbff7cc 100644 --- a/src/locales/hr/address/index.ts +++ b/src/locales/hr/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_name from './city_name'; @@ -15,7 +15,7 @@ import street_address from './street_address'; import street_name from './street_name'; import time_zone from './time_zone'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_name, @@ -29,4 +29,4 @@ const address: AddressDefinitions = { time_zone, }; -export default address; +export default location; diff --git a/src/locales/hr/address/postcode.ts b/src/locales/hr/location/postcode.ts similarity index 100% rename from src/locales/hr/address/postcode.ts rename to src/locales/hr/location/postcode.ts diff --git a/src/locales/hr/address/secondary_address.ts b/src/locales/hr/location/secondary_address.ts similarity index 100% rename from src/locales/hr/address/secondary_address.ts rename to src/locales/hr/location/secondary_address.ts diff --git a/src/locales/hr/location/street.ts b/src/locales/hr/location/street.ts new file mode 100644 index 00000000000..30a9a5ddf99 --- /dev/null +++ b/src/locales/hr/location/street.ts @@ -0,0 +1 @@ +export default ['{{location.street_name}}']; diff --git a/src/locales/hr/location/street_address.ts b/src/locales/hr/location/street_address.ts new file mode 100644 index 00000000000..437f20dd91a --- /dev/null +++ b/src/locales/hr/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/hr/address/street_name.ts b/src/locales/hr/location/street_name.ts similarity index 100% rename from src/locales/hr/address/street_name.ts rename to src/locales/hr/location/street_name.ts diff --git a/src/locales/hr/address/time_zone.ts b/src/locales/hr/location/time_zone.ts similarity index 100% rename from src/locales/hr/address/time_zone.ts rename to src/locales/hr/location/time_zone.ts diff --git a/src/locales/hy/address/city.ts b/src/locales/hy/address/city.ts deleted file mode 100644 index a441b2f700d..00000000000 --- a/src/locales/hy/address/city.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{address.city_prefix}} {{person.last_name}}', - '{{person.last_name}}{{address.city_suffix}}', -]; diff --git a/src/locales/hy/address/street.ts b/src/locales/hy/address/street.ts deleted file mode 100644 index 4b6c9f6f50a..00000000000 --- a/src/locales/hy/address/street.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{person.last_name}} {{address.street_suffix}}']; diff --git a/src/locales/hy/address/street_address.ts b/src/locales/hy/address/street_address.ts deleted file mode 100644 index d1e8da38725..00000000000 --- a/src/locales/hy/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', -}; diff --git a/src/locales/hy/index.ts b/src/locales/hy/index.ts index 8ee5b06374e..ae14d46d9f5 100644 --- a/src/locales/hy/index.ts +++ b/src/locales/hy/index.ts @@ -3,10 +3,10 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import color from './color'; import date from './date'; import internet from './internet'; +import location from './location'; import lorem from './lorem'; import person from './person'; import phone_number from './phone_number'; @@ -14,10 +14,10 @@ import phone_number from './phone_number'; const hy: LocaleDefinition = { title: 'Armenian', separator: ' և ', - address, color, date, internet, + location, lorem, person, phone_number, diff --git a/src/locales/hy/address/building_number.ts b/src/locales/hy/location/building_number.ts similarity index 100% rename from src/locales/hy/address/building_number.ts rename to src/locales/hy/location/building_number.ts diff --git a/src/locales/hy/location/city.ts b/src/locales/hy/location/city.ts new file mode 100644 index 00000000000..3dbf4e11545 --- /dev/null +++ b/src/locales/hy/location/city.ts @@ -0,0 +1,4 @@ +export default [ + '{{location.city_prefix}} {{person.last_name}}', + '{{person.last_name}}{{location.city_suffix}}', +]; diff --git a/src/locales/hy/address/city_prefix.ts b/src/locales/hy/location/city_prefix.ts similarity index 100% rename from src/locales/hy/address/city_prefix.ts rename to src/locales/hy/location/city_prefix.ts diff --git a/src/locales/hy/address/city_suffix.ts b/src/locales/hy/location/city_suffix.ts similarity index 100% rename from src/locales/hy/address/city_suffix.ts rename to src/locales/hy/location/city_suffix.ts diff --git a/src/locales/hy/address/country.ts b/src/locales/hy/location/country.ts similarity index 100% rename from src/locales/hy/address/country.ts rename to src/locales/hy/location/country.ts diff --git a/src/locales/hy/address/default_country.ts b/src/locales/hy/location/default_country.ts similarity index 100% rename from src/locales/hy/address/default_country.ts rename to src/locales/hy/location/default_country.ts diff --git a/src/locales/hy/address/direction.ts b/src/locales/hy/location/direction.ts similarity index 100% rename from src/locales/hy/address/direction.ts rename to src/locales/hy/location/direction.ts diff --git a/src/locales/hy/address/index.ts b/src/locales/hy/location/index.ts similarity index 86% rename from src/locales/hy/address/index.ts rename to src/locales/hy/location/index.ts index 406b3bc38a7..9262f395f7d 100644 --- a/src/locales/hy/address/index.ts +++ b/src/locales/hy/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_prefix from './city_prefix'; @@ -16,7 +16,7 @@ import street from './street'; import street_address from './street_address'; import street_suffix from './street_suffix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_prefix, @@ -31,4 +31,4 @@ const address: AddressDefinitions = { street_suffix, }; -export default address; +export default location; diff --git a/src/locales/hy/address/secondary_address.ts b/src/locales/hy/location/secondary_address.ts similarity index 100% rename from src/locales/hy/address/secondary_address.ts rename to src/locales/hy/location/secondary_address.ts diff --git a/src/locales/hy/address/state.ts b/src/locales/hy/location/state.ts similarity index 100% rename from src/locales/hy/address/state.ts rename to src/locales/hy/location/state.ts diff --git a/src/locales/hy/location/street.ts b/src/locales/hy/location/street.ts new file mode 100644 index 00000000000..08f3003b076 --- /dev/null +++ b/src/locales/hy/location/street.ts @@ -0,0 +1 @@ +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 new file mode 100644 index 00000000000..437f20dd91a --- /dev/null +++ b/src/locales/hy/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/hy/address/street_suffix.ts b/src/locales/hy/location/street_suffix.ts similarity index 100% rename from src/locales/hy/address/street_suffix.ts rename to src/locales/hy/location/street_suffix.ts diff --git a/src/locales/id_ID/address/city.ts b/src/locales/id_ID/address/city.ts deleted file mode 100644 index e3da346bd1e..00000000000 --- a/src/locales/id_ID/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_name}}']; diff --git a/src/locales/id_ID/address/street.ts b/src/locales/id_ID/address/street.ts deleted file mode 100644 index 5db4f5be71f..00000000000 --- a/src/locales/id_ID/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{address.street_prefix}} {{person.first_name}}', - '{{address.street_prefix}} {{person.last_name}}', -]; diff --git a/src/locales/id_ID/address/street_address.ts b/src/locales/id_ID/address/street_address.ts deleted file mode 100644 index 006c2a907e0..00000000000 --- a/src/locales/id_ID/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}} no {{address.buildingNumber}}', - full: '{{address.street}} no {{address.buildingNumber}} {{address.secondaryAddress}}', -}; diff --git a/src/locales/id_ID/index.ts b/src/locales/id_ID/index.ts index 71ffec2908e..ec81b3f0d3a 100644 --- a/src/locales/id_ID/index.ts +++ b/src/locales/id_ID/index.ts @@ -3,19 +3,19 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import company from './company'; import date from './date'; import internet from './internet'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; const id_ID: LocaleDefinition = { title: 'Indonesian', - address, company, date, internet, + location, person, phone_number, }; diff --git a/src/locales/id_ID/address/building_number.ts b/src/locales/id_ID/location/building_number.ts similarity index 100% rename from src/locales/id_ID/address/building_number.ts rename to src/locales/id_ID/location/building_number.ts diff --git a/src/locales/id_ID/location/city.ts b/src/locales/id_ID/location/city.ts new file mode 100644 index 00000000000..ad43b68fc5c --- /dev/null +++ b/src/locales/id_ID/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_name}}']; diff --git a/src/locales/id_ID/address/city_name.ts b/src/locales/id_ID/location/city_name.ts similarity index 100% rename from src/locales/id_ID/address/city_name.ts rename to src/locales/id_ID/location/city_name.ts diff --git a/src/locales/id_ID/address/default_country.ts b/src/locales/id_ID/location/default_country.ts similarity index 100% rename from src/locales/id_ID/address/default_country.ts rename to src/locales/id_ID/location/default_country.ts diff --git a/src/locales/id_ID/address/index.ts b/src/locales/id_ID/location/index.ts similarity index 82% rename from src/locales/id_ID/address/index.ts rename to src/locales/id_ID/location/index.ts index e8f3219c950..a3f135fac8d 100644 --- a/src/locales/id_ID/address/index.ts +++ b/src/locales/id_ID/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_name from './city_name'; @@ -13,7 +13,7 @@ import street from './street'; import street_address from './street_address'; import street_prefix from './street_prefix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_name, @@ -25,4 +25,4 @@ const address: AddressDefinitions = { street_prefix, }; -export default address; +export default location; diff --git a/src/locales/id_ID/address/postcode.ts b/src/locales/id_ID/location/postcode.ts similarity index 100% rename from src/locales/id_ID/address/postcode.ts rename to src/locales/id_ID/location/postcode.ts diff --git a/src/locales/id_ID/address/state.ts b/src/locales/id_ID/location/state.ts similarity index 100% rename from src/locales/id_ID/address/state.ts rename to src/locales/id_ID/location/state.ts diff --git a/src/locales/id_ID/location/street.ts b/src/locales/id_ID/location/street.ts new file mode 100644 index 00000000000..c182e83762a --- /dev/null +++ b/src/locales/id_ID/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{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 new file mode 100644 index 00000000000..4a12bddb9e1 --- /dev/null +++ b/src/locales/id_ID/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}} no {{location.buildingNumber}}', + full: '{{location.street}} no {{location.buildingNumber}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/id_ID/address/street_prefix.ts b/src/locales/id_ID/location/street_prefix.ts similarity index 100% rename from src/locales/id_ID/address/street_prefix.ts rename to src/locales/id_ID/location/street_prefix.ts diff --git a/src/locales/it/address/city.ts b/src/locales/it/address/city.ts deleted file mode 100644 index f1c33d476b7..00000000000 --- a/src/locales/it/address/city.ts +++ /dev/null @@ -1,6 +0,0 @@ -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}}', -]; diff --git a/src/locales/it/address/street.ts b/src/locales/it/address/street.ts deleted file mode 100644 index 5d4a09006fc..00000000000 --- a/src/locales/it/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{address.street_suffix}} {{person.first_name}}', - '{{address.street_suffix}} {{person.last_name}}', -]; diff --git a/src/locales/it/address/street_address.ts b/src/locales/it/address/street_address.ts deleted file mode 100644 index b198be88ddc..00000000000 --- a/src/locales/it/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}}, {{address.secondaryAddress}}', -}; diff --git a/src/locales/it/index.ts b/src/locales/it/index.ts index 09ce560db7d..a1fb9fc54b8 100644 --- a/src/locales/it/index.ts +++ b/src/locales/it/index.ts @@ -3,17 +3,17 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import company from './company'; import internet from './internet'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; const it: LocaleDefinition = { title: 'Italian', - address, company, internet, + location, person, phone_number, }; diff --git a/src/locales/it/address/building_number.ts b/src/locales/it/location/building_number.ts similarity index 100% rename from src/locales/it/address/building_number.ts rename to src/locales/it/location/building_number.ts diff --git a/src/locales/it/location/city.ts b/src/locales/it/location/city.ts new file mode 100644 index 00000000000..b29e1252b61 --- /dev/null +++ b/src/locales/it/location/city.ts @@ -0,0 +1,6 @@ +export default [ + '{{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/address/city_name.ts b/src/locales/it/location/city_name.ts similarity index 100% rename from src/locales/it/address/city_name.ts rename to src/locales/it/location/city_name.ts diff --git a/src/locales/it/address/city_prefix.ts b/src/locales/it/location/city_prefix.ts similarity index 100% rename from src/locales/it/address/city_prefix.ts rename to src/locales/it/location/city_prefix.ts diff --git a/src/locales/it/address/city_suffix.ts b/src/locales/it/location/city_suffix.ts similarity index 100% rename from src/locales/it/address/city_suffix.ts rename to src/locales/it/location/city_suffix.ts diff --git a/src/locales/it/address/country.ts b/src/locales/it/location/country.ts similarity index 100% rename from src/locales/it/address/country.ts rename to src/locales/it/location/country.ts diff --git a/src/locales/it/address/default_country.ts b/src/locales/it/location/default_country.ts similarity index 100% rename from src/locales/it/address/default_country.ts rename to src/locales/it/location/default_country.ts diff --git a/src/locales/it/address/index.ts b/src/locales/it/location/index.ts similarity index 87% rename from src/locales/it/address/index.ts rename to src/locales/it/location/index.ts index 4222f87faf0..2b51af88861 100644 --- a/src/locales/it/address/index.ts +++ b/src/locales/it/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_name from './city_name'; @@ -18,7 +18,7 @@ import street from './street'; import street_address from './street_address'; import street_suffix from './street_suffix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_name, @@ -35,4 +35,4 @@ const address: AddressDefinitions = { street_suffix, }; -export default address; +export default location; diff --git a/src/locales/it/address/postcode.ts b/src/locales/it/location/postcode.ts similarity index 100% rename from src/locales/it/address/postcode.ts rename to src/locales/it/location/postcode.ts diff --git a/src/locales/it/address/secondary_address.ts b/src/locales/it/location/secondary_address.ts similarity index 100% rename from src/locales/it/address/secondary_address.ts rename to src/locales/it/location/secondary_address.ts diff --git a/src/locales/it/address/state.ts b/src/locales/it/location/state.ts similarity index 100% rename from src/locales/it/address/state.ts rename to src/locales/it/location/state.ts diff --git a/src/locales/it/address/state_abbr.ts b/src/locales/it/location/state_abbr.ts similarity index 100% rename from src/locales/it/address/state_abbr.ts rename to src/locales/it/location/state_abbr.ts diff --git a/src/locales/it/location/street.ts b/src/locales/it/location/street.ts new file mode 100644 index 00000000000..e2e1b0dbb6f --- /dev/null +++ b/src/locales/it/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{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 new file mode 100644 index 00000000000..15512f0992d --- /dev/null +++ b/src/locales/it/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}}, {{location.secondaryAddress}}', +}; diff --git a/src/locales/it/address/street_suffix.ts b/src/locales/it/location/street_suffix.ts similarity index 100% rename from src/locales/it/address/street_suffix.ts rename to src/locales/it/location/street_suffix.ts diff --git a/src/locales/ja/address/city.ts b/src/locales/ja/address/city.ts deleted file mode 100644 index 2cb639cd935..00000000000 --- a/src/locales/ja/address/city.ts +++ /dev/null @@ -1,6 +0,0 @@ -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}}', -]; diff --git a/src/locales/ja/address/street.ts b/src/locales/ja/address/street.ts deleted file mode 100644 index a32c95d3e61..00000000000 --- a/src/locales/ja/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{person.first_name}}{{address.street_suffix}}', - '{{person.last_name}}{{address.street_suffix}}', -]; diff --git a/src/locales/ja/index.ts b/src/locales/ja/index.ts index c5c06758bc5..8d2400d19f6 100644 --- a/src/locales/ja/index.ts +++ b/src/locales/ja/index.ts @@ -3,16 +3,16 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import cell_phone from './cell_phone'; +import location from './location'; import lorem from './lorem'; import person from './person'; import phone_number from './phone_number'; const ja: LocaleDefinition = { title: 'Japanese', - address, cell_phone, + location, lorem, person, phone_number, diff --git a/src/locales/ja/location/city.ts b/src/locales/ja/location/city.ts new file mode 100644 index 00000000000..2c27e4fd042 --- /dev/null +++ b/src/locales/ja/location/city.ts @@ -0,0 +1,6 @@ +export default [ + '{{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/address/city_prefix.ts b/src/locales/ja/location/city_prefix.ts similarity index 100% rename from src/locales/ja/address/city_prefix.ts rename to src/locales/ja/location/city_prefix.ts diff --git a/src/locales/ja/address/city_suffix.ts b/src/locales/ja/location/city_suffix.ts similarity index 100% rename from src/locales/ja/address/city_suffix.ts rename to src/locales/ja/location/city_suffix.ts diff --git a/src/locales/ja/address/country.ts b/src/locales/ja/location/country.ts similarity index 100% rename from src/locales/ja/address/country.ts rename to src/locales/ja/location/country.ts diff --git a/src/locales/ja/address/index.ts b/src/locales/ja/location/index.ts similarity index 79% rename from src/locales/ja/address/index.ts rename to src/locales/ja/location/index.ts index 6fd95c26871..8911dd7ae04 100644 --- a/src/locales/ja/address/index.ts +++ b/src/locales/ja/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import city from './city'; import city_prefix from './city_prefix'; import city_suffix from './city_suffix'; @@ -12,7 +12,7 @@ import state from './state'; import state_abbr from './state_abbr'; import street from './street'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { city, city_prefix, city_suffix, @@ -23,4 +23,4 @@ const address: AddressDefinitions = { street, }; -export default address; +export default location; diff --git a/src/locales/ja/address/postcode.ts b/src/locales/ja/location/postcode.ts similarity index 100% rename from src/locales/ja/address/postcode.ts rename to src/locales/ja/location/postcode.ts diff --git a/src/locales/ja/address/state.ts b/src/locales/ja/location/state.ts similarity index 100% rename from src/locales/ja/address/state.ts rename to src/locales/ja/location/state.ts diff --git a/src/locales/ja/address/state_abbr.ts b/src/locales/ja/location/state_abbr.ts similarity index 100% rename from src/locales/ja/address/state_abbr.ts rename to src/locales/ja/location/state_abbr.ts diff --git a/src/locales/ja/location/street.ts b/src/locales/ja/location/street.ts new file mode 100644 index 00000000000..06ca3a5e812 --- /dev/null +++ b/src/locales/ja/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{person.first_name}}{{location.street_suffix}}', + '{{person.last_name}}{{location.street_suffix}}', +]; diff --git a/src/locales/ko/address/city.ts b/src/locales/ko/address/city.ts deleted file mode 100644 index 67bd1b88813..00000000000 --- a/src/locales/ko/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_name}}{{address.city_suffix}}']; diff --git a/src/locales/ko/address/street.ts b/src/locales/ko/address/street.ts deleted file mode 100644 index 7b5320b5d0e..00000000000 --- a/src/locales/ko/address/street.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.street_name}}{{address.street_suffix}}']; diff --git a/src/locales/ko/index.ts b/src/locales/ko/index.ts index e3d69654cfe..47bc6286da5 100644 --- a/src/locales/ko/index.ts +++ b/src/locales/ko/index.ts @@ -3,18 +3,18 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import company from './company'; import internet from './internet'; +import location from './location'; import lorem from './lorem'; import person from './person'; import phone_number from './phone_number'; const ko: LocaleDefinition = { title: 'Korean', - address, company, internet, + location, lorem, person, phone_number, diff --git a/src/locales/ko/location/city.ts b/src/locales/ko/location/city.ts new file mode 100644 index 00000000000..61f8d6f193b --- /dev/null +++ b/src/locales/ko/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_name}}{{location.city_suffix}}']; diff --git a/src/locales/ko/address/city_name.ts b/src/locales/ko/location/city_name.ts similarity index 100% rename from src/locales/ko/address/city_name.ts rename to src/locales/ko/location/city_name.ts diff --git a/src/locales/ko/address/city_suffix.ts b/src/locales/ko/location/city_suffix.ts similarity index 100% rename from src/locales/ko/address/city_suffix.ts rename to src/locales/ko/location/city_suffix.ts diff --git a/src/locales/ko/address/index.ts b/src/locales/ko/location/index.ts similarity index 81% rename from src/locales/ko/address/index.ts rename to src/locales/ko/location/index.ts index 675240d2f9f..1a954b76598 100644 --- a/src/locales/ko/address/index.ts +++ b/src/locales/ko/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import city from './city'; import city_name from './city_name'; import city_suffix from './city_suffix'; @@ -13,7 +13,7 @@ import street from './street'; import street_name from './street_name'; import street_suffix from './street_suffix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { city, city_name, city_suffix, @@ -25,4 +25,4 @@ const address: AddressDefinitions = { street_suffix, }; -export default address; +export default location; diff --git a/src/locales/ko/address/postcode.ts b/src/locales/ko/location/postcode.ts similarity index 100% rename from src/locales/ko/address/postcode.ts rename to src/locales/ko/location/postcode.ts diff --git a/src/locales/ko/address/state.ts b/src/locales/ko/location/state.ts similarity index 100% rename from src/locales/ko/address/state.ts rename to src/locales/ko/location/state.ts diff --git a/src/locales/ko/address/state_abbr.ts b/src/locales/ko/location/state_abbr.ts similarity index 100% rename from src/locales/ko/address/state_abbr.ts rename to src/locales/ko/location/state_abbr.ts diff --git a/src/locales/ko/location/street.ts b/src/locales/ko/location/street.ts new file mode 100644 index 00000000000..b5dd696c055 --- /dev/null +++ b/src/locales/ko/location/street.ts @@ -0,0 +1 @@ +export default ['{{location.street_name}}{{location.street_suffix}}']; diff --git a/src/locales/ko/address/street_name.ts b/src/locales/ko/location/street_name.ts similarity index 100% rename from src/locales/ko/address/street_name.ts rename to src/locales/ko/location/street_name.ts diff --git a/src/locales/ko/address/street_suffix.ts b/src/locales/ko/location/street_suffix.ts similarity index 100% rename from src/locales/ko/address/street_suffix.ts rename to src/locales/ko/location/street_suffix.ts diff --git a/src/locales/lv/address/city.ts b/src/locales/lv/address/city.ts deleted file mode 100644 index e3da346bd1e..00000000000 --- a/src/locales/lv/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_name}}']; diff --git a/src/locales/lv/address/street.ts b/src/locales/lv/address/street.ts deleted file mode 100644 index 75ceb113313..00000000000 --- a/src/locales/lv/address/street.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.street_name}} {{address.street_suffix}}']; diff --git a/src/locales/lv/address/street_address.ts b/src/locales/lv/address/street_address.ts deleted file mode 100644 index d1e8da38725..00000000000 --- a/src/locales/lv/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', -}; diff --git a/src/locales/lv/index.ts b/src/locales/lv/index.ts index 5ffc21f9258..e38fa60ff11 100644 --- a/src/locales/lv/index.ts +++ b/src/locales/lv/index.ts @@ -3,13 +3,13 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import cell_phone from './cell_phone'; import color from './color'; import commerce from './commerce'; import company from './company'; import date from './date'; import internet from './internet'; +import location from './location'; import lorem from './lorem'; import person from './person'; import phone_number from './phone_number'; @@ -17,13 +17,13 @@ import phone_number from './phone_number'; const lv: LocaleDefinition = { title: 'Latvian', separator: ' un ', - address, cell_phone, color, commerce, company, date, internet, + location, lorem, person, phone_number, diff --git a/src/locales/lv/address/building_number.ts b/src/locales/lv/location/building_number.ts similarity index 100% rename from src/locales/lv/address/building_number.ts rename to src/locales/lv/location/building_number.ts diff --git a/src/locales/lv/location/city.ts b/src/locales/lv/location/city.ts new file mode 100644 index 00000000000..ad43b68fc5c --- /dev/null +++ b/src/locales/lv/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_name}}']; diff --git a/src/locales/lv/address/city_name.ts b/src/locales/lv/location/city_name.ts similarity index 100% rename from src/locales/lv/address/city_name.ts rename to src/locales/lv/location/city_name.ts diff --git a/src/locales/lv/address/country.ts b/src/locales/lv/location/country.ts similarity index 100% rename from src/locales/lv/address/country.ts rename to src/locales/lv/location/country.ts diff --git a/src/locales/lv/address/default_country.ts b/src/locales/lv/location/default_country.ts similarity index 100% rename from src/locales/lv/address/default_country.ts rename to src/locales/lv/location/default_country.ts diff --git a/src/locales/az/address/index.ts b/src/locales/lv/location/index.ts similarity index 86% rename from src/locales/az/address/index.ts rename to src/locales/lv/location/index.ts index 3c37ba5f4fa..b28b0dfbfb3 100644 --- a/src/locales/az/address/index.ts +++ b/src/locales/lv/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_name from './city_name'; @@ -16,7 +16,7 @@ import street_address from './street_address'; import street_name from './street_name'; import street_suffix from './street_suffix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_name, @@ -31,4 +31,4 @@ const address: AddressDefinitions = { street_suffix, }; -export default address; +export default location; diff --git a/src/locales/lv/address/postcode.ts b/src/locales/lv/location/postcode.ts similarity index 100% rename from src/locales/lv/address/postcode.ts rename to src/locales/lv/location/postcode.ts diff --git a/src/locales/lv/address/secondary_address.ts b/src/locales/lv/location/secondary_address.ts similarity index 100% rename from src/locales/lv/address/secondary_address.ts rename to src/locales/lv/location/secondary_address.ts diff --git a/src/locales/lv/address/state.ts b/src/locales/lv/location/state.ts similarity index 100% rename from src/locales/lv/address/state.ts rename to src/locales/lv/location/state.ts diff --git a/src/locales/lv/location/street.ts b/src/locales/lv/location/street.ts new file mode 100644 index 00000000000..afbdb76e642 --- /dev/null +++ b/src/locales/lv/location/street.ts @@ -0,0 +1 @@ +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 new file mode 100644 index 00000000000..437f20dd91a --- /dev/null +++ b/src/locales/lv/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/lv/address/street_name.ts b/src/locales/lv/location/street_name.ts similarity index 100% rename from src/locales/lv/address/street_name.ts rename to src/locales/lv/location/street_name.ts diff --git a/src/locales/lv/address/street_suffix.ts b/src/locales/lv/location/street_suffix.ts similarity index 100% rename from src/locales/lv/address/street_suffix.ts rename to src/locales/lv/location/street_suffix.ts diff --git a/src/locales/mk/address/city.ts b/src/locales/mk/address/city.ts deleted file mode 100644 index e3da346bd1e..00000000000 --- a/src/locales/mk/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_name}}']; diff --git a/src/locales/mk/address/street.ts b/src/locales/mk/address/street.ts deleted file mode 100644 index 30ba73fc997..00000000000 --- a/src/locales/mk/address/street.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.street_name}}']; diff --git a/src/locales/mk/address/street_address.ts b/src/locales/mk/address/street_address.ts deleted file mode 100644 index d1e8da38725..00000000000 --- a/src/locales/mk/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.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/index.ts b/src/locales/mk/index.ts index 567c931be73..6b1d245e587 100644 --- a/src/locales/mk/index.ts +++ b/src/locales/mk/index.ts @@ -3,22 +3,22 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import cell_phone from './cell_phone'; import company from './company'; import date from './date'; import internet from './internet'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; const mk: LocaleDefinition = { title: 'Macedonian', separator: ' и ', - address, cell_phone, company, date, internet, + location, person, phone_number, }; diff --git a/src/locales/mk/address/building_number.ts b/src/locales/mk/location/building_number.ts similarity index 100% rename from src/locales/mk/address/building_number.ts rename to src/locales/mk/location/building_number.ts diff --git a/src/locales/mk/location/city.ts b/src/locales/mk/location/city.ts new file mode 100644 index 00000000000..ad43b68fc5c --- /dev/null +++ b/src/locales/mk/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_name}}']; diff --git a/src/locales/mk/address/city_name.ts b/src/locales/mk/location/city_name.ts similarity index 100% rename from src/locales/mk/address/city_name.ts rename to src/locales/mk/location/city_name.ts diff --git a/src/locales/mk/address/country.ts b/src/locales/mk/location/country.ts similarity index 100% rename from src/locales/mk/address/country.ts rename to src/locales/mk/location/country.ts diff --git a/src/locales/mk/address/default_country.ts b/src/locales/mk/location/default_country.ts similarity index 100% rename from src/locales/mk/address/default_country.ts rename to src/locales/mk/location/default_country.ts diff --git a/src/locales/mk/address/index.ts b/src/locales/mk/location/index.ts similarity index 84% rename from src/locales/mk/address/index.ts rename to src/locales/mk/location/index.ts index d15f9ae61a2..7b286a9d3ac 100644 --- a/src/locales/mk/address/index.ts +++ b/src/locales/mk/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_name from './city_name'; @@ -14,7 +14,7 @@ import street from './street'; import street_address from './street_address'; import street_name from './street_name'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_name, @@ -27,4 +27,4 @@ const address: AddressDefinitions = { street_name, }; -export default address; +export default location; diff --git a/src/locales/mk/address/postcode.ts b/src/locales/mk/location/postcode.ts similarity index 100% rename from src/locales/mk/address/postcode.ts rename to src/locales/mk/location/postcode.ts diff --git a/src/locales/mk/address/secondary_address.ts b/src/locales/mk/location/secondary_address.ts similarity index 100% rename from src/locales/mk/address/secondary_address.ts rename to src/locales/mk/location/secondary_address.ts diff --git a/src/locales/mk/location/street.ts b/src/locales/mk/location/street.ts new file mode 100644 index 00000000000..30a9a5ddf99 --- /dev/null +++ b/src/locales/mk/location/street.ts @@ -0,0 +1 @@ +export default ['{{location.street_name}}']; diff --git a/src/locales/mk/location/street_address.ts b/src/locales/mk/location/street_address.ts new file mode 100644 index 00000000000..437f20dd91a --- /dev/null +++ b/src/locales/mk/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/mk/address/street_name.ts b/src/locales/mk/location/street_name.ts similarity index 100% rename from src/locales/mk/address/street_name.ts rename to src/locales/mk/location/street_name.ts diff --git a/src/locales/nb_NO/address/city.ts b/src/locales/nb_NO/address/city.ts deleted file mode 100644 index 67bd1b88813..00000000000 --- a/src/locales/nb_NO/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_name}}{{address.city_suffix}}']; diff --git a/src/locales/nb_NO/address/street.ts b/src/locales/nb_NO/address/street.ts deleted file mode 100644 index 72310d5affe..00000000000 --- a/src/locales/nb_NO/address/street.ts +++ /dev/null @@ -1,6 +0,0 @@ -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}}', -]; diff --git a/src/locales/nb_NO/address/street_address.ts b/src/locales/nb_NO/address/street_address.ts deleted file mode 100644 index d1e8da38725..00000000000 --- a/src/locales/nb_NO/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', -}; diff --git a/src/locales/nb_NO/index.ts b/src/locales/nb_NO/index.ts index 3eab6c884ea..f46b17607c4 100644 --- a/src/locales/nb_NO/index.ts +++ b/src/locales/nb_NO/index.ts @@ -3,11 +3,11 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import color from './color'; import commerce from './commerce'; import company from './company'; import internet from './internet'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; import science from './science'; @@ -15,11 +15,11 @@ import word from './word'; const nb_NO: LocaleDefinition = { title: 'Norwegian', - address, color, commerce, company, internet, + location, person, phone_number, science, diff --git a/src/locales/nb_NO/address/building_number.ts b/src/locales/nb_NO/location/building_number.ts similarity index 100% rename from src/locales/nb_NO/address/building_number.ts rename to src/locales/nb_NO/location/building_number.ts diff --git a/src/locales/nb_NO/location/city.ts b/src/locales/nb_NO/location/city.ts new file mode 100644 index 00000000000..61f8d6f193b --- /dev/null +++ b/src/locales/nb_NO/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_name}}{{location.city_suffix}}']; diff --git a/src/locales/nb_NO/address/city_name.ts b/src/locales/nb_NO/location/city_name.ts similarity index 100% rename from src/locales/nb_NO/address/city_name.ts rename to src/locales/nb_NO/location/city_name.ts diff --git a/src/locales/nb_NO/address/city_suffix.ts b/src/locales/nb_NO/location/city_suffix.ts similarity index 100% rename from src/locales/nb_NO/address/city_suffix.ts rename to src/locales/nb_NO/location/city_suffix.ts diff --git a/src/locales/nb_NO/address/common_street_suffix.ts b/src/locales/nb_NO/location/common_street_suffix.ts similarity index 100% rename from src/locales/nb_NO/address/common_street_suffix.ts rename to src/locales/nb_NO/location/common_street_suffix.ts diff --git a/src/locales/nb_NO/address/default_country.ts b/src/locales/nb_NO/location/default_country.ts similarity index 100% rename from src/locales/nb_NO/address/default_country.ts rename to src/locales/nb_NO/location/default_country.ts diff --git a/src/locales/nb_NO/address/index.ts b/src/locales/nb_NO/location/index.ts similarity index 88% rename from src/locales/nb_NO/address/index.ts rename to src/locales/nb_NO/location/index.ts index 156adfeaa52..c571f6bc3ff 100644 --- a/src/locales/nb_NO/address/index.ts +++ b/src/locales/nb_NO/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_name from './city_name'; @@ -18,7 +18,7 @@ import street_name from './street_name'; import street_prefix from './street_prefix'; import street_suffix from './street_suffix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_name, @@ -35,4 +35,4 @@ const address: AddressDefinitions = { street_suffix, }; -export default address; +export default location; diff --git a/src/locales/nb_NO/address/postcode.ts b/src/locales/nb_NO/location/postcode.ts similarity index 100% rename from src/locales/nb_NO/address/postcode.ts rename to src/locales/nb_NO/location/postcode.ts diff --git a/src/locales/nb_NO/address/secondary_address.ts b/src/locales/nb_NO/location/secondary_address.ts similarity index 100% rename from src/locales/nb_NO/address/secondary_address.ts rename to src/locales/nb_NO/location/secondary_address.ts diff --git a/src/locales/nb_NO/address/state.ts b/src/locales/nb_NO/location/state.ts similarity index 100% rename from src/locales/nb_NO/address/state.ts rename to src/locales/nb_NO/location/state.ts diff --git a/src/locales/nb_NO/location/street.ts b/src/locales/nb_NO/location/street.ts new file mode 100644 index 00000000000..1e4fbfd7e5a --- /dev/null +++ b/src/locales/nb_NO/location/street.ts @@ -0,0 +1,6 @@ +export default [ + '{{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 new file mode 100644 index 00000000000..437f20dd91a --- /dev/null +++ b/src/locales/nb_NO/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/nb_NO/address/street_name.ts b/src/locales/nb_NO/location/street_name.ts similarity index 100% rename from src/locales/nb_NO/address/street_name.ts rename to src/locales/nb_NO/location/street_name.ts diff --git a/src/locales/nb_NO/address/street_prefix.ts b/src/locales/nb_NO/location/street_prefix.ts similarity index 100% rename from src/locales/nb_NO/address/street_prefix.ts rename to src/locales/nb_NO/location/street_prefix.ts diff --git a/src/locales/nb_NO/address/street_suffix.ts b/src/locales/nb_NO/location/street_suffix.ts similarity index 100% rename from src/locales/nb_NO/address/street_suffix.ts rename to src/locales/nb_NO/location/street_suffix.ts diff --git a/src/locales/ne/address/city.ts b/src/locales/ne/address/city.ts deleted file mode 100644 index d77ac09a558..00000000000 --- a/src/locales/ne/address/city.ts +++ /dev/null @@ -1,7 +0,0 @@ -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}}', -]; diff --git a/src/locales/ne/address/street.ts b/src/locales/ne/address/street.ts deleted file mode 100644 index f7dd9d3b3aa..00000000000 --- a/src/locales/ne/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', -]; diff --git a/src/locales/ne/index.ts b/src/locales/ne/index.ts index 0c6dc8eeee7..0d35d85a2f7 100644 --- a/src/locales/ne/index.ts +++ b/src/locales/ne/index.ts @@ -3,17 +3,17 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import company from './company'; import internet from './internet'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; const ne: LocaleDefinition = { title: 'Nepalese', - address, company, internet, + location, person, phone_number, }; diff --git a/src/locales/ne/location/city.ts b/src/locales/ne/location/city.ts new file mode 100644 index 00000000000..0d422527891 --- /dev/null +++ b/src/locales/ne/location/city.ts @@ -0,0 +1,7 @@ +export default [ + '{{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/address/city_name.ts b/src/locales/ne/location/city_name.ts similarity index 100% rename from src/locales/ne/address/city_name.ts rename to src/locales/ne/location/city_name.ts diff --git a/src/locales/ne/address/default_country.ts b/src/locales/ne/location/default_country.ts similarity index 100% rename from src/locales/ne/address/default_country.ts rename to src/locales/ne/location/default_country.ts diff --git a/src/locales/ne/address/index.ts b/src/locales/ne/location/index.ts similarity index 73% rename from src/locales/ne/address/index.ts rename to src/locales/ne/location/index.ts index 10df9e7bf48..7ca1578ad39 100644 --- a/src/locales/ne/address/index.ts +++ b/src/locales/ne/location/index.ts @@ -2,14 +2,14 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import city from './city'; import city_name from './city_name'; import default_country from './default_country'; import state from './state'; import street from './street'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { city, city_name, default_country, @@ -17,4 +17,4 @@ const address: AddressDefinitions = { street, }; -export default address; +export default location; diff --git a/src/locales/ne/address/state.ts b/src/locales/ne/location/state.ts similarity index 100% rename from src/locales/ne/address/state.ts rename to src/locales/ne/location/state.ts diff --git a/src/locales/ne/location/street.ts b/src/locales/ne/location/street.ts new file mode 100644 index 00000000000..af32d0c4248 --- /dev/null +++ b/src/locales/ne/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', +]; diff --git a/src/locales/nl/address/city.ts b/src/locales/nl/address/city.ts deleted file mode 100644 index 003651627e7..00000000000 --- a/src/locales/nl/address/city.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{address.city_prefix}}{{address.city_suffix}}', - '{{address.city_prefix}}', -]; diff --git a/src/locales/nl/address/street.ts b/src/locales/nl/address/street.ts deleted file mode 100644 index a32c95d3e61..00000000000 --- a/src/locales/nl/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{person.first_name}}{{address.street_suffix}}', - '{{person.last_name}}{{address.street_suffix}}', -]; diff --git a/src/locales/nl/address/street_address.ts b/src/locales/nl/address/street_address.ts deleted file mode 100644 index d1e8da38725..00000000000 --- a/src/locales/nl/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', -}; diff --git a/src/locales/nl/index.ts b/src/locales/nl/index.ts index 92562824a47..ebb4b43a980 100644 --- a/src/locales/nl/index.ts +++ b/src/locales/nl/index.ts @@ -3,26 +3,26 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import color from './color'; import commerce from './commerce'; import company from './company'; import date from './date'; import hacker from './hacker'; import internet from './internet'; +import location from './location'; import lorem from './lorem'; import person from './person'; import phone_number from './phone_number'; const nl: LocaleDefinition = { title: 'Dutch', - address, color, commerce, company, date, hacker, internet, + location, lorem, person, phone_number, diff --git a/src/locales/nl/address/building_number.ts b/src/locales/nl/location/building_number.ts similarity index 100% rename from src/locales/nl/address/building_number.ts rename to src/locales/nl/location/building_number.ts diff --git a/src/locales/nl/location/city.ts b/src/locales/nl/location/city.ts new file mode 100644 index 00000000000..daae91a86e4 --- /dev/null +++ b/src/locales/nl/location/city.ts @@ -0,0 +1,4 @@ +export default [ + '{{location.city_prefix}}{{location.city_suffix}}', + '{{location.city_prefix}}', +]; diff --git a/src/locales/nl/address/city_prefix.ts b/src/locales/nl/location/city_prefix.ts similarity index 100% rename from src/locales/nl/address/city_prefix.ts rename to src/locales/nl/location/city_prefix.ts diff --git a/src/locales/nl/address/city_suffix.ts b/src/locales/nl/location/city_suffix.ts similarity index 100% rename from src/locales/nl/address/city_suffix.ts rename to src/locales/nl/location/city_suffix.ts diff --git a/src/locales/nl/address/country.ts b/src/locales/nl/location/country.ts similarity index 100% rename from src/locales/nl/address/country.ts rename to src/locales/nl/location/country.ts diff --git a/src/locales/nl/address/default_country.ts b/src/locales/nl/location/default_country.ts similarity index 100% rename from src/locales/nl/address/default_country.ts rename to src/locales/nl/location/default_country.ts diff --git a/src/locales/nl/address/index.ts b/src/locales/nl/location/index.ts similarity index 86% rename from src/locales/nl/address/index.ts rename to src/locales/nl/location/index.ts index e2327ce2512..08afa1555b8 100644 --- a/src/locales/nl/address/index.ts +++ b/src/locales/nl/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_prefix from './city_prefix'; @@ -16,7 +16,7 @@ import street from './street'; import street_address from './street_address'; import street_suffix from './street_suffix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_prefix, @@ -31,4 +31,4 @@ const address: AddressDefinitions = { street_suffix, }; -export default address; +export default location; diff --git a/src/locales/nl/address/postcode.ts b/src/locales/nl/location/postcode.ts similarity index 100% rename from src/locales/nl/address/postcode.ts rename to src/locales/nl/location/postcode.ts diff --git a/src/locales/nl/address/secondary_address.ts b/src/locales/nl/location/secondary_address.ts similarity index 100% rename from src/locales/nl/address/secondary_address.ts rename to src/locales/nl/location/secondary_address.ts diff --git a/src/locales/nl/address/state.ts b/src/locales/nl/location/state.ts similarity index 100% rename from src/locales/nl/address/state.ts rename to src/locales/nl/location/state.ts diff --git a/src/locales/nl/location/street.ts b/src/locales/nl/location/street.ts new file mode 100644 index 00000000000..06ca3a5e812 --- /dev/null +++ b/src/locales/nl/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{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 new file mode 100644 index 00000000000..437f20dd91a --- /dev/null +++ b/src/locales/nl/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/nl/address/street_suffix.ts b/src/locales/nl/location/street_suffix.ts similarity index 100% rename from src/locales/nl/address/street_suffix.ts rename to src/locales/nl/location/street_suffix.ts diff --git a/src/locales/nl_BE/address/city.ts b/src/locales/nl_BE/address/city.ts deleted file mode 100644 index 5eaa0e417c3..00000000000 --- a/src/locales/nl_BE/address/city.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{address.city_prefix}}', - '{{address.city_prefix}}{{address.city_suffix}}', -]; diff --git a/src/locales/nl_BE/address/street.ts b/src/locales/nl_BE/address/street.ts deleted file mode 100644 index a32c95d3e61..00000000000 --- a/src/locales/nl_BE/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{person.first_name}}{{address.street_suffix}}', - '{{person.last_name}}{{address.street_suffix}}', -]; diff --git a/src/locales/nl_BE/address/street_address.ts b/src/locales/nl_BE/address/street_address.ts deleted file mode 100644 index d1e8da38725..00000000000 --- a/src/locales/nl_BE/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', -}; diff --git a/src/locales/nl_BE/index.ts b/src/locales/nl_BE/index.ts index bf5060d37bc..0e583ddd300 100644 --- a/src/locales/nl_BE/index.ts +++ b/src/locales/nl_BE/index.ts @@ -3,17 +3,17 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import company from './company'; import internet from './internet'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; const nl_BE: LocaleDefinition = { title: 'Dutch (Belgium)', - address, company, internet, + location, person, phone_number, }; diff --git a/src/locales/nl_BE/address/building_number.ts b/src/locales/nl_BE/location/building_number.ts similarity index 100% rename from src/locales/nl_BE/address/building_number.ts rename to src/locales/nl_BE/location/building_number.ts diff --git a/src/locales/nl_BE/location/city.ts b/src/locales/nl_BE/location/city.ts new file mode 100644 index 00000000000..2bddf0f5f12 --- /dev/null +++ b/src/locales/nl_BE/location/city.ts @@ -0,0 +1,4 @@ +export default [ + '{{location.city_prefix}}', + '{{location.city_prefix}}{{location.city_suffix}}', +]; diff --git a/src/locales/nl_BE/address/city_prefix.ts b/src/locales/nl_BE/location/city_prefix.ts similarity index 100% rename from src/locales/nl_BE/address/city_prefix.ts rename to src/locales/nl_BE/location/city_prefix.ts diff --git a/src/locales/nl_BE/address/city_suffix.ts b/src/locales/nl_BE/location/city_suffix.ts similarity index 100% rename from src/locales/nl_BE/address/city_suffix.ts rename to src/locales/nl_BE/location/city_suffix.ts diff --git a/src/locales/nl_BE/address/default_country.ts b/src/locales/nl_BE/location/default_country.ts similarity index 100% rename from src/locales/nl_BE/address/default_country.ts rename to src/locales/nl_BE/location/default_country.ts diff --git a/src/locales/nl_BE/address/index.ts b/src/locales/nl_BE/location/index.ts similarity index 86% rename from src/locales/nl_BE/address/index.ts rename to src/locales/nl_BE/location/index.ts index 6fa08a5538f..9b3006476ab 100644 --- a/src/locales/nl_BE/address/index.ts +++ b/src/locales/nl_BE/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_prefix from './city_prefix'; @@ -16,7 +16,7 @@ import street from './street'; import street_address from './street_address'; import street_suffix from './street_suffix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_prefix, @@ -31,4 +31,4 @@ const address: AddressDefinitions = { street_suffix, }; -export default address; +export default location; diff --git a/src/locales/nl_BE/address/postcode.ts b/src/locales/nl_BE/location/postcode.ts similarity index 100% rename from src/locales/nl_BE/address/postcode.ts rename to src/locales/nl_BE/location/postcode.ts diff --git a/src/locales/nl_BE/address/secondary_address.ts b/src/locales/nl_BE/location/secondary_address.ts similarity index 100% rename from src/locales/nl_BE/address/secondary_address.ts rename to src/locales/nl_BE/location/secondary_address.ts diff --git a/src/locales/nl_BE/address/state.ts b/src/locales/nl_BE/location/state.ts similarity index 100% rename from src/locales/nl_BE/address/state.ts rename to src/locales/nl_BE/location/state.ts diff --git a/src/locales/nl_BE/address/state_abbr.ts b/src/locales/nl_BE/location/state_abbr.ts similarity index 100% rename from src/locales/nl_BE/address/state_abbr.ts rename to src/locales/nl_BE/location/state_abbr.ts diff --git a/src/locales/nl_BE/location/street.ts b/src/locales/nl_BE/location/street.ts new file mode 100644 index 00000000000..06ca3a5e812 --- /dev/null +++ b/src/locales/nl_BE/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{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 new file mode 100644 index 00000000000..437f20dd91a --- /dev/null +++ b/src/locales/nl_BE/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/nl_BE/address/street_suffix.ts b/src/locales/nl_BE/location/street_suffix.ts similarity index 100% rename from src/locales/nl_BE/address/street_suffix.ts rename to src/locales/nl_BE/location/street_suffix.ts diff --git a/src/locales/pl/address/city.ts b/src/locales/pl/address/city.ts deleted file mode 100644 index e3da346bd1e..00000000000 --- a/src/locales/pl/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_name}}']; diff --git a/src/locales/pl/address/street.ts b/src/locales/pl/address/street.ts deleted file mode 100644 index 9e114ccbf34..00000000000 --- a/src/locales/pl/address/street.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.street_prefix}} {{person.last_name}}']; diff --git a/src/locales/pl/address/street_address.ts b/src/locales/pl/address/street_address.ts deleted file mode 100644 index d1e8da38725..00000000000 --- a/src/locales/pl/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', -}; diff --git a/src/locales/pl/index.ts b/src/locales/pl/index.ts index 23a88b720cc..47ce1069cb0 100644 --- a/src/locales/pl/index.ts +++ b/src/locales/pl/index.ts @@ -3,12 +3,12 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import animal from './animal'; import cell_phone from './cell_phone'; import color from './color'; import company from './company'; import internet from './internet'; +import location from './location'; import lorem from './lorem'; import music from './music'; import person from './person'; @@ -18,12 +18,12 @@ import team from './team'; const pl: LocaleDefinition = { title: 'Polish', - address, animal, cell_phone, color, company, internet, + location, lorem, music, person, diff --git a/src/locales/pl/address/building_number.ts b/src/locales/pl/location/building_number.ts similarity index 100% rename from src/locales/pl/address/building_number.ts rename to src/locales/pl/location/building_number.ts diff --git a/src/locales/pl/location/city.ts b/src/locales/pl/location/city.ts new file mode 100644 index 00000000000..ad43b68fc5c --- /dev/null +++ b/src/locales/pl/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_name}}']; diff --git a/src/locales/pl/address/city_name.ts b/src/locales/pl/location/city_name.ts similarity index 100% rename from src/locales/pl/address/city_name.ts rename to src/locales/pl/location/city_name.ts diff --git a/src/locales/pl/address/country.ts b/src/locales/pl/location/country.ts similarity index 100% rename from src/locales/pl/address/country.ts rename to src/locales/pl/location/country.ts diff --git a/src/locales/pl/address/default_country.ts b/src/locales/pl/location/default_country.ts similarity index 100% rename from src/locales/pl/address/default_country.ts rename to src/locales/pl/location/default_country.ts diff --git a/src/locales/pl/address/direction.ts b/src/locales/pl/location/direction.ts similarity index 100% rename from src/locales/pl/address/direction.ts rename to src/locales/pl/location/direction.ts diff --git a/src/locales/pl/address/direction_abbr.ts b/src/locales/pl/location/direction_abbr.ts similarity index 100% rename from src/locales/pl/address/direction_abbr.ts rename to src/locales/pl/location/direction_abbr.ts diff --git a/src/locales/pl/address/index.ts b/src/locales/pl/location/index.ts similarity index 87% rename from src/locales/pl/address/index.ts rename to src/locales/pl/location/index.ts index 8ccf41976a0..1985d6e2010 100644 --- a/src/locales/pl/address/index.ts +++ b/src/locales/pl/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_name from './city_name'; @@ -18,7 +18,7 @@ import street from './street'; import street_address from './street_address'; import street_prefix from './street_prefix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_name, @@ -35,4 +35,4 @@ const address: AddressDefinitions = { street_prefix, }; -export default address; +export default location; diff --git a/src/locales/pl/address/postcode.ts b/src/locales/pl/location/postcode.ts similarity index 100% rename from src/locales/pl/address/postcode.ts rename to src/locales/pl/location/postcode.ts diff --git a/src/locales/pl/address/secondary_address.ts b/src/locales/pl/location/secondary_address.ts similarity index 100% rename from src/locales/pl/address/secondary_address.ts rename to src/locales/pl/location/secondary_address.ts diff --git a/src/locales/pl/address/state.ts b/src/locales/pl/location/state.ts similarity index 100% rename from src/locales/pl/address/state.ts rename to src/locales/pl/location/state.ts diff --git a/src/locales/pl/address/state_abbr.ts b/src/locales/pl/location/state_abbr.ts similarity index 100% rename from src/locales/pl/address/state_abbr.ts rename to src/locales/pl/location/state_abbr.ts diff --git a/src/locales/pl/location/street.ts b/src/locales/pl/location/street.ts new file mode 100644 index 00000000000..7862632a955 --- /dev/null +++ b/src/locales/pl/location/street.ts @@ -0,0 +1 @@ +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 new file mode 100644 index 00000000000..437f20dd91a --- /dev/null +++ b/src/locales/pl/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/pl/address/street_prefix.ts b/src/locales/pl/location/street_prefix.ts similarity index 100% rename from src/locales/pl/address/street_prefix.ts rename to src/locales/pl/location/street_prefix.ts 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/address/city.ts b/src/locales/pt_BR/address/city.ts deleted file mode 100644 index ea6ea950e46..00000000000 --- a/src/locales/pt_BR/address/city.ts +++ /dev/null @@ -1,6 +0,0 @@ -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}}', -]; diff --git a/src/locales/pt_BR/address/street.ts b/src/locales/pt_BR/address/street.ts deleted file mode 100644 index f7dd9d3b3aa..00000000000 --- a/src/locales/pt_BR/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', -]; diff --git a/src/locales/pt_BR/index.ts b/src/locales/pt_BR/index.ts index 0f7aafa8ee2..3e8a301a154 100644 --- a/src/locales/pt_BR/index.ts +++ b/src/locales/pt_BR/index.ts @@ -3,24 +3,24 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import color from './color'; import commerce from './commerce'; import company from './company'; import date from './date'; import internet from './internet'; +import location from './location'; import lorem from './lorem'; import person from './person'; import phone_number from './phone_number'; const pt_BR: LocaleDefinition = { title: 'Portuguese (Brazil)', - address, color, commerce, company, date, internet, + location, lorem, person, phone_number, diff --git a/src/locales/pt_BR/address/building_number.ts b/src/locales/pt_BR/location/building_number.ts similarity index 100% rename from src/locales/pt_BR/address/building_number.ts rename to src/locales/pt_BR/location/building_number.ts diff --git a/src/locales/pt_BR/location/city.ts b/src/locales/pt_BR/location/city.ts new file mode 100644 index 00000000000..7375aa8378a --- /dev/null +++ b/src/locales/pt_BR/location/city.ts @@ -0,0 +1,6 @@ +export default [ + '{{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/address/city_prefix.ts b/src/locales/pt_BR/location/city_prefix.ts similarity index 100% rename from src/locales/pt_BR/address/city_prefix.ts rename to src/locales/pt_BR/location/city_prefix.ts diff --git a/src/locales/pt_BR/address/city_suffix.ts b/src/locales/pt_BR/location/city_suffix.ts similarity index 100% rename from src/locales/pt_BR/address/city_suffix.ts rename to src/locales/pt_BR/location/city_suffix.ts diff --git a/src/locales/pt_BR/address/country.ts b/src/locales/pt_BR/location/country.ts similarity index 100% rename from src/locales/pt_BR/address/country.ts rename to src/locales/pt_BR/location/country.ts diff --git a/src/locales/pt_BR/address/default_country.ts b/src/locales/pt_BR/location/default_country.ts similarity index 100% rename from src/locales/pt_BR/address/default_country.ts rename to src/locales/pt_BR/location/default_country.ts diff --git a/src/locales/pt_BR/address/index.ts b/src/locales/pt_BR/location/index.ts similarity index 86% rename from src/locales/pt_BR/address/index.ts rename to src/locales/pt_BR/location/index.ts index 96786c71510..b7bdee9b7ad 100644 --- a/src/locales/pt_BR/address/index.ts +++ b/src/locales/pt_BR/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_prefix from './city_prefix'; @@ -16,7 +16,7 @@ import state_abbr from './state_abbr'; import street from './street'; import street_suffix from './street_suffix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_prefix, @@ -31,4 +31,4 @@ const address: AddressDefinitions = { street_suffix, }; -export default address; +export default location; diff --git a/src/locales/pt_BR/address/postcode.ts b/src/locales/pt_BR/location/postcode.ts similarity index 100% rename from src/locales/pt_BR/address/postcode.ts rename to src/locales/pt_BR/location/postcode.ts diff --git a/src/locales/pt_BR/address/secondary_address.ts b/src/locales/pt_BR/location/secondary_address.ts similarity index 100% rename from src/locales/pt_BR/address/secondary_address.ts rename to src/locales/pt_BR/location/secondary_address.ts diff --git a/src/locales/pt_BR/address/state.ts b/src/locales/pt_BR/location/state.ts similarity index 100% rename from src/locales/pt_BR/address/state.ts rename to src/locales/pt_BR/location/state.ts diff --git a/src/locales/pt_BR/address/state_abbr.ts b/src/locales/pt_BR/location/state_abbr.ts similarity index 100% rename from src/locales/pt_BR/address/state_abbr.ts rename to src/locales/pt_BR/location/state_abbr.ts diff --git a/src/locales/pt_BR/location/street.ts b/src/locales/pt_BR/location/street.ts new file mode 100644 index 00000000000..af32d0c4248 --- /dev/null +++ b/src/locales/pt_BR/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', +]; diff --git a/src/locales/pt_BR/address/street_suffix.ts b/src/locales/pt_BR/location/street_suffix.ts similarity index 100% rename from src/locales/pt_BR/address/street_suffix.ts rename to src/locales/pt_BR/location/street_suffix.ts diff --git a/src/locales/pt_PT/address/city.ts b/src/locales/pt_PT/address/city.ts deleted file mode 100644 index e3da346bd1e..00000000000 --- a/src/locales/pt_PT/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_name}}']; diff --git a/src/locales/pt_PT/address/street.ts b/src/locales/pt_PT/address/street.ts deleted file mode 100644 index 603c6461782..00000000000 --- a/src/locales/pt_PT/address/street.ts +++ /dev/null @@ -1,7 +0,0 @@ -export default [ - '{{address.street_prefix}} {{person.first_name}} {{person.last_name}}', - 'N#', - 'N##', - 'N###', - 'N###-#', -]; diff --git a/src/locales/pt_PT/address/street_address.ts b/src/locales/pt_PT/address/street_address.ts deleted file mode 100644 index d1e8da38725..00000000000 --- a/src/locales/pt_PT/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', -}; diff --git a/src/locales/pt_PT/index.ts b/src/locales/pt_PT/index.ts index 3c9fab57572..cdb92a61d53 100644 --- a/src/locales/pt_PT/index.ts +++ b/src/locales/pt_PT/index.ts @@ -3,23 +3,23 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import cell_phone from './cell_phone'; import color from './color'; import commerce from './commerce'; import date from './date'; import internet from './internet'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; const pt_PT: LocaleDefinition = { title: 'Portuguese (Portugal)', - address, cell_phone, color, commerce, date, internet, + location, person, phone_number, }; diff --git a/src/locales/pt_PT/address/building_number.ts b/src/locales/pt_PT/location/building_number.ts similarity index 100% rename from src/locales/pt_PT/address/building_number.ts rename to src/locales/pt_PT/location/building_number.ts diff --git a/src/locales/pt_PT/location/city.ts b/src/locales/pt_PT/location/city.ts new file mode 100644 index 00000000000..ad43b68fc5c --- /dev/null +++ b/src/locales/pt_PT/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_name}}']; diff --git a/src/locales/pt_PT/address/city_name.ts b/src/locales/pt_PT/location/city_name.ts similarity index 100% rename from src/locales/pt_PT/address/city_name.ts rename to src/locales/pt_PT/location/city_name.ts diff --git a/src/locales/pt_PT/address/city_prefix.ts b/src/locales/pt_PT/location/city_prefix.ts similarity index 100% rename from src/locales/pt_PT/address/city_prefix.ts rename to src/locales/pt_PT/location/city_prefix.ts diff --git a/src/locales/pt_PT/address/city_suffix.ts b/src/locales/pt_PT/location/city_suffix.ts similarity index 100% rename from src/locales/pt_PT/address/city_suffix.ts rename to src/locales/pt_PT/location/city_suffix.ts diff --git a/src/locales/pt_PT/address/country.ts b/src/locales/pt_PT/location/country.ts similarity index 100% rename from src/locales/pt_PT/address/country.ts rename to src/locales/pt_PT/location/country.ts diff --git a/src/locales/pt_PT/address/default_country.ts b/src/locales/pt_PT/location/default_country.ts similarity index 100% rename from src/locales/pt_PT/address/default_country.ts rename to src/locales/pt_PT/location/default_country.ts diff --git a/src/locales/pt_PT/address/direction.ts b/src/locales/pt_PT/location/direction.ts similarity index 100% rename from src/locales/pt_PT/address/direction.ts rename to src/locales/pt_PT/location/direction.ts diff --git a/src/locales/pt_PT/address/index.ts b/src/locales/pt_PT/location/index.ts similarity index 86% rename from src/locales/pt_PT/address/index.ts rename to src/locales/pt_PT/location/index.ts index c15ccdb2b7b..63674a1f623 100644 --- a/src/locales/pt_PT/address/index.ts +++ b/src/locales/pt_PT/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_name from './city_name'; @@ -16,7 +16,7 @@ import street from './street'; import street_address from './street_address'; import street_prefix from './street_prefix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_name, @@ -31,4 +31,4 @@ const address: AddressDefinitions = { street_prefix, }; -export default address; +export default location; diff --git a/src/locales/pt_PT/address/postcode.ts b/src/locales/pt_PT/location/postcode.ts similarity index 100% rename from src/locales/pt_PT/address/postcode.ts rename to src/locales/pt_PT/location/postcode.ts diff --git a/src/locales/pt_PT/location/street.ts b/src/locales/pt_PT/location/street.ts new file mode 100644 index 00000000000..f579edee3d3 --- /dev/null +++ b/src/locales/pt_PT/location/street.ts @@ -0,0 +1,7 @@ +export default [ + '{{location.street_prefix}} {{person.first_name}} {{person.last_name}}', + 'N#', + 'N##', + 'N###', + 'N###-#', +]; diff --git a/src/locales/pt_PT/location/street_address.ts b/src/locales/pt_PT/location/street_address.ts new file mode 100644 index 00000000000..437f20dd91a --- /dev/null +++ b/src/locales/pt_PT/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/pt_PT/address/street_prefix.ts b/src/locales/pt_PT/location/street_prefix.ts similarity index 100% rename from src/locales/pt_PT/address/street_prefix.ts rename to src/locales/pt_PT/location/street_prefix.ts diff --git a/src/locales/ro/address/city.ts b/src/locales/ro/address/city.ts deleted file mode 100644 index d77ac09a558..00000000000 --- a/src/locales/ro/address/city.ts +++ /dev/null @@ -1,7 +0,0 @@ -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}}', -]; diff --git a/src/locales/ro/address/street.ts b/src/locales/ro/address/street.ts deleted file mode 100644 index b16d72dd9c4..00000000000 --- a/src/locales/ro/address/street.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.street_suffix}} {{address.street_name}}']; diff --git a/src/locales/ro/address/street_address.ts b/src/locales/ro/address/street_address.ts deleted file mode 100644 index 510bbab314d..00000000000 --- a/src/locales/ro/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}}, {{address.buildingNumber}}', - full: '{{address.street}}, {{address.buildingNumber}}, {{address.secondaryAddress}}', -}; diff --git a/src/locales/ro/index.ts b/src/locales/ro/index.ts index 5580d63d49e..b1e5bbed720 100644 --- a/src/locales/ro/index.ts +++ b/src/locales/ro/index.ts @@ -3,19 +3,19 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import cell_phone from './cell_phone'; import date from './date'; import internet from './internet'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; const ro: LocaleDefinition = { title: 'Romanian', - address, cell_phone, date, internet, + location, person, phone_number, }; diff --git a/src/locales/ro/address/building_number.ts b/src/locales/ro/location/building_number.ts similarity index 100% rename from src/locales/ro/address/building_number.ts rename to src/locales/ro/location/building_number.ts diff --git a/src/locales/ro/location/city.ts b/src/locales/ro/location/city.ts new file mode 100644 index 00000000000..0d422527891 --- /dev/null +++ b/src/locales/ro/location/city.ts @@ -0,0 +1,7 @@ +export default [ + '{{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/address/city_name.ts b/src/locales/ro/location/city_name.ts similarity index 100% rename from src/locales/ro/address/city_name.ts rename to src/locales/ro/location/city_name.ts diff --git a/src/locales/ro/address/county.ts b/src/locales/ro/location/county.ts similarity index 100% rename from src/locales/ro/address/county.ts rename to src/locales/ro/location/county.ts diff --git a/src/locales/ro/address/default_country.ts b/src/locales/ro/location/default_country.ts similarity index 100% rename from src/locales/ro/address/default_country.ts rename to src/locales/ro/location/default_country.ts diff --git a/src/locales/ro/address/index.ts b/src/locales/ro/location/index.ts similarity index 87% rename from src/locales/ro/address/index.ts rename to src/locales/ro/location/index.ts index 7a7457117eb..bc610ff8efe 100644 --- a/src/locales/ro/address/index.ts +++ b/src/locales/ro/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_name from './city_name'; @@ -17,7 +17,7 @@ import street_address from './street_address'; import street_name from './street_name'; import street_suffix from './street_suffix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_name, @@ -33,4 +33,4 @@ const address: AddressDefinitions = { street_suffix, }; -export default address; +export default location; diff --git a/src/locales/ro/address/postcode.ts b/src/locales/ro/location/postcode.ts similarity index 100% rename from src/locales/ro/address/postcode.ts rename to src/locales/ro/location/postcode.ts diff --git a/src/locales/ro/address/secondary_address.ts b/src/locales/ro/location/secondary_address.ts similarity index 100% rename from src/locales/ro/address/secondary_address.ts rename to src/locales/ro/location/secondary_address.ts diff --git a/src/locales/ro/address/state.ts b/src/locales/ro/location/state.ts similarity index 100% rename from src/locales/ro/address/state.ts rename to src/locales/ro/location/state.ts diff --git a/src/locales/ro/address/state_abbr.ts b/src/locales/ro/location/state_abbr.ts similarity index 100% rename from src/locales/ro/address/state_abbr.ts rename to src/locales/ro/location/state_abbr.ts diff --git a/src/locales/ro/location/street.ts b/src/locales/ro/location/street.ts new file mode 100644 index 00000000000..e5bab9f76c3 --- /dev/null +++ b/src/locales/ro/location/street.ts @@ -0,0 +1 @@ +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 new file mode 100644 index 00000000000..b1cf56fcac2 --- /dev/null +++ b/src/locales/ro/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}}, {{location.buildingNumber}}', + full: '{{location.street}}, {{location.buildingNumber}}, {{location.secondaryAddress}}', +}; diff --git a/src/locales/ro/address/street_name.ts b/src/locales/ro/location/street_name.ts similarity index 100% rename from src/locales/ro/address/street_name.ts rename to src/locales/ro/location/street_name.ts diff --git a/src/locales/ro/address/street_suffix.ts b/src/locales/ro/location/street_suffix.ts similarity index 100% rename from src/locales/ro/address/street_suffix.ts rename to src/locales/ro/location/street_suffix.ts diff --git a/src/locales/ru/address/city.ts b/src/locales/ru/address/city.ts deleted file mode 100644 index e3da346bd1e..00000000000 --- a/src/locales/ru/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_name}}']; diff --git a/src/locales/ru/address/street.ts b/src/locales/ru/address/street.ts deleted file mode 100644 index bddea6b0e50..00000000000 --- a/src/locales/ru/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{address.street_suffix}} {{address.street_name}}', - '{{address.street_name}} {{address.street_suffix}}', -]; diff --git a/src/locales/ru/address/street_address.ts b/src/locales/ru/address/street_address.ts deleted file mode 100644 index 9a8e4da4839..00000000000 --- a/src/locales/ru/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}}, {{address.buildingNumber}}', - full: '{{address.street}}, {{address.buildingNumber}} {{address.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/index.ts b/src/locales/ru/index.ts index 445fb973f1f..966430dbd56 100644 --- a/src/locales/ru/index.ts +++ b/src/locales/ru/index.ts @@ -3,13 +3,13 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import color from './color'; import commerce from './commerce'; import company from './company'; import date from './date'; import hacker from './hacker'; import internet from './internet'; +import location from './location'; import lorem from './lorem'; import person from './person'; import phone_number from './phone_number'; @@ -17,13 +17,13 @@ import phone_number from './phone_number'; const ru: LocaleDefinition = { title: 'Russian', separator: ' и ', - address, color, commerce, company, date, hacker, internet, + location, lorem, person, phone_number, diff --git a/src/locales/ru/address/building_number.ts b/src/locales/ru/location/building_number.ts similarity index 100% rename from src/locales/ru/address/building_number.ts rename to src/locales/ru/location/building_number.ts diff --git a/src/locales/ru/location/city.ts b/src/locales/ru/location/city.ts new file mode 100644 index 00000000000..ad43b68fc5c --- /dev/null +++ b/src/locales/ru/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_name}}']; diff --git a/src/locales/ru/address/city_name.ts b/src/locales/ru/location/city_name.ts similarity index 100% rename from src/locales/ru/address/city_name.ts rename to src/locales/ru/location/city_name.ts diff --git a/src/locales/ru/address/country.ts b/src/locales/ru/location/country.ts similarity index 100% rename from src/locales/ru/address/country.ts rename to src/locales/ru/location/country.ts diff --git a/src/locales/ru/address/default_country.ts b/src/locales/ru/location/default_country.ts similarity index 100% rename from src/locales/ru/address/default_country.ts rename to src/locales/ru/location/default_country.ts diff --git a/src/locales/ru/address/index.ts b/src/locales/ru/location/index.ts similarity index 86% rename from src/locales/ru/address/index.ts rename to src/locales/ru/location/index.ts index 3c37ba5f4fa..b28b0dfbfb3 100644 --- a/src/locales/ru/address/index.ts +++ b/src/locales/ru/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_name from './city_name'; @@ -16,7 +16,7 @@ import street_address from './street_address'; import street_name from './street_name'; import street_suffix from './street_suffix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_name, @@ -31,4 +31,4 @@ const address: AddressDefinitions = { street_suffix, }; -export default address; +export default location; diff --git a/src/locales/ru/address/postcode.ts b/src/locales/ru/location/postcode.ts similarity index 100% rename from src/locales/ru/address/postcode.ts rename to src/locales/ru/location/postcode.ts diff --git a/src/locales/ru/address/secondary_address.ts b/src/locales/ru/location/secondary_address.ts similarity index 100% rename from src/locales/ru/address/secondary_address.ts rename to src/locales/ru/location/secondary_address.ts diff --git a/src/locales/ru/address/state.ts b/src/locales/ru/location/state.ts similarity index 100% rename from src/locales/ru/address/state.ts rename to src/locales/ru/location/state.ts diff --git a/src/locales/ru/location/street.ts b/src/locales/ru/location/street.ts new file mode 100644 index 00000000000..523f81653d1 --- /dev/null +++ b/src/locales/ru/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{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 new file mode 100644 index 00000000000..3394fef6dc2 --- /dev/null +++ b/src/locales/ru/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}}, {{location.buildingNumber}}', + full: '{{location.street}}, {{location.buildingNumber}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/ru/address/street_name.ts b/src/locales/ru/location/street_name.ts similarity index 100% rename from src/locales/ru/address/street_name.ts rename to src/locales/ru/location/street_name.ts diff --git a/src/locales/ru/address/street_suffix.ts b/src/locales/ru/location/street_suffix.ts similarity index 100% rename from src/locales/ru/address/street_suffix.ts rename to src/locales/ru/location/street_suffix.ts diff --git a/src/locales/sk/address/city.ts b/src/locales/sk/address/city.ts deleted file mode 100644 index e3da346bd1e..00000000000 --- a/src/locales/sk/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_name}}']; diff --git a/src/locales/sk/address/street.ts b/src/locales/sk/address/street.ts deleted file mode 100644 index 30ba73fc997..00000000000 --- a/src/locales/sk/address/street.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.street_name}}']; diff --git a/src/locales/sk/address/street_address.ts b/src/locales/sk/address/street_address.ts deleted file mode 100644 index d1e8da38725..00000000000 --- a/src/locales/sk/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', -}; diff --git a/src/locales/sk/index.ts b/src/locales/sk/index.ts index 0a034db0e8a..a44966ac855 100644 --- a/src/locales/sk/index.ts +++ b/src/locales/sk/index.ts @@ -3,18 +3,18 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import company from './company'; import internet from './internet'; +import location from './location'; import lorem from './lorem'; import person from './person'; import phone_number from './phone_number'; const sk: LocaleDefinition = { title: 'Slovakian', - address, company, internet, + location, lorem, person, phone_number, diff --git a/src/locales/sk/address/building_number.ts b/src/locales/sk/location/building_number.ts similarity index 100% rename from src/locales/sk/address/building_number.ts rename to src/locales/sk/location/building_number.ts diff --git a/src/locales/sk/location/city.ts b/src/locales/sk/location/city.ts new file mode 100644 index 00000000000..ad43b68fc5c --- /dev/null +++ b/src/locales/sk/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_name}}']; diff --git a/src/locales/sk/address/city_name.ts b/src/locales/sk/location/city_name.ts similarity index 100% rename from src/locales/sk/address/city_name.ts rename to src/locales/sk/location/city_name.ts diff --git a/src/locales/sk/address/city_prefix.ts b/src/locales/sk/location/city_prefix.ts similarity index 100% rename from src/locales/sk/address/city_prefix.ts rename to src/locales/sk/location/city_prefix.ts diff --git a/src/locales/sk/address/city_suffix.ts b/src/locales/sk/location/city_suffix.ts similarity index 100% rename from src/locales/sk/address/city_suffix.ts rename to src/locales/sk/location/city_suffix.ts diff --git a/src/locales/sk/address/country.ts b/src/locales/sk/location/country.ts similarity index 100% rename from src/locales/sk/address/country.ts rename to src/locales/sk/location/country.ts diff --git a/src/locales/sk/address/default_country.ts b/src/locales/sk/location/default_country.ts similarity index 100% rename from src/locales/sk/address/default_country.ts rename to src/locales/sk/location/default_country.ts diff --git a/src/locales/de/address/index.ts b/src/locales/sk/location/index.ts similarity index 87% rename from src/locales/de/address/index.ts rename to src/locales/sk/location/index.ts index 2551894c00d..93f5515ec57 100644 --- a/src/locales/de/address/index.ts +++ b/src/locales/sk/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_name from './city_name'; @@ -18,7 +18,7 @@ import street from './street'; import street_address from './street_address'; import street_name from './street_name'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_name, @@ -35,4 +35,4 @@ const address: AddressDefinitions = { street_name, }; -export default address; +export default location; diff --git a/src/locales/sk/address/postcode.ts b/src/locales/sk/location/postcode.ts similarity index 100% rename from src/locales/sk/address/postcode.ts rename to src/locales/sk/location/postcode.ts diff --git a/src/locales/sk/address/secondary_address.ts b/src/locales/sk/location/secondary_address.ts similarity index 100% rename from src/locales/sk/address/secondary_address.ts rename to src/locales/sk/location/secondary_address.ts diff --git a/src/locales/sk/address/state.ts b/src/locales/sk/location/state.ts similarity index 100% rename from src/locales/sk/address/state.ts rename to src/locales/sk/location/state.ts diff --git a/src/locales/sk/address/state_abbr.ts b/src/locales/sk/location/state_abbr.ts similarity index 100% rename from src/locales/sk/address/state_abbr.ts rename to src/locales/sk/location/state_abbr.ts diff --git a/src/locales/sk/location/street.ts b/src/locales/sk/location/street.ts new file mode 100644 index 00000000000..30a9a5ddf99 --- /dev/null +++ b/src/locales/sk/location/street.ts @@ -0,0 +1 @@ +export default ['{{location.street_name}}']; diff --git a/src/locales/sk/location/street_address.ts b/src/locales/sk/location/street_address.ts new file mode 100644 index 00000000000..437f20dd91a --- /dev/null +++ b/src/locales/sk/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/sk/address/street_name.ts b/src/locales/sk/location/street_name.ts similarity index 100% rename from src/locales/sk/address/street_name.ts rename to src/locales/sk/location/street_name.ts diff --git a/src/locales/sv/address/city.ts b/src/locales/sv/address/city.ts deleted file mode 100644 index b53f9163cf5..00000000000 --- a/src/locales/sv/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_prefix}}{{address.city_suffix}}']; diff --git a/src/locales/sv/address/street.ts b/src/locales/sv/address/street.ts deleted file mode 100644 index 72310d5affe..00000000000 --- a/src/locales/sv/address/street.ts +++ /dev/null @@ -1,6 +0,0 @@ -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}}', -]; diff --git a/src/locales/sv/address/street_address.ts b/src/locales/sv/address/street_address.ts deleted file mode 100644 index d1e8da38725..00000000000 --- a/src/locales/sv/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', -}; diff --git a/src/locales/sv/index.ts b/src/locales/sv/index.ts index b9fb05b4e6e..c017bd6abc7 100644 --- a/src/locales/sv/index.ts +++ b/src/locales/sv/index.ts @@ -3,26 +3,26 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import cell_phone from './cell_phone'; import color from './color'; import commerce from './commerce'; import company from './company'; import date from './date'; import internet from './internet'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; import team from './team'; const sv: LocaleDefinition = { title: 'Swedish', - address, cell_phone, color, commerce, company, date, internet, + location, person, phone_number, team, diff --git a/src/locales/sv/address/building_number.ts b/src/locales/sv/location/building_number.ts similarity index 100% rename from src/locales/sv/address/building_number.ts rename to src/locales/sv/location/building_number.ts diff --git a/src/locales/sv/location/city.ts b/src/locales/sv/location/city.ts new file mode 100644 index 00000000000..aa67dfa8896 --- /dev/null +++ b/src/locales/sv/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_prefix}}{{location.city_suffix}}']; diff --git a/src/locales/sv/address/city_prefix.ts b/src/locales/sv/location/city_prefix.ts similarity index 100% rename from src/locales/sv/address/city_prefix.ts rename to src/locales/sv/location/city_prefix.ts diff --git a/src/locales/sv/address/city_suffix.ts b/src/locales/sv/location/city_suffix.ts similarity index 100% rename from src/locales/sv/address/city_suffix.ts rename to src/locales/sv/location/city_suffix.ts diff --git a/src/locales/sv/address/common_street_suffix.ts b/src/locales/sv/location/common_street_suffix.ts similarity index 100% rename from src/locales/sv/address/common_street_suffix.ts rename to src/locales/sv/location/common_street_suffix.ts diff --git a/src/locales/sv/address/country.ts b/src/locales/sv/location/country.ts similarity index 100% rename from src/locales/sv/address/country.ts rename to src/locales/sv/location/country.ts diff --git a/src/locales/sv/address/default_country.ts b/src/locales/sv/location/default_country.ts similarity index 100% rename from src/locales/sv/address/default_country.ts rename to src/locales/sv/location/default_country.ts diff --git a/src/locales/sv/address/index.ts b/src/locales/sv/location/index.ts similarity index 88% rename from src/locales/sv/address/index.ts rename to src/locales/sv/location/index.ts index 7285f8b430e..e243b6bd9a0 100644 --- a/src/locales/sv/address/index.ts +++ b/src/locales/sv/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_prefix from './city_prefix'; @@ -19,7 +19,7 @@ import street_name from './street_name'; import street_prefix from './street_prefix'; import street_suffix from './street_suffix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_prefix, @@ -37,4 +37,4 @@ const address: AddressDefinitions = { street_suffix, }; -export default address; +export default location; diff --git a/src/locales/sv/address/postcode.ts b/src/locales/sv/location/postcode.ts similarity index 100% rename from src/locales/sv/address/postcode.ts rename to src/locales/sv/location/postcode.ts diff --git a/src/locales/sv/address/secondary_address.ts b/src/locales/sv/location/secondary_address.ts similarity index 100% rename from src/locales/sv/address/secondary_address.ts rename to src/locales/sv/location/secondary_address.ts diff --git a/src/locales/sv/address/state.ts b/src/locales/sv/location/state.ts similarity index 100% rename from src/locales/sv/address/state.ts rename to src/locales/sv/location/state.ts diff --git a/src/locales/sv/location/street.ts b/src/locales/sv/location/street.ts new file mode 100644 index 00000000000..1e4fbfd7e5a --- /dev/null +++ b/src/locales/sv/location/street.ts @@ -0,0 +1,6 @@ +export default [ + '{{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 new file mode 100644 index 00000000000..437f20dd91a --- /dev/null +++ b/src/locales/sv/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/sv/address/street_name.ts b/src/locales/sv/location/street_name.ts similarity index 100% rename from src/locales/sv/address/street_name.ts rename to src/locales/sv/location/street_name.ts diff --git a/src/locales/sv/address/street_prefix.ts b/src/locales/sv/location/street_prefix.ts similarity index 100% rename from src/locales/sv/address/street_prefix.ts rename to src/locales/sv/location/street_prefix.ts diff --git a/src/locales/sv/address/street_suffix.ts b/src/locales/sv/location/street_suffix.ts similarity index 100% rename from src/locales/sv/address/street_suffix.ts rename to src/locales/sv/location/street_suffix.ts 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/address/city.ts b/src/locales/tr/address/city.ts deleted file mode 100644 index d77ac09a558..00000000000 --- a/src/locales/tr/address/city.ts +++ /dev/null @@ -1,7 +0,0 @@ -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}}', -]; diff --git a/src/locales/tr/address/street.ts b/src/locales/tr/address/street.ts deleted file mode 100644 index 30ba73fc997..00000000000 --- a/src/locales/tr/address/street.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.street_name}}']; diff --git a/src/locales/tr/address/street_address.ts b/src/locales/tr/address/street_address.ts deleted file mode 100644 index d1e8da38725..00000000000 --- a/src/locales/tr/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}} {{address.buildingNumber}}', - full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}', -}; diff --git a/src/locales/tr/index.ts b/src/locales/tr/index.ts index 9ed3b8e91f7..ae7a9a8d709 100644 --- a/src/locales/tr/index.ts +++ b/src/locales/tr/index.ts @@ -3,22 +3,22 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import cell_phone from './cell_phone'; import color from './color'; import commerce from './commerce'; import internet from './internet'; +import location from './location'; import lorem from './lorem'; import person from './person'; import phone_number from './phone_number'; const tr: LocaleDefinition = { title: 'Turkish', - address, cell_phone, color, commerce, internet, + location, lorem, person, phone_number, diff --git a/src/locales/tr/address/building_number.ts b/src/locales/tr/location/building_number.ts similarity index 100% rename from src/locales/tr/address/building_number.ts rename to src/locales/tr/location/building_number.ts diff --git a/src/locales/tr/location/city.ts b/src/locales/tr/location/city.ts new file mode 100644 index 00000000000..0d422527891 --- /dev/null +++ b/src/locales/tr/location/city.ts @@ -0,0 +1,7 @@ +export default [ + '{{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/address/city_name.ts b/src/locales/tr/location/city_name.ts similarity index 100% rename from src/locales/tr/address/city_name.ts rename to src/locales/tr/location/city_name.ts diff --git a/src/locales/tr/address/country.ts b/src/locales/tr/location/country.ts similarity index 100% rename from src/locales/tr/address/country.ts rename to src/locales/tr/location/country.ts diff --git a/src/locales/tr/address/default_country.ts b/src/locales/tr/location/default_country.ts similarity index 100% rename from src/locales/tr/address/default_country.ts rename to src/locales/tr/location/default_country.ts diff --git a/src/locales/tr/address/index.ts b/src/locales/tr/location/index.ts similarity index 82% rename from src/locales/tr/address/index.ts rename to src/locales/tr/location/index.ts index f0885cf5562..3554b1a9c71 100644 --- a/src/locales/tr/address/index.ts +++ b/src/locales/tr/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_name from './city_name'; @@ -13,7 +13,7 @@ import street from './street'; import street_address from './street_address'; import street_name from './street_name'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_name, @@ -25,4 +25,4 @@ const address: AddressDefinitions = { street_name, }; -export default address; +export default location; diff --git a/src/locales/tr/address/postcode.ts b/src/locales/tr/location/postcode.ts similarity index 100% rename from src/locales/tr/address/postcode.ts rename to src/locales/tr/location/postcode.ts diff --git a/src/locales/tr/location/street.ts b/src/locales/tr/location/street.ts new file mode 100644 index 00000000000..30a9a5ddf99 --- /dev/null +++ b/src/locales/tr/location/street.ts @@ -0,0 +1 @@ +export default ['{{location.street_name}}']; diff --git a/src/locales/tr/location/street_address.ts b/src/locales/tr/location/street_address.ts new file mode 100644 index 00000000000..437f20dd91a --- /dev/null +++ b/src/locales/tr/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}} {{location.buildingNumber}}', + full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/tr/address/street_name.ts b/src/locales/tr/location/street_name.ts similarity index 100% rename from src/locales/tr/address/street_name.ts rename to src/locales/tr/location/street_name.ts diff --git a/src/locales/uk/address/city.ts b/src/locales/uk/address/city.ts deleted file mode 100644 index f99cfa3301f..00000000000 --- a/src/locales/uk/address/city.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{address.city_name}}', - '{{address.city_prefix}} {{person.male_first_name}}', -]; diff --git a/src/locales/uk/address/street.ts b/src/locales/uk/address/street.ts deleted file mode 100644 index ce1d4f4df97..00000000000 --- a/src/locales/uk/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{address.street_prefix}} {{address.street_name}}', - '{{address.street_name}} {{address.street_suffix}}', -]; diff --git a/src/locales/uk/address/street_address.ts b/src/locales/uk/address/street_address.ts deleted file mode 100644 index 9a8e4da4839..00000000000 --- a/src/locales/uk/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}}, {{address.buildingNumber}}', - full: '{{address.street}}, {{address.buildingNumber}} {{address.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/index.ts b/src/locales/uk/index.ts index bcdfda4e291..5c450ec1f89 100644 --- a/src/locales/uk/index.ts +++ b/src/locales/uk/index.ts @@ -3,17 +3,17 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import company from './company'; import internet from './internet'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; const uk: LocaleDefinition = { title: 'Ukrainian', - address, company, internet, + location, person, phone_number, }; diff --git a/src/locales/uk/address/building_number.ts b/src/locales/uk/location/building_number.ts similarity index 100% rename from src/locales/uk/address/building_number.ts rename to src/locales/uk/location/building_number.ts diff --git a/src/locales/uk/location/city.ts b/src/locales/uk/location/city.ts new file mode 100644 index 00000000000..da2f6aad4da --- /dev/null +++ b/src/locales/uk/location/city.ts @@ -0,0 +1,4 @@ +export default [ + '{{location.city_name}}', + '{{location.city_prefix}} {{person.male_first_name}}', +]; diff --git a/src/locales/uk/address/city_name.ts b/src/locales/uk/location/city_name.ts similarity index 100% rename from src/locales/uk/address/city_name.ts rename to src/locales/uk/location/city_name.ts diff --git a/src/locales/uk/address/city_prefix.ts b/src/locales/uk/location/city_prefix.ts similarity index 100% rename from src/locales/uk/address/city_prefix.ts rename to src/locales/uk/location/city_prefix.ts diff --git a/src/locales/uk/address/city_suffix.ts b/src/locales/uk/location/city_suffix.ts similarity index 100% rename from src/locales/uk/address/city_suffix.ts rename to src/locales/uk/location/city_suffix.ts diff --git a/src/locales/uk/address/country.ts b/src/locales/uk/location/country.ts similarity index 100% rename from src/locales/uk/address/country.ts rename to src/locales/uk/location/country.ts diff --git a/src/locales/uk/address/default_country.ts b/src/locales/uk/location/default_country.ts similarity index 100% rename from src/locales/uk/address/default_country.ts rename to src/locales/uk/location/default_country.ts diff --git a/src/locales/uk/address/index.ts b/src/locales/uk/location/index.ts similarity index 88% rename from src/locales/uk/address/index.ts rename to src/locales/uk/location/index.ts index becc319bf59..17e4efa9dd3 100644 --- a/src/locales/uk/address/index.ts +++ b/src/locales/uk/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_name from './city_name'; @@ -19,7 +19,7 @@ import street_name from './street_name'; import street_prefix from './street_prefix'; import street_suffix from './street_suffix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_name, @@ -37,4 +37,4 @@ const address: AddressDefinitions = { street_suffix, }; -export default address; +export default location; diff --git a/src/locales/uk/address/postcode.ts b/src/locales/uk/location/postcode.ts similarity index 100% rename from src/locales/uk/address/postcode.ts rename to src/locales/uk/location/postcode.ts diff --git a/src/locales/uk/address/secondary_address.ts b/src/locales/uk/location/secondary_address.ts similarity index 100% rename from src/locales/uk/address/secondary_address.ts rename to src/locales/uk/location/secondary_address.ts diff --git a/src/locales/uk/address/state.ts b/src/locales/uk/location/state.ts similarity index 100% rename from src/locales/uk/address/state.ts rename to src/locales/uk/location/state.ts diff --git a/src/locales/uk/location/street.ts b/src/locales/uk/location/street.ts new file mode 100644 index 00000000000..2dc80f1c268 --- /dev/null +++ b/src/locales/uk/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{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 new file mode 100644 index 00000000000..3394fef6dc2 --- /dev/null +++ b/src/locales/uk/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}}, {{location.buildingNumber}}', + full: '{{location.street}}, {{location.buildingNumber}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/uk/address/street_name.ts b/src/locales/uk/location/street_name.ts similarity index 100% rename from src/locales/uk/address/street_name.ts rename to src/locales/uk/location/street_name.ts diff --git a/src/locales/uk/address/street_prefix.ts b/src/locales/uk/location/street_prefix.ts similarity index 100% rename from src/locales/uk/address/street_prefix.ts rename to src/locales/uk/location/street_prefix.ts diff --git a/src/locales/uk/address/street_suffix.ts b/src/locales/uk/location/street_suffix.ts similarity index 100% rename from src/locales/uk/address/street_suffix.ts rename to src/locales/uk/location/street_suffix.ts diff --git a/src/locales/ur/address/city.ts b/src/locales/ur/address/city.ts deleted file mode 100644 index 27a932f1459..00000000000 --- a/src/locales/ur/address/city.ts +++ /dev/null @@ -1,6 +0,0 @@ -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}}', -]; diff --git a/src/locales/ur/address/street.ts b/src/locales/ur/address/street.ts deleted file mode 100644 index 5e9ca1171d0..00000000000 --- a/src/locales/ur/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{person.first_name}} {{address.street_suffix}}', - '{{person.last_name}} {{address.street_suffix}}', -]; diff --git a/src/locales/ur/address/street_address.ts b/src/locales/ur/address/street_address.ts deleted file mode 100644 index 55bed3628b9..00000000000 --- a/src/locales/ur/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.buildingNumber}} {{address.street}}', - full: '{{address.buildingNumber}} {{address.street}} {{address.secondaryAddress}}', -}; diff --git a/src/locales/ur/index.ts b/src/locales/ur/index.ts index 903dfd63503..6b4cd3a3555 100644 --- a/src/locales/ur/index.ts +++ b/src/locales/ur/index.ts @@ -3,7 +3,6 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import animal from './animal'; import app from './app'; import business from './business'; @@ -12,6 +11,7 @@ import color from './color'; import commerce from './commerce'; import date from './date'; import finance from './finance'; +import location from './location'; import lorem from './lorem'; import music from './music'; import person from './person'; @@ -21,7 +21,6 @@ import vehicle from './vehicle'; const ur: LocaleDefinition = { title: 'Urdu', separator: ' اور ', - address, animal, app, business, @@ -30,6 +29,7 @@ const ur: LocaleDefinition = { commerce, date, finance, + location, lorem, music, person, diff --git a/src/locales/ur/address/building_number.ts b/src/locales/ur/location/building_number.ts similarity index 100% rename from src/locales/ur/address/building_number.ts rename to src/locales/ur/location/building_number.ts diff --git a/src/locales/ur/location/city.ts b/src/locales/ur/location/city.ts new file mode 100644 index 00000000000..d744d882361 --- /dev/null +++ b/src/locales/ur/location/city.ts @@ -0,0 +1,6 @@ +export default [ + '{{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/address/city_name.ts b/src/locales/ur/location/city_name.ts similarity index 100% rename from src/locales/ur/address/city_name.ts rename to src/locales/ur/location/city_name.ts diff --git a/src/locales/ur/address/city_prefix.ts b/src/locales/ur/location/city_prefix.ts similarity index 100% rename from src/locales/ur/address/city_prefix.ts rename to src/locales/ur/location/city_prefix.ts diff --git a/src/locales/ur/address/city_suffix.ts b/src/locales/ur/location/city_suffix.ts similarity index 100% rename from src/locales/ur/address/city_suffix.ts rename to src/locales/ur/location/city_suffix.ts diff --git a/src/locales/ur/address/country.ts b/src/locales/ur/location/country.ts similarity index 100% rename from src/locales/ur/address/country.ts rename to src/locales/ur/location/country.ts diff --git a/src/locales/ur/address/default_country.ts b/src/locales/ur/location/default_country.ts similarity index 100% rename from src/locales/ur/address/default_country.ts rename to src/locales/ur/location/default_country.ts diff --git a/src/locales/ur/address/direction.ts b/src/locales/ur/location/direction.ts similarity index 100% rename from src/locales/ur/address/direction.ts rename to src/locales/ur/location/direction.ts diff --git a/src/locales/ur/address/index.ts b/src/locales/ur/location/index.ts similarity index 88% rename from src/locales/ur/address/index.ts rename to src/locales/ur/location/index.ts index e234ccfef26..73478f51613 100644 --- a/src/locales/ur/address/index.ts +++ b/src/locales/ur/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_name from './city_name'; @@ -19,7 +19,7 @@ import street from './street'; import street_address from './street_address'; import street_suffix from './street_suffix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_name, @@ -37,4 +37,4 @@ const address: AddressDefinitions = { street_suffix, }; -export default address; +export default location; diff --git a/src/locales/ur/address/postcode.ts b/src/locales/ur/location/postcode.ts similarity index 100% rename from src/locales/ur/address/postcode.ts rename to src/locales/ur/location/postcode.ts diff --git a/src/locales/ur/address/secondary_address.ts b/src/locales/ur/location/secondary_address.ts similarity index 100% rename from src/locales/ur/address/secondary_address.ts rename to src/locales/ur/location/secondary_address.ts diff --git a/src/locales/ur/address/state.ts b/src/locales/ur/location/state.ts similarity index 100% rename from src/locales/ur/address/state.ts rename to src/locales/ur/location/state.ts diff --git a/src/locales/ur/address/state_abbr.ts b/src/locales/ur/location/state_abbr.ts similarity index 100% rename from src/locales/ur/address/state_abbr.ts rename to src/locales/ur/location/state_abbr.ts diff --git a/src/locales/ur/location/street.ts b/src/locales/ur/location/street.ts new file mode 100644 index 00000000000..b5fcd9fea0f --- /dev/null +++ b/src/locales/ur/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{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 new file mode 100644 index 00000000000..2e1a661d418 --- /dev/null +++ b/src/locales/ur/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.buildingNumber}} {{location.street}}', + full: '{{location.buildingNumber}} {{location.street}} {{location.secondaryAddress}}', +}; diff --git a/src/locales/ur/address/street_suffix.ts b/src/locales/ur/location/street_suffix.ts similarity index 100% rename from src/locales/ur/address/street_suffix.ts rename to src/locales/ur/location/street_suffix.ts 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/address/city.ts b/src/locales/vi/address/city.ts deleted file mode 100644 index e3da346bd1e..00000000000 --- a/src/locales/vi/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_name}}']; diff --git a/src/locales/vi/address/street.ts b/src/locales/vi/address/street.ts deleted file mode 100644 index f7dd9d3b3aa..00000000000 --- a/src/locales/vi/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', -]; diff --git a/src/locales/vi/index.ts b/src/locales/vi/index.ts index 0155b43d7a9..f01dd348236 100644 --- a/src/locales/vi/index.ts +++ b/src/locales/vi/index.ts @@ -3,22 +3,22 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import cell_phone from './cell_phone'; import company from './company'; import date from './date'; import internet from './internet'; +import location from './location'; import lorem from './lorem'; import person from './person'; import phone_number from './phone_number'; const vi: LocaleDefinition = { title: 'Vietnamese', - address, cell_phone, company, date, internet, + location, lorem, person, phone_number, diff --git a/src/locales/vi/location/city.ts b/src/locales/vi/location/city.ts new file mode 100644 index 00000000000..ad43b68fc5c --- /dev/null +++ b/src/locales/vi/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_name}}']; diff --git a/src/locales/vi/address/city_name.ts b/src/locales/vi/location/city_name.ts similarity index 100% rename from src/locales/vi/address/city_name.ts rename to src/locales/vi/location/city_name.ts diff --git a/src/locales/vi/address/country.ts b/src/locales/vi/location/country.ts similarity index 100% rename from src/locales/vi/address/country.ts rename to src/locales/vi/location/country.ts diff --git a/src/locales/vi/address/default_country.ts b/src/locales/vi/location/default_country.ts similarity index 100% rename from src/locales/vi/address/default_country.ts rename to src/locales/vi/location/default_country.ts diff --git a/src/locales/vi/address/index.ts b/src/locales/vi/location/index.ts similarity index 76% rename from src/locales/vi/address/index.ts rename to src/locales/vi/location/index.ts index 1122447c701..37ed9c7d150 100644 --- a/src/locales/vi/address/index.ts +++ b/src/locales/vi/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import city from './city'; import city_name from './city_name'; import country from './country'; @@ -10,7 +10,7 @@ import default_country from './default_country'; import postcode from './postcode'; import street from './street'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { city, city_name, country, @@ -19,4 +19,4 @@ const address: AddressDefinitions = { street, }; -export default address; +export default location; diff --git a/src/locales/vi/address/postcode.ts b/src/locales/vi/location/postcode.ts similarity index 100% rename from src/locales/vi/address/postcode.ts rename to src/locales/vi/location/postcode.ts diff --git a/src/locales/vi/location/street.ts b/src/locales/vi/location/street.ts new file mode 100644 index 00000000000..af32d0c4248 --- /dev/null +++ b/src/locales/vi/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', +]; diff --git a/src/locales/zh_CN/address/city.ts b/src/locales/zh_CN/address/city.ts deleted file mode 100644 index b53f9163cf5..00000000000 --- a/src/locales/zh_CN/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_prefix}}{{address.city_suffix}}']; diff --git a/src/locales/zh_CN/address/street.ts b/src/locales/zh_CN/address/street.ts deleted file mode 100644 index 6522d790e53..00000000000 --- a/src/locales/zh_CN/address/street.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{person.last_name}}{{address.street_suffix}}']; diff --git a/src/locales/zh_CN/address/street_address.ts b/src/locales/zh_CN/address/street_address.ts deleted file mode 100644 index 6430ef1c785..00000000000 --- a/src/locales/zh_CN/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}}{{address.buildingNumber}}号', - full: '{{address.street}}{{address.buildingNumber}}号 {{address.secondaryAddress}}', -}; diff --git a/src/locales/zh_CN/index.ts b/src/locales/zh_CN/index.ts index 713218a3af4..eae7d1f624f 100644 --- a/src/locales/zh_CN/index.ts +++ b/src/locales/zh_CN/index.ts @@ -3,13 +3,13 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; const zh_CN: LocaleDefinition = { title: 'Chinese', - address, + location, person, phone_number, }; diff --git a/src/locales/zh_CN/address/building_number.ts b/src/locales/zh_CN/location/building_number.ts similarity index 100% rename from src/locales/zh_CN/address/building_number.ts rename to src/locales/zh_CN/location/building_number.ts diff --git a/src/locales/zh_CN/location/city.ts b/src/locales/zh_CN/location/city.ts new file mode 100644 index 00000000000..aa67dfa8896 --- /dev/null +++ b/src/locales/zh_CN/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_prefix}}{{location.city_suffix}}']; diff --git a/src/locales/zh_CN/address/city_prefix.ts b/src/locales/zh_CN/location/city_prefix.ts similarity index 100% rename from src/locales/zh_CN/address/city_prefix.ts rename to src/locales/zh_CN/location/city_prefix.ts diff --git a/src/locales/zh_CN/address/city_suffix.ts b/src/locales/zh_CN/location/city_suffix.ts similarity index 100% rename from src/locales/zh_CN/address/city_suffix.ts rename to src/locales/zh_CN/location/city_suffix.ts diff --git a/src/locales/zh_CN/address/default_country.ts b/src/locales/zh_CN/location/default_country.ts similarity index 100% rename from src/locales/zh_CN/address/default_country.ts rename to src/locales/zh_CN/location/default_country.ts diff --git a/src/locales/zh_TW/address/index.ts b/src/locales/zh_CN/location/index.ts similarity index 85% rename from src/locales/zh_TW/address/index.ts rename to src/locales/zh_CN/location/index.ts index 41b6248906f..51788277b7d 100644 --- a/src/locales/zh_TW/address/index.ts +++ b/src/locales/zh_CN/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_prefix from './city_prefix'; @@ -15,7 +15,7 @@ import street from './street'; import street_address from './street_address'; import street_suffix from './street_suffix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_prefix, @@ -29,4 +29,4 @@ const address: AddressDefinitions = { street_suffix, }; -export default address; +export default location; diff --git a/src/locales/zh_CN/address/postcode.ts b/src/locales/zh_CN/location/postcode.ts similarity index 100% rename from src/locales/zh_CN/address/postcode.ts rename to src/locales/zh_CN/location/postcode.ts diff --git a/src/locales/zh_CN/address/state.ts b/src/locales/zh_CN/location/state.ts similarity index 100% rename from src/locales/zh_CN/address/state.ts rename to src/locales/zh_CN/location/state.ts diff --git a/src/locales/zh_CN/address/state_abbr.ts b/src/locales/zh_CN/location/state_abbr.ts similarity index 100% rename from src/locales/zh_CN/address/state_abbr.ts rename to src/locales/zh_CN/location/state_abbr.ts diff --git a/src/locales/zh_CN/location/street.ts b/src/locales/zh_CN/location/street.ts new file mode 100644 index 00000000000..dfaaaa6e3c0 --- /dev/null +++ b/src/locales/zh_CN/location/street.ts @@ -0,0 +1 @@ +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 new file mode 100644 index 00000000000..28061915242 --- /dev/null +++ b/src/locales/zh_CN/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}}{{location.buildingNumber}}号', + full: '{{location.street}}{{location.buildingNumber}}号 {{location.secondaryAddress}}', +}; diff --git a/src/locales/zh_CN/address/street_suffix.ts b/src/locales/zh_CN/location/street_suffix.ts similarity index 100% rename from src/locales/zh_CN/address/street_suffix.ts rename to src/locales/zh_CN/location/street_suffix.ts diff --git a/src/locales/zh_TW/address/city.ts b/src/locales/zh_TW/address/city.ts deleted file mode 100644 index b53f9163cf5..00000000000 --- a/src/locales/zh_TW/address/city.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{address.city_prefix}}{{address.city_suffix}}']; diff --git a/src/locales/zh_TW/address/street.ts b/src/locales/zh_TW/address/street.ts deleted file mode 100644 index 6522d790e53..00000000000 --- a/src/locales/zh_TW/address/street.ts +++ /dev/null @@ -1 +0,0 @@ -export default ['{{person.last_name}}{{address.street_suffix}}']; diff --git a/src/locales/zh_TW/address/street_address.ts b/src/locales/zh_TW/address/street_address.ts deleted file mode 100644 index 665870ba775..00000000000 --- a/src/locales/zh_TW/address/street_address.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - normal: '{{address.street}}{{address.buildingNumber}}號', - full: '{{address.street}}{{address.buildingNumber}}號 {{address.secondaryAddress}}', -}; diff --git a/src/locales/zh_TW/index.ts b/src/locales/zh_TW/index.ts index 3904c3c005d..ac385320f4e 100644 --- a/src/locales/zh_TW/index.ts +++ b/src/locales/zh_TW/index.ts @@ -3,13 +3,13 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; const zh_TW: LocaleDefinition = { title: 'Chinese (Taiwan)', - address, + location, person, phone_number, }; diff --git a/src/locales/zh_TW/address/building_number.ts b/src/locales/zh_TW/location/building_number.ts similarity index 100% rename from src/locales/zh_TW/address/building_number.ts rename to src/locales/zh_TW/location/building_number.ts diff --git a/src/locales/zh_TW/location/city.ts b/src/locales/zh_TW/location/city.ts new file mode 100644 index 00000000000..aa67dfa8896 --- /dev/null +++ b/src/locales/zh_TW/location/city.ts @@ -0,0 +1 @@ +export default ['{{location.city_prefix}}{{location.city_suffix}}']; diff --git a/src/locales/zh_TW/address/city_prefix.ts b/src/locales/zh_TW/location/city_prefix.ts similarity index 100% rename from src/locales/zh_TW/address/city_prefix.ts rename to src/locales/zh_TW/location/city_prefix.ts diff --git a/src/locales/zh_TW/address/city_suffix.ts b/src/locales/zh_TW/location/city_suffix.ts similarity index 100% rename from src/locales/zh_TW/address/city_suffix.ts rename to src/locales/zh_TW/location/city_suffix.ts diff --git a/src/locales/zh_TW/address/default_country.ts b/src/locales/zh_TW/location/default_country.ts similarity index 100% rename from src/locales/zh_TW/address/default_country.ts rename to src/locales/zh_TW/location/default_country.ts diff --git a/src/locales/zh_CN/address/index.ts b/src/locales/zh_TW/location/index.ts similarity index 85% rename from src/locales/zh_CN/address/index.ts rename to src/locales/zh_TW/location/index.ts index 41b6248906f..51788277b7d 100644 --- a/src/locales/zh_CN/address/index.ts +++ b/src/locales/zh_TW/location/index.ts @@ -2,7 +2,7 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import building_number from './building_number'; import city from './city'; import city_prefix from './city_prefix'; @@ -15,7 +15,7 @@ import street from './street'; import street_address from './street_address'; import street_suffix from './street_suffix'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { building_number, city, city_prefix, @@ -29,4 +29,4 @@ const address: AddressDefinitions = { street_suffix, }; -export default address; +export default location; diff --git a/src/locales/zh_TW/address/postcode.ts b/src/locales/zh_TW/location/postcode.ts similarity index 100% rename from src/locales/zh_TW/address/postcode.ts rename to src/locales/zh_TW/location/postcode.ts diff --git a/src/locales/zh_TW/address/state.ts b/src/locales/zh_TW/location/state.ts similarity index 100% rename from src/locales/zh_TW/address/state.ts rename to src/locales/zh_TW/location/state.ts diff --git a/src/locales/zh_TW/address/state_abbr.ts b/src/locales/zh_TW/location/state_abbr.ts similarity index 100% rename from src/locales/zh_TW/address/state_abbr.ts rename to src/locales/zh_TW/location/state_abbr.ts diff --git a/src/locales/zh_TW/location/street.ts b/src/locales/zh_TW/location/street.ts new file mode 100644 index 00000000000..dfaaaa6e3c0 --- /dev/null +++ b/src/locales/zh_TW/location/street.ts @@ -0,0 +1 @@ +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 new file mode 100644 index 00000000000..f808e3d9821 --- /dev/null +++ b/src/locales/zh_TW/location/street_address.ts @@ -0,0 +1,4 @@ +export default { + normal: '{{location.street}}{{location.buildingNumber}}號', + full: '{{location.street}}{{location.buildingNumber}}號 {{location.secondaryAddress}}', +}; diff --git a/src/locales/zh_TW/address/street_suffix.ts b/src/locales/zh_TW/location/street_suffix.ts similarity index 100% rename from src/locales/zh_TW/address/street_suffix.ts rename to src/locales/zh_TW/location/street_suffix.ts diff --git a/src/locales/zu_ZA/address/city.ts b/src/locales/zu_ZA/address/city.ts deleted file mode 100644 index ea6ea950e46..00000000000 --- a/src/locales/zu_ZA/address/city.ts +++ /dev/null @@ -1,6 +0,0 @@ -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}}', -]; diff --git a/src/locales/zu_ZA/address/street.ts b/src/locales/zu_ZA/address/street.ts deleted file mode 100644 index f7dd9d3b3aa..00000000000 --- a/src/locales/zu_ZA/address/street.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default [ - '{{person.firstName}} {{address.street_suffix}}', - '{{person.lastName}} {{address.street_suffix}}', -]; diff --git a/src/locales/zu_ZA/index.ts b/src/locales/zu_ZA/index.ts index 6f5054f3c7a..4712c79f3a2 100644 --- a/src/locales/zu_ZA/index.ts +++ b/src/locales/zu_ZA/index.ts @@ -3,19 +3,19 @@ * Run 'pnpm run generate:locales' to update. */ import type { LocaleDefinition } from '../..'; -import address from './address'; import cell_phone from './cell_phone'; import company from './company'; import internet from './internet'; +import location from './location'; import person from './person'; import phone_number from './phone_number'; const zu_ZA: LocaleDefinition = { title: 'Zulu (South Africa)', - address, cell_phone, company, internet, + location, person, phone_number, }; diff --git a/src/locales/zu_ZA/location/city.ts b/src/locales/zu_ZA/location/city.ts new file mode 100644 index 00000000000..7375aa8378a --- /dev/null +++ b/src/locales/zu_ZA/location/city.ts @@ -0,0 +1,6 @@ +export default [ + '{{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/address/default_country.ts b/src/locales/zu_ZA/location/default_country.ts similarity index 100% rename from src/locales/zu_ZA/address/default_country.ts rename to src/locales/zu_ZA/location/default_country.ts diff --git a/src/locales/af_ZA/address/index.ts b/src/locales/zu_ZA/location/index.ts similarity index 71% rename from src/locales/af_ZA/address/index.ts rename to src/locales/zu_ZA/location/index.ts index c1739ea56b7..112133b4b72 100644 --- a/src/locales/af_ZA/address/index.ts +++ b/src/locales/zu_ZA/location/index.ts @@ -2,17 +2,17 @@ * This file is automatically generated. * Run 'pnpm run generate:locales' to update. */ -import type { AddressDefinitions } from '../../..'; +import type { LocationDefinitions } from '../../..'; import city from './city'; import default_country from './default_country'; import postcode from './postcode'; import street from './street'; -const address: AddressDefinitions = { +const location: LocationDefinitions = { city, default_country, postcode, street, }; -export default address; +export default location; diff --git a/src/locales/zu_ZA/address/postcode.ts b/src/locales/zu_ZA/location/postcode.ts similarity index 100% rename from src/locales/zu_ZA/address/postcode.ts rename to src/locales/zu_ZA/location/postcode.ts diff --git a/src/locales/zu_ZA/location/street.ts b/src/locales/zu_ZA/location/street.ts new file mode 100644 index 00000000000..af32d0c4248 --- /dev/null +++ b/src/locales/zu_ZA/location/street.ts @@ -0,0 +1,4 @@ +export default [ + '{{person.firstName}} {{location.street_suffix}}', + '{{person.lastName}} {{location.street_suffix}}', +]; diff --git a/src/modules/helpers/index.ts b/src/modules/helpers/index.ts index bd765802727..c473dfac21f 100644 --- a/src/modules/helpers/index.ts +++ b/src/modules/helpers/index.ts @@ -470,7 +470,7 @@ export class HelpersModule { * * Note: We recommend using string template literals instead of `fake()`, * which are faster and strongly typed (if you are using TypeScript), - * e.g. ``const address = `${faker.address.zipCode()} ${faker.address.city()}`;`` + * e.g. ``const address = `${faker.location.zipCode()} ${faker.location.city()}`;`` * * This method is useful if you have to build a random string from a static, non-executable source * (e.g. string coming from a user, stored in a database or a file). diff --git a/src/modules/address/index.ts b/src/modules/location/index.ts similarity index 75% rename from src/modules/address/index.ts rename to src/modules/location/index.ts index 4d484651811..36553572f2d 100644 --- a/src/modules/address/index.ts +++ b/src/modules/location/index.ts @@ -3,10 +3,10 @@ import type { Faker } from '../..'; /** * Module to generate addresses and locations. */ -export class AddressModule { +export class LocationModule { constructor(private readonly faker: Faker) { // Bind `this` so namespaced is working correctly - for (const name of Object.getOwnPropertyNames(AddressModule.prototype)) { + for (const name of Object.getOwnPropertyNames(LocationModule.prototype)) { if (name === 'constructor' || typeof this[name] !== 'function') { continue; } @@ -24,15 +24,15 @@ export class AddressModule { * @see faker.helpers.replaceSymbols() * * @example - * faker.address.zipCode() // '17839' - * faker.address.zipCode('####') // '6925' + * faker.location.zipCode() // '17839' + * faker.location.zipCode('####') // '6925' * * @since 2.0.1 */ zipCode(format?: string): string { // if zip format is not specified, use the zip format defined for the locale if (format == null) { - const localeFormat = this.faker.definitions.address.postcode; + const localeFormat = this.faker.definitions.location.postcode; if (typeof localeFormat === 'string') { format = localeFormat; } else { @@ -52,13 +52,13 @@ export class AddressModule { * @param state The abbreviation of the state to generate the zip code for. * * @example - * fakerUS.address.zipCodeByState("AK") // '99595' - * fakerUS.address.zipCodeByState("??") // '47683-9880' + * fakerUS.location.zipCodeByState("AK") // '99595' + * fakerUS.location.zipCodeByState("??") // '47683-9880' * * @since 5.0.0 */ zipCodeByState(state: string): string { - const zipRange = this.faker.definitions.address.postcode_by_state?.[state]; + const zipRange = this.faker.definitions.location.postcode_by_state?.[state]; if (zipRange) { return String(this.faker.datatype.number(zipRange)); } @@ -69,13 +69,13 @@ export class AddressModule { * Generates a random localized city name. * * @example - * faker.address.city() // 'East Jarretmouth' + * faker.location.city() // 'East Jarretmouth' * * @since 2.0.1 */ city(): string { const pattern = this.faker.helpers.arrayElement( - this.faker.definitions.address.city + this.faker.definitions.location.city ); return this.faker.helpers.fake(pattern); } @@ -84,13 +84,13 @@ export class AddressModule { * Returns a random localized and existing city name. * * @example - * faker.address.cityName() // 'San Rafael' + * faker.location.cityName() // 'San Rafael' * * @since 5.5.0 */ cityName(): string { return this.faker.helpers.arrayElement( - this.faker.definitions.address.city_name + this.faker.definitions.location.city_name ); } @@ -98,13 +98,13 @@ export class AddressModule { * Generates a random building number. * * @example - * faker.address.buildingNumber() // '379' + * faker.location.buildingNumber() // '379' * * @since 6.2.0 */ buildingNumber(): string { const format = this.faker.helpers.arrayElement( - this.faker.definitions.address.building_number + this.faker.definitions.location.building_number ); return this.faker.helpers.replaceSymbolWithNumber(format); @@ -114,13 +114,13 @@ export class AddressModule { * Generates a random localized street name. * * @example - * faker.address.street() // 'Schroeder Isle' + * faker.location.street() // 'Schroeder Isle' * * @since 7.0.0 */ street(): string { const format = this.faker.helpers.arrayElement( - this.faker.definitions.address.street + this.faker.definitions.location.street ); return this.faker.helpers.fake(format); } @@ -129,13 +129,13 @@ export class AddressModule { * Returns a random localized street name. * * @example - * fakerDE.address.streetName() // 'Cavill Avenue' + * fakerDE.location.streetName() // 'Cavill Avenue' * * @since 2.0.1 */ streetName(): string { return this.faker.helpers.arrayElement( - this.faker.definitions.address.street_name + this.faker.definitions.location.street_name ); } @@ -146,14 +146,14 @@ export class AddressModule { * Otherwise it will just generate a street address. * * @example - * faker.address.streetAddress() // '0917 O'Conner Estates' - * faker.address.streetAddress(false) // '34830 Erdman Hollow' - * faker.address.streetAddress(true) // '3393 Ronny Way Apt. 742' + * faker.location.streetAddress() // '0917 O'Conner Estates' + * faker.location.streetAddress(false) // '34830 Erdman Hollow' + * faker.location.streetAddress(true) // '3393 Ronny Way Apt. 742' * * @since 2.0.1 */ streetAddress(useFullAddress: boolean = false): string { - const formats = this.faker.definitions.address.street_address; + const formats = this.faker.definitions.location.street_address; const format = formats[useFullAddress ? 'full' : 'normal']; return this.faker.helpers.fake(format); @@ -164,14 +164,14 @@ export class AddressModule { * such as an apartment or room number. * * @example - * faker.address.secondaryAddress() // 'Apt. 861' + * faker.location.secondaryAddress() // 'Apt. 861' * * @since 2.0.1 */ secondaryAddress(): string { return this.faker.helpers.replaceSymbolWithNumber( this.faker.helpers.arrayElement( - this.faker.definitions.address.secondary_address + this.faker.definitions.location.secondary_address ) ); } @@ -180,13 +180,13 @@ export class AddressModule { * Returns a random localized county. * * @example - * faker.address.county() // 'Cambridgeshire' + * faker.location.county() // 'Cambridgeshire' * * @since 2.0.1 */ county(): string { return this.faker.helpers.arrayElement( - this.faker.definitions.address.county + this.faker.definitions.location.county ); } @@ -194,13 +194,13 @@ export class AddressModule { * Returns a random country name. * * @example - * faker.address.country() // 'Greece' + * faker.location.country() // 'Greece' * * @since 2.0.1 */ country(): string { return this.faker.helpers.arrayElement( - this.faker.definitions.address.country + this.faker.definitions.location.country ); } @@ -211,9 +211,9 @@ export class AddressModule { * or `'alpha-3'` (three letter code). Defaults to `'alpha-2'`. * * @example - * faker.address.countryCode() // 'SJ' - * faker.address.countryCode('alpha-2') // 'GA' - * faker.address.countryCode('alpha-3') // 'TJK' + * faker.location.countryCode() // 'SJ' + * faker.location.countryCode('alpha-2') // 'GA' + * faker.location.countryCode('alpha-3') // 'TJK' * * @since 3.0.0 */ @@ -221,20 +221,22 @@ export class AddressModule { const key = alphaCode === 'alpha-3' ? 'country_code_alpha_3' : 'country_code'; - return this.faker.helpers.arrayElement(this.faker.definitions.address[key]); + return this.faker.helpers.arrayElement( + this.faker.definitions.location[key] + ); } /** * Returns a random localized state from this country. * * @example - * faker.address.state() // 'Georgia' + * faker.location.state() // 'Georgia' * * @since 2.0.1 */ state(): string { return this.faker.helpers.arrayElement( - this.faker.definitions.address.state + this.faker.definitions.location.state ); } @@ -242,13 +244,13 @@ export class AddressModule { * Returns a random localized state's abbreviated name from this country. * * @example - * faker.address.stateAbbr() // 'ND' + * faker.location.stateAbbr() // 'ND' * * @since 2.0.1 */ stateAbbr(): string { return this.faker.helpers.arrayElement( - this.faker.definitions.address.state_abbr + this.faker.definitions.location.state_abbr ); } @@ -260,8 +262,8 @@ export class AddressModule { * @param precision The number of decimal points of precision for the latitude. Defaults to `4`. * * @example - * faker.address.latitude() // -30.9501 - * faker.address.latitude(10, -10, 5) // 2.68452 + * faker.location.latitude() // -30.9501 + * faker.location.latitude(10, -10, 5) // 2.68452 * * @since 2.0.1 */ @@ -282,8 +284,8 @@ export class AddressModule { * @param precision The number of decimal points of precision for the longitude. Defaults to `4`. * * @example - * faker.address.longitude() // -154.0226 - * faker.address.longitude(10, -10, 5) // -4.03620 + * faker.location.longitude() // -154.0226 + * faker.location.longitude(10, -10, 5) // -4.03620 * * @since 2.0.1 */ @@ -307,20 +309,20 @@ export class AddressModule { * Otherwise this will return the long name. Defaults to `false`. * * @example - * faker.address.direction() // 'Northeast' - * faker.address.direction(false) // 'South' - * faker.address.direction(true) // 'NE' + * faker.location.direction() // 'Northeast' + * faker.location.direction(false) // 'South' + * faker.location.direction(true) // 'NE' * * @since 5.0.0 */ direction(useAbbr: boolean = false): string { if (!useAbbr) { return this.faker.helpers.arrayElement( - this.faker.definitions.address.direction + this.faker.definitions.location.direction ); } return this.faker.helpers.arrayElement( - this.faker.definitions.address.direction_abbr + this.faker.definitions.location.direction_abbr ); } @@ -331,20 +333,20 @@ export class AddressModule { * Otherwise this will return the long name. Defaults to `false`. * * @example - * faker.address.cardinalDirection() // 'North' - * faker.address.cardinalDirection(false) // 'South' - * faker.address.cardinalDirection(true) // 'N' + * faker.location.cardinalDirection() // 'North' + * faker.location.cardinalDirection(false) // 'South' + * faker.location.cardinalDirection(true) // 'N' * * @since 5.0.0 */ cardinalDirection(useAbbr: boolean = false): string { if (!useAbbr) { return this.faker.helpers.arrayElement( - this.faker.definitions.address.direction.slice(0, 4) + this.faker.definitions.location.direction.slice(0, 4) ); } return this.faker.helpers.arrayElement( - this.faker.definitions.address.direction_abbr.slice(0, 4) + this.faker.definitions.location.direction_abbr.slice(0, 4) ); } @@ -355,20 +357,20 @@ export class AddressModule { * Otherwise this will return the long name. Defaults to `false`. * * @example - * faker.address.ordinalDirection() // 'Northeast' - * faker.address.ordinalDirection(false) // 'Northwest' - * faker.address.ordinalDirection(true) // 'NE' + * faker.location.ordinalDirection() // 'Northeast' + * faker.location.ordinalDirection(false) // 'Northwest' + * faker.location.ordinalDirection(true) // 'NE' * * @since 5.0.0 */ ordinalDirection(useAbbr: boolean = false): string { if (!useAbbr) { return this.faker.helpers.arrayElement( - this.faker.definitions.address.direction.slice(4, 8) + this.faker.definitions.location.direction.slice(4, 8) ); } return this.faker.helpers.arrayElement( - this.faker.definitions.address.direction_abbr.slice(4, 8) + this.faker.definitions.location.direction_abbr.slice(4, 8) ); } @@ -381,9 +383,9 @@ export class AddressModule { * @param isMetric If `true` assume the radius to be in kilometers. If `false` for miles. Defaults to `false`. * * @example - * faker.address.nearbyGPSCoordinate() // [ 33.8475, -170.5953 ] - * faker.address.nearbyGPSCoordinate([33, -170]) // [ 33.0165, -170.0636 ] - * faker.address.nearbyGPSCoordinate([33, -170], 1000, true) // [ 37.9163, -179.2408 ] + * faker.location.nearbyGPSCoordinate() // [ 33.8475, -170.5953 ] + * faker.location.nearbyGPSCoordinate([33, -170]) // [ 33.0165, -170.0636 ] + * faker.location.nearbyGPSCoordinate([33, -170], 1000, true) // [ 37.9163, -179.2408 ] * * @since 5.0.0 */ @@ -441,13 +443,13 @@ export class AddressModule { * Returns a random time zone. * * @example - * faker.address.timeZone() // 'Pacific/Guam' + * faker.location.timeZone() // 'Pacific/Guam' * * @since 5.1.0 */ timeZone(): string { return this.faker.helpers.arrayElement( - this.faker.definitions.address.time_zone + this.faker.definitions.location.time_zone ); } } diff --git a/src/modules/random/index.ts b/src/modules/random/index.ts index 7f567edf2e1..0505744d401 100644 --- a/src/modules/random/index.ts +++ b/src/modules/random/index.ts @@ -32,14 +32,14 @@ export class RandomModule { */ word(): string { const wordMethods = [ - this.faker.address.cardinalDirection, - this.faker.address.cityName, - this.faker.address.country, - this.faker.address.county, - this.faker.address.direction, - this.faker.address.ordinalDirection, - this.faker.address.state, - this.faker.address.street, + this.faker.location.cardinalDirection, + this.faker.location.cityName, + this.faker.location.country, + this.faker.location.county, + this.faker.location.direction, + this.faker.location.ordinalDirection, + this.faker.location.state, + this.faker.location.street, this.faker.color.human, diff --git a/test/__snapshots__/address.spec.ts.snap b/test/__snapshots__/address.spec.ts.snap deleted file mode 100644 index 5099cf47dbb..00000000000 --- a/test/__snapshots__/address.spec.ts.snap +++ /dev/null @@ -1,235 +0,0 @@ -// Vitest Snapshot v1 - -exports[`address > 42 > buildingNumber 1`] = `"7917"`; - -exports[`address > 42 > cardinalDirection > noArgs 1`] = `"East"`; - -exports[`address > 42 > cardinalDirection > with abbr = false 1`] = `"East"`; - -exports[`address > 42 > cardinalDirection > with abbr = true 1`] = `"E"`; - -exports[`address > 42 > city 1`] = `"Port Valentine"`; - -exports[`address > 42 > cityName 1`] = `"Hamilton"`; - -exports[`address > 42 > country 1`] = `"Haiti"`; - -exports[`address > 42 > countryCode > noArgs 1`] = `"GY"`; - -exports[`address > 42 > countryCode > with code = alpha-2 1`] = `"GY"`; - -exports[`address > 42 > countryCode > with code = alpha-3 1`] = `"SAU"`; - -exports[`address > 42 > county 1`] = `"Berkshire"`; - -exports[`address > 42 > direction > noArgs 1`] = `"South"`; - -exports[`address > 42 > direction > with abbr = false 1`] = `"South"`; - -exports[`address > 42 > direction > with abbr = true 1`] = `"S"`; - -exports[`address > 42 > latitude > noArgs 1`] = `-22.5828`; - -exports[`address > 42 > longitude > noArgs 1`] = `-45.1656`; - -exports[`address > 42 > nearbyGPSCoordinate > near origin 1`] = ` -[ - 0.08140632875358443, - -0.08093642792425726, -] -`; - -exports[`address > 42 > nearbyGPSCoordinate > noArgs 1`] = ` -[ - -22.5828, - 106.7555, -] -`; - -exports[`address > 42 > ordinalDirection > noArgs 1`] = `"Northwest"`; - -exports[`address > 42 > ordinalDirection > with abbr = false 1`] = `"Northwest"`; - -exports[`address > 42 > ordinalDirection > with abbr = true 1`] = `"NW"`; - -exports[`address > 42 > secondaryAddress 1`] = `"Apt. 791"`; - -exports[`address > 42 > state 1`] = `"Maine"`; - -exports[`address > 42 > stateAbbr 1`] = `"ME"`; - -exports[`address > 42 > street 1`] = `"Peyton Villages"`; - -exports[`address > 42 > streetAddress > noArgs 1`] = `"7917 Miller Park"`; - -exports[`address > 42 > streetAddress > with useFullAddress = false 1`] = `"7917 Miller Park"`; - -exports[`address > 42 > streetAddress > with useFullAddress = true 1`] = `"7917 Miller Park Apt. 410"`; - -exports[`address > 42 > streetName 1`] = `"b"`; - -exports[`address > 42 > timeZone 1`] = `"Europe/Brussels"`; - -exports[`address > 42 > zipCode > noArgs 1`] = `"79177"`; - -exports[`address > 42 > zipCode > with format 1`] = `"379-177"`; - -exports[`address > 42 > zipCodeByState > state 1`] = `"79177"`; - -exports[`address > 42 > zipCodeByState > state2 1`] = `"79177"`; - -exports[`address > 1211 > buildingNumber 1`] = `"487"`; - -exports[`address > 1211 > cardinalDirection > noArgs 1`] = `"West"`; - -exports[`address > 1211 > cardinalDirection > with abbr = false 1`] = `"West"`; - -exports[`address > 1211 > cardinalDirection > with abbr = true 1`] = `"W"`; - -exports[`address > 1211 > city 1`] = `"La Crosse"`; - -exports[`address > 1211 > cityName 1`] = `"Utica"`; - -exports[`address > 1211 > country 1`] = `"Uganda"`; - -exports[`address > 1211 > countryCode > noArgs 1`] = `"UM"`; - -exports[`address > 1211 > countryCode > with code = alpha-2 1`] = `"UM"`; - -exports[`address > 1211 > countryCode > with code = alpha-3 1`] = `"IRN"`; - -exports[`address > 1211 > county 1`] = `"Cambridgeshire"`; - -exports[`address > 1211 > direction > noArgs 1`] = `"Southwest"`; - -exports[`address > 1211 > direction > with abbr = false 1`] = `"Southwest"`; - -exports[`address > 1211 > direction > with abbr = true 1`] = `"SW"`; - -exports[`address > 1211 > latitude > noArgs 1`] = `77.1337`; - -exports[`address > 1211 > longitude > noArgs 1`] = `154.2673`; - -exports[`address > 1211 > nearbyGPSCoordinate > near origin 1`] = ` -[ - -0.02872051646443488, - 0.05959053473372933, -] -`; - -exports[`address > 1211 > nearbyGPSCoordinate > noArgs 1`] = ` -[ - 77.1337, - -14.7545, -] -`; - -exports[`address > 1211 > ordinalDirection > noArgs 1`] = `"Southwest"`; - -exports[`address > 1211 > ordinalDirection > with abbr = false 1`] = `"Southwest"`; - -exports[`address > 1211 > ordinalDirection > with abbr = true 1`] = `"SW"`; - -exports[`address > 1211 > secondaryAddress 1`] = `"Suite 487"`; - -exports[`address > 1211 > state 1`] = `"Washington"`; - -exports[`address > 1211 > stateAbbr 1`] = `"WA"`; - -exports[`address > 1211 > street 1`] = `"Koelpin Turnpike"`; - -exports[`address > 1211 > streetAddress > noArgs 1`] = `"487 Breana Wells"`; - -exports[`address > 1211 > streetAddress > with useFullAddress = false 1`] = `"487 Breana Wells"`; - -exports[`address > 1211 > streetAddress > with useFullAddress = true 1`] = `"487 Breana Wells Apt. 616"`; - -exports[`address > 1211 > streetName 1`] = `"c"`; - -exports[`address > 1211 > timeZone 1`] = `"Asia/Magadan"`; - -exports[`address > 1211 > zipCode > noArgs 1`] = `"48721-9061"`; - -exports[`address > 1211 > zipCode > with format 1`] = `"948-721"`; - -exports[`address > 1211 > zipCodeByState > state 1`] = `"48721-9061"`; - -exports[`address > 1211 > zipCodeByState > state2 1`] = `"48721-9061"`; - -exports[`address > 1337 > buildingNumber 1`] = `"51225"`; - -exports[`address > 1337 > cardinalDirection > noArgs 1`] = `"East"`; - -exports[`address > 1337 > cardinalDirection > with abbr = false 1`] = `"East"`; - -exports[`address > 1337 > cardinalDirection > with abbr = true 1`] = `"E"`; - -exports[`address > 1337 > city 1`] = `"New Carmella"`; - -exports[`address > 1337 > cityName 1`] = `"East Hartford"`; - -exports[`address > 1337 > country 1`] = `"Equatorial Guinea"`; - -exports[`address > 1337 > countryCode > noArgs 1`] = `"EH"`; - -exports[`address > 1337 > countryCode > with code = alpha-2 1`] = `"EH"`; - -exports[`address > 1337 > countryCode > with code = alpha-3 1`] = `"PRI"`; - -exports[`address > 1337 > county 1`] = `"Bedfordshire"`; - -exports[`address > 1337 > direction > noArgs 1`] = `"South"`; - -exports[`address > 1337 > direction > with abbr = false 1`] = `"South"`; - -exports[`address > 1337 > direction > with abbr = true 1`] = `"S"`; - -exports[`address > 1337 > latitude > noArgs 1`] = `-42.8356`; - -exports[`address > 1337 > longitude > noArgs 1`] = `-85.6711`; - -exports[`address > 1337 > nearbyGPSCoordinate > near origin 1`] = ` -[ - 0.08055259537977688, - -0.006097651409731952, -] -`; - -exports[`address > 1337 > nearbyGPSCoordinate > noArgs 1`] = ` -[ - -42.8356, - 21.7907, -] -`; - -exports[`address > 1337 > ordinalDirection > noArgs 1`] = `"Northwest"`; - -exports[`address > 1337 > ordinalDirection > with abbr = false 1`] = `"Northwest"`; - -exports[`address > 1337 > ordinalDirection > with abbr = true 1`] = `"NW"`; - -exports[`address > 1337 > secondaryAddress 1`] = `"Apt. 512"`; - -exports[`address > 1337 > state 1`] = `"Indiana"`; - -exports[`address > 1337 > stateAbbr 1`] = `"IN"`; - -exports[`address > 1337 > street 1`] = `"Kellen Crest"`; - -exports[`address > 1337 > streetAddress > noArgs 1`] = `"51225 Alexys Gateway"`; - -exports[`address > 1337 > streetAddress > with useFullAddress = false 1`] = `"51225 Alexys Gateway"`; - -exports[`address > 1337 > streetAddress > with useFullAddress = true 1`] = `"51225 Alexys Gateway Apt. 552"`; - -exports[`address > 1337 > streetName 1`] = `"a"`; - -exports[`address > 1337 > timeZone 1`] = `"Europe/London"`; - -exports[`address > 1337 > zipCode > noArgs 1`] = `"51225"`; - -exports[`address > 1337 > zipCode > with format 1`] = `"251-225"`; - -exports[`address > 1337 > zipCodeByState > state 1`] = `"51225"`; - -exports[`address > 1337 > zipCodeByState > state2 1`] = `"51225"`; diff --git a/test/__snapshots__/location.spec.ts.snap b/test/__snapshots__/location.spec.ts.snap new file mode 100644 index 00000000000..bceda5a4bb4 --- /dev/null +++ b/test/__snapshots__/location.spec.ts.snap @@ -0,0 +1,235 @@ +// Vitest Snapshot v1 + +exports[`location > 42 > buildingNumber 1`] = `"7917"`; + +exports[`location > 42 > cardinalDirection > noArgs 1`] = `"East"`; + +exports[`location > 42 > cardinalDirection > with abbr = false 1`] = `"East"`; + +exports[`location > 42 > cardinalDirection > with abbr = true 1`] = `"E"`; + +exports[`location > 42 > city 1`] = `"Port Valentine"`; + +exports[`location > 42 > cityName 1`] = `"Hamilton"`; + +exports[`location > 42 > country 1`] = `"Haiti"`; + +exports[`location > 42 > countryCode > noArgs 1`] = `"GY"`; + +exports[`location > 42 > countryCode > with code = alpha-2 1`] = `"GY"`; + +exports[`location > 42 > countryCode > with code = alpha-3 1`] = `"SAU"`; + +exports[`location > 42 > county 1`] = `"Berkshire"`; + +exports[`location > 42 > direction > noArgs 1`] = `"South"`; + +exports[`location > 42 > direction > with abbr = false 1`] = `"South"`; + +exports[`location > 42 > direction > with abbr = true 1`] = `"S"`; + +exports[`location > 42 > latitude > noArgs 1`] = `-22.5828`; + +exports[`location > 42 > longitude > noArgs 1`] = `-45.1656`; + +exports[`location > 42 > nearbyGPSCoordinate > near origin 1`] = ` +[ + 0.08140632875358443, + -0.08093642792425726, +] +`; + +exports[`location > 42 > nearbyGPSCoordinate > noArgs 1`] = ` +[ + -22.5828, + 106.7555, +] +`; + +exports[`location > 42 > ordinalDirection > noArgs 1`] = `"Northwest"`; + +exports[`location > 42 > ordinalDirection > with abbr = false 1`] = `"Northwest"`; + +exports[`location > 42 > ordinalDirection > with abbr = true 1`] = `"NW"`; + +exports[`location > 42 > secondaryAddress 1`] = `"Apt. 791"`; + +exports[`location > 42 > state 1`] = `"Maine"`; + +exports[`location > 42 > stateAbbr 1`] = `"ME"`; + +exports[`location > 42 > street 1`] = `"Peyton Villages"`; + +exports[`location > 42 > streetAddress > noArgs 1`] = `"7917 Miller Park"`; + +exports[`location > 42 > streetAddress > with useFullAddress = false 1`] = `"7917 Miller Park"`; + +exports[`location > 42 > streetAddress > with useFullAddress = true 1`] = `"7917 Miller Park Apt. 410"`; + +exports[`location > 42 > streetName 1`] = `"b"`; + +exports[`location > 42 > timeZone 1`] = `"Europe/Brussels"`; + +exports[`location > 42 > zipCode > noArgs 1`] = `"79177"`; + +exports[`location > 42 > zipCode > with format 1`] = `"379-177"`; + +exports[`location > 42 > zipCodeByState > state 1`] = `"79177"`; + +exports[`location > 42 > zipCodeByState > state2 1`] = `"79177"`; + +exports[`location > 1211 > buildingNumber 1`] = `"487"`; + +exports[`location > 1211 > cardinalDirection > noArgs 1`] = `"West"`; + +exports[`location > 1211 > cardinalDirection > with abbr = false 1`] = `"West"`; + +exports[`location > 1211 > cardinalDirection > with abbr = true 1`] = `"W"`; + +exports[`location > 1211 > city 1`] = `"La Crosse"`; + +exports[`location > 1211 > cityName 1`] = `"Utica"`; + +exports[`location > 1211 > country 1`] = `"Uganda"`; + +exports[`location > 1211 > countryCode > noArgs 1`] = `"UM"`; + +exports[`location > 1211 > countryCode > with code = alpha-2 1`] = `"UM"`; + +exports[`location > 1211 > countryCode > with code = alpha-3 1`] = `"IRN"`; + +exports[`location > 1211 > county 1`] = `"Cambridgeshire"`; + +exports[`location > 1211 > direction > noArgs 1`] = `"Southwest"`; + +exports[`location > 1211 > direction > with abbr = false 1`] = `"Southwest"`; + +exports[`location > 1211 > direction > with abbr = true 1`] = `"SW"`; + +exports[`location > 1211 > latitude > noArgs 1`] = `77.1337`; + +exports[`location > 1211 > longitude > noArgs 1`] = `154.2673`; + +exports[`location > 1211 > nearbyGPSCoordinate > near origin 1`] = ` +[ + -0.02872051646443488, + 0.05959053473372933, +] +`; + +exports[`location > 1211 > nearbyGPSCoordinate > noArgs 1`] = ` +[ + 77.1337, + -14.7545, +] +`; + +exports[`location > 1211 > ordinalDirection > noArgs 1`] = `"Southwest"`; + +exports[`location > 1211 > ordinalDirection > with abbr = false 1`] = `"Southwest"`; + +exports[`location > 1211 > ordinalDirection > with abbr = true 1`] = `"SW"`; + +exports[`location > 1211 > secondaryAddress 1`] = `"Suite 487"`; + +exports[`location > 1211 > state 1`] = `"Washington"`; + +exports[`location > 1211 > stateAbbr 1`] = `"WA"`; + +exports[`location > 1211 > street 1`] = `"Koelpin Turnpike"`; + +exports[`location > 1211 > streetAddress > noArgs 1`] = `"487 Breana Wells"`; + +exports[`location > 1211 > streetAddress > with useFullAddress = false 1`] = `"487 Breana Wells"`; + +exports[`location > 1211 > streetAddress > with useFullAddress = true 1`] = `"487 Breana Wells Apt. 616"`; + +exports[`location > 1211 > streetName 1`] = `"c"`; + +exports[`location > 1211 > timeZone 1`] = `"Asia/Magadan"`; + +exports[`location > 1211 > zipCode > noArgs 1`] = `"48721-9061"`; + +exports[`location > 1211 > zipCode > with format 1`] = `"948-721"`; + +exports[`location > 1211 > zipCodeByState > state 1`] = `"48721-9061"`; + +exports[`location > 1211 > zipCodeByState > state2 1`] = `"48721-9061"`; + +exports[`location > 1337 > buildingNumber 1`] = `"51225"`; + +exports[`location > 1337 > cardinalDirection > noArgs 1`] = `"East"`; + +exports[`location > 1337 > cardinalDirection > with abbr = false 1`] = `"East"`; + +exports[`location > 1337 > cardinalDirection > with abbr = true 1`] = `"E"`; + +exports[`location > 1337 > city 1`] = `"New Carmella"`; + +exports[`location > 1337 > cityName 1`] = `"East Hartford"`; + +exports[`location > 1337 > country 1`] = `"Equatorial Guinea"`; + +exports[`location > 1337 > countryCode > noArgs 1`] = `"EH"`; + +exports[`location > 1337 > countryCode > with code = alpha-2 1`] = `"EH"`; + +exports[`location > 1337 > countryCode > with code = alpha-3 1`] = `"PRI"`; + +exports[`location > 1337 > county 1`] = `"Bedfordshire"`; + +exports[`location > 1337 > direction > noArgs 1`] = `"South"`; + +exports[`location > 1337 > direction > with abbr = false 1`] = `"South"`; + +exports[`location > 1337 > direction > with abbr = true 1`] = `"S"`; + +exports[`location > 1337 > latitude > noArgs 1`] = `-42.8356`; + +exports[`location > 1337 > longitude > noArgs 1`] = `-85.6711`; + +exports[`location > 1337 > nearbyGPSCoordinate > near origin 1`] = ` +[ + 0.08055259537977688, + -0.006097651409731952, +] +`; + +exports[`location > 1337 > nearbyGPSCoordinate > noArgs 1`] = ` +[ + -42.8356, + 21.7907, +] +`; + +exports[`location > 1337 > ordinalDirection > noArgs 1`] = `"Northwest"`; + +exports[`location > 1337 > ordinalDirection > with abbr = false 1`] = `"Northwest"`; + +exports[`location > 1337 > ordinalDirection > with abbr = true 1`] = `"NW"`; + +exports[`location > 1337 > secondaryAddress 1`] = `"Apt. 512"`; + +exports[`location > 1337 > state 1`] = `"Indiana"`; + +exports[`location > 1337 > stateAbbr 1`] = `"IN"`; + +exports[`location > 1337 > street 1`] = `"Kellen Crest"`; + +exports[`location > 1337 > streetAddress > noArgs 1`] = `"51225 Alexys Gateway"`; + +exports[`location > 1337 > streetAddress > with useFullAddress = false 1`] = `"51225 Alexys Gateway"`; + +exports[`location > 1337 > streetAddress > with useFullAddress = true 1`] = `"51225 Alexys Gateway Apt. 552"`; + +exports[`location > 1337 > streetName 1`] = `"a"`; + +exports[`location > 1337 > timeZone 1`] = `"Europe/London"`; + +exports[`location > 1337 > zipCode > noArgs 1`] = `"51225"`; + +exports[`location > 1337 > zipCode > with format 1`] = `"251-225"`; + +exports[`location > 1337 > zipCodeByState > state 1`] = `"51225"`; + +exports[`location > 1337 > zipCodeByState > state2 1`] = `"51225"`; 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, diff --git a/test/faker.spec.ts b/test/faker.spec.ts index 0d25813b40c..dac1be5a1e9 100644 --- a/test/faker.spec.ts +++ b/test/faker.spec.ts @@ -94,7 +94,7 @@ describe('faker', () => { // Metadata expect(faker.definitions.title).toBeDefined(); // Standard modules - expect(faker.definitions.address.city_name).toBeDefined(); + expect(faker.definitions.location.city_name).toBeDefined(); // Custom modules expect(faker.definitions.business.credit_card_types).toBeDefined(); expect(faker.definitions.missing).toBeUndefined(); diff --git a/test/helpers.spec.ts b/test/helpers.spec.ts index 44316c1d2e2..8f430e9b44c 100644 --- a/test/helpers.spec.ts +++ b/test/helpers.spec.ts @@ -531,18 +531,18 @@ describe('helpers', () => { }); it('does not allow missing method name', () => { - expect(() => faker.helpers.fake('{{address}}')).toThrowError( - new FakerError(`Invalid module method or definition: address -- faker.address is not a function -- faker.definitions.address is not an array`) + expect(() => faker.helpers.fake('{{location}}')).toThrowError( + new FakerError(`Invalid module method or definition: location +- faker.location is not a function +- faker.definitions.location is not an array`) ); }); it('does not allow invalid method name', () => { - expect(() => faker.helpers.fake('{{address.foo}}')).toThrowError( - new FakerError(`Invalid module method or definition: address.foo -- faker.address.foo is not a function -- faker.definitions.address.foo is not an array`) + expect(() => faker.helpers.fake('{{location.foo}}')).toThrowError( + new FakerError(`Invalid module method or definition: location.foo +- faker.location.foo is not a function +- faker.definitions.location.foo is not an array`) ); }); @@ -567,8 +567,8 @@ describe('helpers', () => { }); it('should be able to return locale definition strings that starts with the name of an existing module', () => { - expect(faker.definitions.address.city_name).toContain( - faker.helpers.fake('{{address.city_name}}') + expect(faker.definitions.location.city_name).toContain( + faker.helpers.fake('{{location.city_name}}') ); }); diff --git a/test/address.spec.ts b/test/location.spec.ts similarity index 86% rename from test/address.spec.ts rename to test/location.spec.ts index ac966e90048..567ec148c8d 100644 --- a/test/address.spec.ts +++ b/test/location.spec.ts @@ -37,12 +37,12 @@ function haversine( const NON_SEEDED_BASED_RUN = 5; -describe('address', () => { +describe('location', () => { afterEach(() => { faker.locale = 'en'; }); - seededTests(faker, 'address', (t) => { + seededTests(faker, 'location', (t) => { t.itEach('street', 'streetName'); t.it('buildingNumber'); @@ -102,7 +102,7 @@ describe('address', () => { for (let i = 1; i <= NON_SEEDED_BASED_RUN; i++) { describe('countryCode()', () => { it('returns random alpha-3 countryCode', () => { - const countryCode = faker.address.countryCode('alpha-3'); + const countryCode = faker.location.countryCode('alpha-3'); expect(countryCode).toBeTruthy(); expect( @@ -114,12 +114,12 @@ describe('address', () => { describe('zipCode()', () => { it('returns random zipCode - user specified format', () => { - let zipCode = faker.address.zipCode('?#? #?#'); + let zipCode = faker.location.zipCode('?#? #?#'); expect(zipCode).toMatch(/^[A-Za-z]\d[A-Za-z]\s\d[A-Za-z]\d$/); // try another format - zipCode = faker.address.zipCode('###-###'); + zipCode = faker.location.zipCode('###-###'); expect(zipCode).toMatch(/^\d{3}-\d{3}$/); }); @@ -127,7 +127,7 @@ describe('address', () => { it('returns zipCode with proper locale format', () => { // we'll use the en_CA locale.. faker.locale = 'en_CA'; - const zipCode = faker.address.zipCode(); + const zipCode = faker.location.zipCode(); expect(zipCode).toMatch(/^[A-Za-z]\d[A-Za-z]\s?\d[A-Za-z]\d$/); }); @@ -138,15 +138,15 @@ describe('address', () => { faker.locale = 'en_US'; const states = ['IL', 'GA', 'WA']; - const zipCode1 = +faker.address.zipCodeByState(states[0]); + const zipCode1 = +faker.location.zipCodeByState(states[0]); expect(zipCode1).toBeGreaterThanOrEqual(60001); expect(zipCode1).toBeLessThanOrEqual(62999); - const zipCode2 = +faker.address.zipCodeByState(states[1]); + const zipCode2 = +faker.location.zipCodeByState(states[1]); expect(zipCode2).toBeGreaterThanOrEqual(30001); expect(zipCode2).toBeLessThanOrEqual(31999); - const zipCode3 = +faker.address.zipCodeByState(states[2]); + const zipCode3 = +faker.location.zipCodeByState(states[2]); expect(zipCode3).toBeGreaterThanOrEqual(98001); expect(zipCode3).toBeLessThanOrEqual(99403); }); @@ -154,20 +154,20 @@ describe('address', () => { describe('latitude()', () => { it('returns a number', () => { - const latitude = faker.address.latitude(); + const latitude = faker.location.latitude(); expect(latitude).toBeTypeOf('number'); }); it('returns random latitude', () => { - const latitude = faker.address.latitude(); + const latitude = faker.location.latitude(); expect(latitude).toBeGreaterThanOrEqual(-90.0); expect(latitude).toBeLessThanOrEqual(90.0); }); it('returns latitude with min and max and default precision', () => { - const latitude = faker.address.latitude(5, -5); + const latitude = faker.location.latitude(5, -5); expect( latitude.toString().split('.')[1].length, @@ -179,7 +179,7 @@ describe('address', () => { }); it('returns random latitude with custom precision', () => { - const latitude = faker.address.latitude(undefined, undefined, 7); + const latitude = faker.location.latitude(undefined, undefined, 7); expect( latitude.toString().split('.')[1].length, @@ -193,20 +193,20 @@ describe('address', () => { describe('longitude()', () => { it('returns a number', () => { - const longitude = faker.address.longitude(); + const longitude = faker.location.longitude(); expect(longitude).toBeTypeOf('number'); }); it('returns random longitude', () => { - const longitude = faker.address.longitude(); + const longitude = faker.location.longitude(); expect(longitude).toBeGreaterThanOrEqual(-180); expect(longitude).toBeLessThanOrEqual(180); }); it('returns random longitude with min and max and default precision', () => { - const longitude = faker.address.longitude(100, -30); + const longitude = faker.location.longitude(100, -30); expect( longitude.toString().split('.')[1].length, @@ -218,7 +218,7 @@ describe('address', () => { }); it('returns random longitude with custom precision', () => { - const longitude = faker.address.longitude(undefined, undefined, 7); + const longitude = faker.location.longitude(undefined, undefined, 7); expect( longitude.toString().split('.')[1].length, @@ -232,7 +232,7 @@ describe('address', () => { describe('direction()', () => { it('returns abbreviation when useAbbr is true', () => { - const direction = faker.address.direction(true); + const direction = faker.location.direction(true); const lengthDirection = direction.length; const prefixErrorMessage = 'The abbreviation of direction when useAbbr is true should'; @@ -247,7 +247,7 @@ describe('address', () => { describe('ordinalDirection()', () => { it('returns abbreviation when useAbbr is true', () => { - const ordinalDirection = faker.address.ordinalDirection(true); + const ordinalDirection = faker.location.ordinalDirection(true); const expectedType = 'string'; const ordinalDirectionLength = ordinalDirection.length; const prefixErrorMessage = @@ -263,7 +263,7 @@ describe('address', () => { describe('cardinalDirection()', () => { it('returns abbreviation when useAbbr is true', () => { - const cardinalDirection = faker.address.cardinalDirection(true); + const cardinalDirection = faker.location.cardinalDirection(true); const expectedType = 'string'; const cardinalDirectionLength = cardinalDirection.length; const prefixErrorMessage = @@ -283,10 +283,10 @@ describe('address', () => { it(`should return random gps coordinate within a distance of another one (${JSON.stringify( { isMetric, radius } )})`, () => { - const latitude1 = +faker.address.latitude(); - const longitude1 = +faker.address.longitude(); + const latitude1 = +faker.location.latitude(); + const longitude1 = +faker.location.longitude(); - const coordinate = faker.address.nearbyGPSCoordinate( + const coordinate = faker.location.nearbyGPSCoordinate( [latitude1, longitude1], radius, isMetric