From d62acc20999a0a7d3975fc59681607c9c5899df8 Mon Sep 17 00:00:00 2001
From: ST-DDT <ST-DDT@gmx.de>
Date: Sat, 2 Apr 2022 02:47:03 +0200
Subject: [PATCH 1/4] feat: use street address templates from locales

---
 src/address.ts                           | 44 ++++++++++++------------
 src/definitions/address.ts               | 13 +++++++
 src/locales/en/address/street_address.ts |  2 +-
 3 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/src/address.ts b/src/address.ts
index d8dfbbbb2ee..9dd7c451535 100644
--- a/src/address.ts
+++ b/src/address.ts
@@ -207,6 +207,20 @@ export class Address {
     );
   }
 
+  /**
+   * Generates a random building number.
+   *
+   * @example
+   * faker.address.buildingNumber() // '379'
+   */
+  buildingNumber(): string {
+    const format = this.faker.random.arrayElement(
+      this.faker.definitions.address.building_number
+    );
+
+    return this.faker.helpers.replaceSymbolWithNumber(format);
+  }
+
   /**
    * Generates a random localized street name.
    *
@@ -243,27 +257,12 @@ export class Address {
    * faker.address.streetAddress(false) // '34830 Erdman Hollow'
    */
   streetAddress(useFullAddress: boolean = false): string {
-    let address = '';
-    switch (this.faker.datatype.number(2)) {
-      case 0:
-        address =
-          this.faker.helpers.replaceSymbolWithNumber('#####') +
-          ' ' +
-          this.faker.address.streetName();
-        break;
-      case 1:
-        address =
-          this.faker.helpers.replaceSymbolWithNumber('####') +
-          ' ' +
-          this.faker.address.streetName();
-        break;
-      case 2:
-        address =
-          this.faker.helpers.replaceSymbolWithNumber('###') +
-          ' ' +
-          this.faker.address.streetName();
-        break;
-    }
+    const format = this.faker.random.arrayElement(
+      this.faker.definitions.address.street_address
+    );
+
+    const address = this.faker.fake(format);
+
     return useFullAddress
       ? address + ' ' + this.faker.address.secondaryAddress()
       : address;
@@ -294,7 +293,8 @@ export class Address {
   }
 
   /**
-   * Generates a random localized secondary address.
+   * Generates a random localized secondary address. This refers to a specific location at a given address
+   * such as an apartment or room number.
    *
    * @example
    * faker.address.secondaryAddress() // 'Apt. 861'
diff --git a/src/definitions/address.ts b/src/definitions/address.ts
index d34bc0bd74f..8bfbc51fbbd 100644
--- a/src/definitions/address.ts
+++ b/src/definitions/address.ts
@@ -57,6 +57,11 @@ export interface AddressDefinitions {
    */
   direction_abbr: string[];
 
+  /**
+   * The pattern used to generate building numbers.
+   */
+  building_number: string[];
+
   /**
    * Common street prefixes
    */
@@ -66,6 +71,11 @@ export interface AddressDefinitions {
    */
   street_suffix: string[];
 
+  /**
+   * The pattern used to generate street addresses.
+   */
+  street_address: string[];
+
   /**
    * The address "inside" an address/e.g. an apartment or office.
    */
@@ -103,9 +113,12 @@ export const ADDRESS = allOf<keyof AddressDefinitions>()(
   'direction_abbr',
   'direction',
 
+  'building_number',
+
   'street_prefix',
   'street_suffix',
 
+  'street_address',
   'secondary_address',
 
   'country_code',
diff --git a/src/locales/en/address/street_address.ts b/src/locales/en/address/street_address.ts
index 0fcaf4695d6..ae34fbcd094 100644
--- a/src/locales/en/address/street_address.ts
+++ b/src/locales/en/address/street_address.ts
@@ -1 +1 @@
-export default ['#{building_number} #{street_name}'];
+export default ['{{address.buildingNumber}} {{address.streetName}}'];

From f21bac7e2f0ab9b6eba67d70b678b46de13809eb Mon Sep 17 00:00:00 2001
From: ST-DDT <ST-DDT@gmx.de>
Date: Sun, 3 Apr 2022 00:30:12 +0200
Subject: [PATCH 2/4] chore: convert street address templates to faker.fake

---
 src/address.ts                              | 11 +++--------
 src/definitions/address.ts                  |  4 +++-
 src/locales/ar/address/street_address.ts    |  5 ++++-
 src/locales/az/address/street_address.ts    |  5 ++++-
 src/locales/cz/address/street_address.ts    |  5 ++++-
 src/locales/de/address/street_address.ts    |  5 ++++-
 src/locales/de_AT/address/street_address.ts |  5 ++++-
 src/locales/en/address/street_address.ts    |  5 ++++-
 src/locales/en_GH/address/street_address.ts |  5 ++++-
 src/locales/es/address/street_address.ts    |  6 +++---
 src/locales/es_MX/address/street_address.ts |  6 +++---
 src/locales/fa/address/street_address.ts    |  6 +++---
 src/locales/fr/address/street_address.ts    |  5 ++++-
 src/locales/fr_BE/address/street_address.ts |  5 ++++-
 src/locales/ge/address/street_address.ts    |  5 ++++-
 src/locales/he/address/street_address.ts    |  5 ++++-
 src/locales/hr/address/street_address.ts    |  5 ++++-
 src/locales/hy/address/street_address.ts    |  5 ++++-
 src/locales/id_ID/address/street_address.ts |  5 ++++-
 src/locales/it/address/street_address.ts    |  6 +++---
 src/locales/lv/address/street_address.ts    |  6 +++---
 src/locales/mk/address/street_address.ts    |  5 ++++-
 src/locales/nb_NO/address/street_address.ts |  5 ++++-
 src/locales/nl/address/street_address.ts    |  5 ++++-
 src/locales/nl_BE/address/street_address.ts |  5 ++++-
 src/locales/pl/address/street_address.ts    |  5 ++++-
 src/locales/pt_PT/address/street_address.ts |  5 ++++-
 src/locales/ro/address/street_address.ts    |  5 ++++-
 src/locales/ru/address/street_address.ts    |  5 ++++-
 src/locales/sk/address/street_address.ts    |  5 ++++-
 src/locales/sv/address/street_address.ts    |  5 ++++-
 src/locales/tr/address/street_address.ts    |  5 ++++-
 src/locales/uk/address/street_address.ts    |  5 ++++-
 src/locales/ur/address/street_address.ts    |  5 ++++-
 src/locales/zh_CN/address/street_address.ts |  5 ++++-
 src/locales/zh_TW/address/street_address.ts |  5 ++++-
 36 files changed, 137 insertions(+), 53 deletions(-)

diff --git a/src/address.ts b/src/address.ts
index 9dd7c451535..aa2492d1aff 100644
--- a/src/address.ts
+++ b/src/address.ts
@@ -257,15 +257,10 @@ export class Address {
    * faker.address.streetAddress(false) // '34830 Erdman Hollow'
    */
   streetAddress(useFullAddress: boolean = false): string {
-    const format = this.faker.random.arrayElement(
-      this.faker.definitions.address.street_address
-    );
-
-    const address = this.faker.fake(format);
+    const format =
+      this.faker.definitions.address.street_address[useFullAddress ? 1 : 0];
 
-    return useFullAddress
-      ? address + ' ' + this.faker.address.secondaryAddress()
-      : address;
+    return this.faker.fake(format);
   }
 
   /**
diff --git a/src/definitions/address.ts b/src/definitions/address.ts
index 8bfbc51fbbd..26e82a5aeb0 100644
--- a/src/definitions/address.ts
+++ b/src/definitions/address.ts
@@ -73,8 +73,10 @@ export interface AddressDefinitions {
 
   /**
    * The pattern used to generate street addresses.
+   * The first element is only the street address,
+   * the second element is the full street address including the secondary address.
    */
-  street_address: string[];
+  street_address: [string, string];
 
   /**
    * The address "inside" an address/e.g. an apartment or office.
diff --git a/src/locales/ar/address/street_address.ts b/src/locales/ar/address/street_address.ts
index 0fcaf4695d6..b86cd821f64 100644
--- a/src/locales/ar/address/street_address.ts
+++ b/src/locales/ar/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{building_number} #{street_name}'];
+export default [
+  '{{address.buildingNumber}} {{address.streetName}}',
+  '{{address.buildingNumber}} {{address.streetName}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/az/address/street_address.ts b/src/locales/az/address/street_address.ts
index a6c7cff8a2d..d073bab0dda 100644
--- a/src/locales/az/address/street_address.ts
+++ b/src/locales/az/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{street_name}, #{building_number}'];
+export default [
+  '{{address.streetName}}, {{address.buildingNumber}}',
+  '{{address.streetName}}, {{address.buildingNumber}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/cz/address/street_address.ts b/src/locales/cz/address/street_address.ts
index 51642bdd055..5f7b6f4b0e6 100644
--- a/src/locales/cz/address/street_address.ts
+++ b/src/locales/cz/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{street_name} #{building_number}'];
+export default [
+  '{{address.streetName}} {{address.buildingNumber}}',
+  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/de/address/street_address.ts b/src/locales/de/address/street_address.ts
index 51642bdd055..5f7b6f4b0e6 100644
--- a/src/locales/de/address/street_address.ts
+++ b/src/locales/de/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{street_name} #{building_number}'];
+export default [
+  '{{address.streetName}} {{address.buildingNumber}}',
+  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/de_AT/address/street_address.ts b/src/locales/de_AT/address/street_address.ts
index 51642bdd055..5f7b6f4b0e6 100644
--- a/src/locales/de_AT/address/street_address.ts
+++ b/src/locales/de_AT/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{street_name} #{building_number}'];
+export default [
+  '{{address.streetName}} {{address.buildingNumber}}',
+  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/en/address/street_address.ts b/src/locales/en/address/street_address.ts
index ae34fbcd094..b86cd821f64 100644
--- a/src/locales/en/address/street_address.ts
+++ b/src/locales/en/address/street_address.ts
@@ -1 +1,4 @@
-export default ['{{address.buildingNumber}} {{address.streetName}}'];
+export default [
+  '{{address.buildingNumber}} {{address.streetName}}',
+  '{{address.buildingNumber}} {{address.streetName}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/en_GH/address/street_address.ts b/src/locales/en_GH/address/street_address.ts
index 0fcaf4695d6..b86cd821f64 100644
--- a/src/locales/en_GH/address/street_address.ts
+++ b/src/locales/en_GH/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{building_number} #{street_name}'];
+export default [
+  '{{address.buildingNumber}} {{address.streetName}}',
+  '{{address.buildingNumber}} {{address.streetName}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/es/address/street_address.ts b/src/locales/es/address/street_address.ts
index b313d432161..80e610bb406 100644
--- a/src/locales/es/address/street_address.ts
+++ b/src/locales/es/address/street_address.ts
@@ -1,4 +1,4 @@
 export default [
-  '#{street_name}#{building_number}',
-  '#{street_name}#{building_number} #{secondary_address}',
-];
+  '{{address.streetName}}{{address.buildingNumber}}',
+  '{{address.streetName}}{{address.buildingNumber}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/es_MX/address/street_address.ts b/src/locales/es_MX/address/street_address.ts
index b313d432161..80e610bb406 100644
--- a/src/locales/es_MX/address/street_address.ts
+++ b/src/locales/es_MX/address/street_address.ts
@@ -1,4 +1,4 @@
 export default [
-  '#{street_name}#{building_number}',
-  '#{street_name}#{building_number} #{secondary_address}',
-];
+  '{{address.streetName}}{{address.buildingNumber}}',
+  '{{address.streetName}}{{address.buildingNumber}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/fa/address/street_address.ts b/src/locales/fa/address/street_address.ts
index 22ab96e3e01..2e5ed57169e 100644
--- a/src/locales/fa/address/street_address.ts
+++ b/src/locales/fa/address/street_address.ts
@@ -1,4 +1,4 @@
 export default [
-  '#{street_name}, پلاک #{building_number}',
-  '#{street_name}, #{street_name}, پلاک #{building_number}',
-];
+  '{{address.streetName}}, پلاک {{address.buildingNumber}}',
+  '{{address.streetName}}, {{address.streetName}}, پلاک {{address.buildingNumber}}',
+] as [string, string];
diff --git a/src/locales/fr/address/street_address.ts b/src/locales/fr/address/street_address.ts
index 0fcaf4695d6..b86cd821f64 100644
--- a/src/locales/fr/address/street_address.ts
+++ b/src/locales/fr/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{building_number} #{street_name}'];
+export default [
+  '{{address.buildingNumber}} {{address.streetName}}',
+  '{{address.buildingNumber}} {{address.streetName}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/fr_BE/address/street_address.ts b/src/locales/fr_BE/address/street_address.ts
index 51642bdd055..5f7b6f4b0e6 100644
--- a/src/locales/fr_BE/address/street_address.ts
+++ b/src/locales/fr_BE/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{street_name} #{building_number}'];
+export default [
+  '{{address.streetName}} {{address.buildingNumber}}',
+  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/ge/address/street_address.ts b/src/locales/ge/address/street_address.ts
index 51642bdd055..5f7b6f4b0e6 100644
--- a/src/locales/ge/address/street_address.ts
+++ b/src/locales/ge/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{street_name} #{building_number}'];
+export default [
+  '{{address.streetName}} {{address.buildingNumber}}',
+  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/he/address/street_address.ts b/src/locales/he/address/street_address.ts
index 0fcaf4695d6..b86cd821f64 100644
--- a/src/locales/he/address/street_address.ts
+++ b/src/locales/he/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{building_number} #{street_name}'];
+export default [
+  '{{address.buildingNumber}} {{address.streetName}}',
+  '{{address.buildingNumber}} {{address.streetName}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/hr/address/street_address.ts b/src/locales/hr/address/street_address.ts
index 51642bdd055..5f7b6f4b0e6 100644
--- a/src/locales/hr/address/street_address.ts
+++ b/src/locales/hr/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{street_name} #{building_number}'];
+export default [
+  '{{address.streetName}} {{address.buildingNumber}}',
+  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/hy/address/street_address.ts b/src/locales/hy/address/street_address.ts
index 41ed0474025..5f7b6f4b0e6 100644
--- a/src/locales/hy/address/street_address.ts
+++ b/src/locales/hy/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{address.street_name} #{address.building_number}'];
+export default [
+  '{{address.streetName}} {{address.buildingNumber}}',
+  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/id_ID/address/street_address.ts b/src/locales/id_ID/address/street_address.ts
index 33d2e0ce565..33850c4c914 100644
--- a/src/locales/id_ID/address/street_address.ts
+++ b/src/locales/id_ID/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{street_name} no #{building_number}'];
+export default [
+  '{{address.streetName}} no {{address.buildingNumber}}',
+  '{{address.streetName}} no {{address.buildingNumber}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/it/address/street_address.ts b/src/locales/it/address/street_address.ts
index 98c792d0608..23f473a2ae2 100644
--- a/src/locales/it/address/street_address.ts
+++ b/src/locales/it/address/street_address.ts
@@ -1,4 +1,4 @@
 export default [
-  '#{street_name} #{building_number}',
-  '#{street_name} #{building_number}, #{secondary_address}',
-];
+  '{{address.streetName}} {{address.buildingNumber}}',
+  '{{address.streetName}} {{address.buildingNumber}}, {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/lv/address/street_address.ts b/src/locales/lv/address/street_address.ts
index 5987b430a30..5f7b6f4b0e6 100644
--- a/src/locales/lv/address/street_address.ts
+++ b/src/locales/lv/address/street_address.ts
@@ -1,4 +1,4 @@
 export default [
-  '#{street_name} #{building_number}',
-  '#{street_name} #{building_number} #{secondary_address}',
-];
+  '{{address.streetName}} {{address.buildingNumber}}',
+  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/mk/address/street_address.ts b/src/locales/mk/address/street_address.ts
index 51642bdd055..5f7b6f4b0e6 100644
--- a/src/locales/mk/address/street_address.ts
+++ b/src/locales/mk/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{street_name} #{building_number}'];
+export default [
+  '{{address.streetName}} {{address.buildingNumber}}',
+  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/nb_NO/address/street_address.ts b/src/locales/nb_NO/address/street_address.ts
index 51642bdd055..5f7b6f4b0e6 100644
--- a/src/locales/nb_NO/address/street_address.ts
+++ b/src/locales/nb_NO/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{street_name} #{building_number}'];
+export default [
+  '{{address.streetName}} {{address.buildingNumber}}',
+  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/nl/address/street_address.ts b/src/locales/nl/address/street_address.ts
index 51642bdd055..5f7b6f4b0e6 100644
--- a/src/locales/nl/address/street_address.ts
+++ b/src/locales/nl/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{street_name} #{building_number}'];
+export default [
+  '{{address.streetName}} {{address.buildingNumber}}',
+  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/nl_BE/address/street_address.ts b/src/locales/nl_BE/address/street_address.ts
index 51642bdd055..5f7b6f4b0e6 100644
--- a/src/locales/nl_BE/address/street_address.ts
+++ b/src/locales/nl_BE/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{street_name} #{building_number}'];
+export default [
+  '{{address.streetName}} {{address.buildingNumber}}',
+  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/pl/address/street_address.ts b/src/locales/pl/address/street_address.ts
index 51642bdd055..5f7b6f4b0e6 100644
--- a/src/locales/pl/address/street_address.ts
+++ b/src/locales/pl/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{street_name} #{building_number}'];
+export default [
+  '{{address.streetName}} {{address.buildingNumber}}',
+  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/pt_PT/address/street_address.ts b/src/locales/pt_PT/address/street_address.ts
index 51642bdd055..5f7b6f4b0e6 100644
--- a/src/locales/pt_PT/address/street_address.ts
+++ b/src/locales/pt_PT/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{street_name} #{building_number}'];
+export default [
+  '{{address.streetName}} {{address.buildingNumber}}',
+  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/ro/address/street_address.ts b/src/locales/ro/address/street_address.ts
index 4a09fa36918..792d576d393 100644
--- a/src/locales/ro/address/street_address.ts
+++ b/src/locales/ro/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{street_name}, #{building_number}, #{secondary_address}'];
+export default [
+  '{{address.streetName}}, {{address.buildingNumber}}',
+  '{{address.streetName}}, {{address.buildingNumber}}, {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/ru/address/street_address.ts b/src/locales/ru/address/street_address.ts
index a6c7cff8a2d..d073bab0dda 100644
--- a/src/locales/ru/address/street_address.ts
+++ b/src/locales/ru/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{street_name}, #{building_number}'];
+export default [
+  '{{address.streetName}}, {{address.buildingNumber}}',
+  '{{address.streetName}}, {{address.buildingNumber}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/sk/address/street_address.ts b/src/locales/sk/address/street_address.ts
index 51642bdd055..5f7b6f4b0e6 100644
--- a/src/locales/sk/address/street_address.ts
+++ b/src/locales/sk/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{street_name} #{building_number}'];
+export default [
+  '{{address.streetName}} {{address.buildingNumber}}',
+  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/sv/address/street_address.ts b/src/locales/sv/address/street_address.ts
index 51642bdd055..5f7b6f4b0e6 100644
--- a/src/locales/sv/address/street_address.ts
+++ b/src/locales/sv/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{street_name} #{building_number}'];
+export default [
+  '{{address.streetName}} {{address.buildingNumber}}',
+  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/tr/address/street_address.ts b/src/locales/tr/address/street_address.ts
index 51642bdd055..5f7b6f4b0e6 100644
--- a/src/locales/tr/address/street_address.ts
+++ b/src/locales/tr/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{street_name} #{building_number}'];
+export default [
+  '{{address.streetName}} {{address.buildingNumber}}',
+  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/uk/address/street_address.ts b/src/locales/uk/address/street_address.ts
index a6c7cff8a2d..d073bab0dda 100644
--- a/src/locales/uk/address/street_address.ts
+++ b/src/locales/uk/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{street_name}, #{building_number}'];
+export default [
+  '{{address.streetName}}, {{address.buildingNumber}}',
+  '{{address.streetName}}, {{address.buildingNumber}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/ur/address/street_address.ts b/src/locales/ur/address/street_address.ts
index 0fcaf4695d6..b86cd821f64 100644
--- a/src/locales/ur/address/street_address.ts
+++ b/src/locales/ur/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{building_number} #{street_name}'];
+export default [
+  '{{address.buildingNumber}} {{address.streetName}}',
+  '{{address.buildingNumber}} {{address.streetName}} {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/zh_CN/address/street_address.ts b/src/locales/zh_CN/address/street_address.ts
index ad30a40d255..3373a23d3b1 100644
--- a/src/locales/zh_CN/address/street_address.ts
+++ b/src/locales/zh_CN/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{street_name}#{building_number}号'];
+export default [
+  '{{address.streetName}}{{address.buildingNumber}}号',
+  '{{address.streetName}}{{address.buildingNumber}}号 {{address.secondaryAddress}}',
+] as [string, string];
diff --git a/src/locales/zh_TW/address/street_address.ts b/src/locales/zh_TW/address/street_address.ts
index cb37c30c607..469e9af5c05 100644
--- a/src/locales/zh_TW/address/street_address.ts
+++ b/src/locales/zh_TW/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{street_name}#{building_number}號'];
+export default [
+  '{{address.streetName}}{{address.buildingNumber}}號',
+  '{{address.streetName}}{{address.buildingNumber}}號 {{address.secondaryAddress}}',
+] as [string, string];

From 82866afb80ad26ff8e001ab1570e676c8ecea764 Mon Sep 17 00:00:00 2001
From: ST-DDT <ST-DDT@gmx.de>
Date: Sun, 3 Apr 2022 00:43:19 +0200
Subject: [PATCH 3/4] chore: apply suggestions

---
 src/locales/fa/address/street_address.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/locales/fa/address/street_address.ts b/src/locales/fa/address/street_address.ts
index 2e5ed57169e..1a74fc28ab1 100644
--- a/src/locales/fa/address/street_address.ts
+++ b/src/locales/fa/address/street_address.ts
@@ -1,4 +1,4 @@
 export default [
   '{{address.streetName}}, پلاک {{address.buildingNumber}}',
-  '{{address.streetName}}, {{address.streetName}}, پلاک {{address.buildingNumber}}',
+  '{{address.streetName}}, پلاک {{address.buildingNumber}}  {{address.secondaryAddress}}',
 ] as [string, string];

From 799a8f11c911b7f8932a01599c91e7064a5dd927 Mon Sep 17 00:00:00 2001
From: ST-DDT <ST-DDT@gmx.de>
Date: Tue, 5 Apr 2022 19:23:20 +0200
Subject: [PATCH 4/4] refactor: use object to store street_address templates

---
 src/address.ts                              |  4 ++--
 src/definitions/address.ts                  | 13 ++++++++++---
 src/locales/ar/address/street_address.ts    |  8 ++++----
 src/locales/az/address/street_address.ts    |  8 ++++----
 src/locales/cz/address/street_address.ts    |  8 ++++----
 src/locales/de/address/street_address.ts    |  8 ++++----
 src/locales/de_AT/address/street_address.ts |  8 ++++----
 src/locales/en/address/street_address.ts    |  8 ++++----
 src/locales/en_GH/address/street_address.ts |  8 ++++----
 src/locales/es/address/street_address.ts    |  8 ++++----
 src/locales/es_MX/address/street_address.ts |  8 ++++----
 src/locales/fa/address/street_address.ts    |  8 ++++----
 src/locales/fr/address/street_address.ts    |  8 ++++----
 src/locales/fr_BE/address/street_address.ts |  8 ++++----
 src/locales/ge/address/street_address.ts    |  8 ++++----
 src/locales/he/address/street_address.ts    |  8 ++++----
 src/locales/hr/address/street_address.ts    |  8 ++++----
 src/locales/hy/address/street_address.ts    |  8 ++++----
 src/locales/id_ID/address/street_address.ts |  8 ++++----
 src/locales/it/address/street_address.ts    |  8 ++++----
 src/locales/lv/address/street_address.ts    |  8 ++++----
 src/locales/mk/address/street_address.ts    |  8 ++++----
 src/locales/nb_NO/address/street_address.ts |  8 ++++----
 src/locales/nl/address/street_address.ts    |  8 ++++----
 src/locales/nl_BE/address/street_address.ts |  8 ++++----
 src/locales/pl/address/street_address.ts    |  8 ++++----
 src/locales/pt_PT/address/street_address.ts |  8 ++++----
 src/locales/ro/address/street_address.ts    |  8 ++++----
 src/locales/ru/address/street_address.ts    |  8 ++++----
 src/locales/sk/address/street_address.ts    |  8 ++++----
 src/locales/sv/address/street_address.ts    |  8 ++++----
 src/locales/tr/address/street_address.ts    |  8 ++++----
 src/locales/uk/address/street_address.ts    |  8 ++++----
 src/locales/ur/address/street_address.ts    |  8 ++++----
 src/locales/zh_CN/address/street_address.ts |  8 ++++----
 src/locales/zh_TW/address/street_address.ts |  8 ++++----
 36 files changed, 148 insertions(+), 141 deletions(-)

diff --git a/src/address.ts b/src/address.ts
index 05f662706c1..5c862f5c59f 100644
--- a/src/address.ts
+++ b/src/address.ts
@@ -256,8 +256,8 @@ export class Address {
    * faker.address.streetAddress(false) // '34830 Erdman Hollow'
    */
   streetAddress(useFullAddress: boolean = false): string {
-    const format =
-      this.faker.definitions.address.street_address[useFullAddress ? 1 : 0];
+    const formats = this.faker.definitions.address.street_address;
+    const format = formats[useFullAddress ? 'full' : 'normal'];
 
     return this.faker.fake(format);
   }
diff --git a/src/definitions/address.ts b/src/definitions/address.ts
index f9698fe5d5d..c5d5409f926 100644
--- a/src/definitions/address.ts
+++ b/src/definitions/address.ts
@@ -70,10 +70,17 @@ export interface AddressDefinitions {
 
   /**
    * The pattern used to generate street addresses.
-   * The first element is only the street address,
-   * the second element is the full street address including the secondary address.
    */
-  street_address: [string, string];
+  street_address: {
+    /**
+     * The fake pattern to generate only the street address.
+     */
+    normal: string;
+    /**
+     * The fake pattern to generate the full street address including the secondary address.
+     */
+    full: string;
+  };
 
   /**
    * The address "inside" an address/e.g. an apartment or office.
diff --git a/src/locales/ar/address/street_address.ts b/src/locales/ar/address/street_address.ts
index b86cd821f64..d6c5878a730 100644
--- a/src/locales/ar/address/street_address.ts
+++ b/src/locales/ar/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.buildingNumber}} {{address.streetName}}',
-  '{{address.buildingNumber}} {{address.streetName}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.buildingNumber}} {{address.streetName}}',
+  full: '{{address.buildingNumber}} {{address.streetName}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/az/address/street_address.ts b/src/locales/az/address/street_address.ts
index d073bab0dda..73037a5c55f 100644
--- a/src/locales/az/address/street_address.ts
+++ b/src/locales/az/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}}, {{address.buildingNumber}}',
-  '{{address.streetName}}, {{address.buildingNumber}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}}, {{address.buildingNumber}}',
+  full: '{{address.streetName}}, {{address.buildingNumber}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/cz/address/street_address.ts b/src/locales/cz/address/street_address.ts
index 5f7b6f4b0e6..aaf5810e3a4 100644
--- a/src/locales/cz/address/street_address.ts
+++ b/src/locales/cz/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}} {{address.buildingNumber}}',
-  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}} {{address.buildingNumber}}',
+  full: '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/de/address/street_address.ts b/src/locales/de/address/street_address.ts
index 5f7b6f4b0e6..aaf5810e3a4 100644
--- a/src/locales/de/address/street_address.ts
+++ b/src/locales/de/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}} {{address.buildingNumber}}',
-  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}} {{address.buildingNumber}}',
+  full: '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/de_AT/address/street_address.ts b/src/locales/de_AT/address/street_address.ts
index 5f7b6f4b0e6..aaf5810e3a4 100644
--- a/src/locales/de_AT/address/street_address.ts
+++ b/src/locales/de_AT/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}} {{address.buildingNumber}}',
-  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}} {{address.buildingNumber}}',
+  full: '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/en/address/street_address.ts b/src/locales/en/address/street_address.ts
index b86cd821f64..d6c5878a730 100644
--- a/src/locales/en/address/street_address.ts
+++ b/src/locales/en/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.buildingNumber}} {{address.streetName}}',
-  '{{address.buildingNumber}} {{address.streetName}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.buildingNumber}} {{address.streetName}}',
+  full: '{{address.buildingNumber}} {{address.streetName}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/en_GH/address/street_address.ts b/src/locales/en_GH/address/street_address.ts
index b86cd821f64..d6c5878a730 100644
--- a/src/locales/en_GH/address/street_address.ts
+++ b/src/locales/en_GH/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.buildingNumber}} {{address.streetName}}',
-  '{{address.buildingNumber}} {{address.streetName}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.buildingNumber}} {{address.streetName}}',
+  full: '{{address.buildingNumber}} {{address.streetName}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/es/address/street_address.ts b/src/locales/es/address/street_address.ts
index 80e610bb406..36449d0b2e1 100644
--- a/src/locales/es/address/street_address.ts
+++ b/src/locales/es/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}}{{address.buildingNumber}}',
-  '{{address.streetName}}{{address.buildingNumber}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}}{{address.buildingNumber}}',
+  full: '{{address.streetName}}{{address.buildingNumber}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/es_MX/address/street_address.ts b/src/locales/es_MX/address/street_address.ts
index 80e610bb406..36449d0b2e1 100644
--- a/src/locales/es_MX/address/street_address.ts
+++ b/src/locales/es_MX/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}}{{address.buildingNumber}}',
-  '{{address.streetName}}{{address.buildingNumber}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}}{{address.buildingNumber}}',
+  full: '{{address.streetName}}{{address.buildingNumber}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/fa/address/street_address.ts b/src/locales/fa/address/street_address.ts
index 1a74fc28ab1..74133d4015a 100644
--- a/src/locales/fa/address/street_address.ts
+++ b/src/locales/fa/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}}, پلاک {{address.buildingNumber}}',
-  '{{address.streetName}}, پلاک {{address.buildingNumber}}  {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}}, پلاک {{address.buildingNumber}}',
+  full: '{{address.streetName}}, پلاک {{address.buildingNumber}}  {{address.secondaryAddress}}',
+};
diff --git a/src/locales/fr/address/street_address.ts b/src/locales/fr/address/street_address.ts
index b86cd821f64..d6c5878a730 100644
--- a/src/locales/fr/address/street_address.ts
+++ b/src/locales/fr/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.buildingNumber}} {{address.streetName}}',
-  '{{address.buildingNumber}} {{address.streetName}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.buildingNumber}} {{address.streetName}}',
+  full: '{{address.buildingNumber}} {{address.streetName}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/fr_BE/address/street_address.ts b/src/locales/fr_BE/address/street_address.ts
index 5f7b6f4b0e6..aaf5810e3a4 100644
--- a/src/locales/fr_BE/address/street_address.ts
+++ b/src/locales/fr_BE/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}} {{address.buildingNumber}}',
-  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}} {{address.buildingNumber}}',
+  full: '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/ge/address/street_address.ts b/src/locales/ge/address/street_address.ts
index 5f7b6f4b0e6..aaf5810e3a4 100644
--- a/src/locales/ge/address/street_address.ts
+++ b/src/locales/ge/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}} {{address.buildingNumber}}',
-  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}} {{address.buildingNumber}}',
+  full: '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/he/address/street_address.ts b/src/locales/he/address/street_address.ts
index b86cd821f64..d6c5878a730 100644
--- a/src/locales/he/address/street_address.ts
+++ b/src/locales/he/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.buildingNumber}} {{address.streetName}}',
-  '{{address.buildingNumber}} {{address.streetName}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.buildingNumber}} {{address.streetName}}',
+  full: '{{address.buildingNumber}} {{address.streetName}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/hr/address/street_address.ts b/src/locales/hr/address/street_address.ts
index 5f7b6f4b0e6..aaf5810e3a4 100644
--- a/src/locales/hr/address/street_address.ts
+++ b/src/locales/hr/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}} {{address.buildingNumber}}',
-  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}} {{address.buildingNumber}}',
+  full: '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/hy/address/street_address.ts b/src/locales/hy/address/street_address.ts
index 5f7b6f4b0e6..aaf5810e3a4 100644
--- a/src/locales/hy/address/street_address.ts
+++ b/src/locales/hy/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}} {{address.buildingNumber}}',
-  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}} {{address.buildingNumber}}',
+  full: '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/id_ID/address/street_address.ts b/src/locales/id_ID/address/street_address.ts
index 33850c4c914..1a4028a2498 100644
--- a/src/locales/id_ID/address/street_address.ts
+++ b/src/locales/id_ID/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}} no {{address.buildingNumber}}',
-  '{{address.streetName}} no {{address.buildingNumber}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}} no {{address.buildingNumber}}',
+  full: '{{address.streetName}} no {{address.buildingNumber}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/it/address/street_address.ts b/src/locales/it/address/street_address.ts
index 23f473a2ae2..fc1a70df4b5 100644
--- a/src/locales/it/address/street_address.ts
+++ b/src/locales/it/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}} {{address.buildingNumber}}',
-  '{{address.streetName}} {{address.buildingNumber}}, {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}} {{address.buildingNumber}}',
+  full: '{{address.streetName}} {{address.buildingNumber}}, {{address.secondaryAddress}}',
+};
diff --git a/src/locales/lv/address/street_address.ts b/src/locales/lv/address/street_address.ts
index 5f7b6f4b0e6..aaf5810e3a4 100644
--- a/src/locales/lv/address/street_address.ts
+++ b/src/locales/lv/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}} {{address.buildingNumber}}',
-  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}} {{address.buildingNumber}}',
+  full: '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/mk/address/street_address.ts b/src/locales/mk/address/street_address.ts
index 5f7b6f4b0e6..aaf5810e3a4 100644
--- a/src/locales/mk/address/street_address.ts
+++ b/src/locales/mk/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}} {{address.buildingNumber}}',
-  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}} {{address.buildingNumber}}',
+  full: '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/nb_NO/address/street_address.ts b/src/locales/nb_NO/address/street_address.ts
index 5f7b6f4b0e6..aaf5810e3a4 100644
--- a/src/locales/nb_NO/address/street_address.ts
+++ b/src/locales/nb_NO/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}} {{address.buildingNumber}}',
-  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}} {{address.buildingNumber}}',
+  full: '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/nl/address/street_address.ts b/src/locales/nl/address/street_address.ts
index 5f7b6f4b0e6..aaf5810e3a4 100644
--- a/src/locales/nl/address/street_address.ts
+++ b/src/locales/nl/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}} {{address.buildingNumber}}',
-  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}} {{address.buildingNumber}}',
+  full: '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/nl_BE/address/street_address.ts b/src/locales/nl_BE/address/street_address.ts
index 5f7b6f4b0e6..aaf5810e3a4 100644
--- a/src/locales/nl_BE/address/street_address.ts
+++ b/src/locales/nl_BE/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}} {{address.buildingNumber}}',
-  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}} {{address.buildingNumber}}',
+  full: '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/pl/address/street_address.ts b/src/locales/pl/address/street_address.ts
index 5f7b6f4b0e6..aaf5810e3a4 100644
--- a/src/locales/pl/address/street_address.ts
+++ b/src/locales/pl/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}} {{address.buildingNumber}}',
-  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}} {{address.buildingNumber}}',
+  full: '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/pt_PT/address/street_address.ts b/src/locales/pt_PT/address/street_address.ts
index 5f7b6f4b0e6..aaf5810e3a4 100644
--- a/src/locales/pt_PT/address/street_address.ts
+++ b/src/locales/pt_PT/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}} {{address.buildingNumber}}',
-  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}} {{address.buildingNumber}}',
+  full: '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/ro/address/street_address.ts b/src/locales/ro/address/street_address.ts
index 792d576d393..b8624265269 100644
--- a/src/locales/ro/address/street_address.ts
+++ b/src/locales/ro/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}}, {{address.buildingNumber}}',
-  '{{address.streetName}}, {{address.buildingNumber}}, {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}}, {{address.buildingNumber}}',
+  full: '{{address.streetName}}, {{address.buildingNumber}}, {{address.secondaryAddress}}',
+};
diff --git a/src/locales/ru/address/street_address.ts b/src/locales/ru/address/street_address.ts
index d073bab0dda..73037a5c55f 100644
--- a/src/locales/ru/address/street_address.ts
+++ b/src/locales/ru/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}}, {{address.buildingNumber}}',
-  '{{address.streetName}}, {{address.buildingNumber}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}}, {{address.buildingNumber}}',
+  full: '{{address.streetName}}, {{address.buildingNumber}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/sk/address/street_address.ts b/src/locales/sk/address/street_address.ts
index 5f7b6f4b0e6..aaf5810e3a4 100644
--- a/src/locales/sk/address/street_address.ts
+++ b/src/locales/sk/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}} {{address.buildingNumber}}',
-  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}} {{address.buildingNumber}}',
+  full: '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/sv/address/street_address.ts b/src/locales/sv/address/street_address.ts
index 5f7b6f4b0e6..aaf5810e3a4 100644
--- a/src/locales/sv/address/street_address.ts
+++ b/src/locales/sv/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}} {{address.buildingNumber}}',
-  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}} {{address.buildingNumber}}',
+  full: '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/tr/address/street_address.ts b/src/locales/tr/address/street_address.ts
index 5f7b6f4b0e6..aaf5810e3a4 100644
--- a/src/locales/tr/address/street_address.ts
+++ b/src/locales/tr/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}} {{address.buildingNumber}}',
-  '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}} {{address.buildingNumber}}',
+  full: '{{address.streetName}} {{address.buildingNumber}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/uk/address/street_address.ts b/src/locales/uk/address/street_address.ts
index d073bab0dda..73037a5c55f 100644
--- a/src/locales/uk/address/street_address.ts
+++ b/src/locales/uk/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}}, {{address.buildingNumber}}',
-  '{{address.streetName}}, {{address.buildingNumber}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}}, {{address.buildingNumber}}',
+  full: '{{address.streetName}}, {{address.buildingNumber}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/ur/address/street_address.ts b/src/locales/ur/address/street_address.ts
index b86cd821f64..d6c5878a730 100644
--- a/src/locales/ur/address/street_address.ts
+++ b/src/locales/ur/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.buildingNumber}} {{address.streetName}}',
-  '{{address.buildingNumber}} {{address.streetName}} {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.buildingNumber}} {{address.streetName}}',
+  full: '{{address.buildingNumber}} {{address.streetName}} {{address.secondaryAddress}}',
+};
diff --git a/src/locales/zh_CN/address/street_address.ts b/src/locales/zh_CN/address/street_address.ts
index 3373a23d3b1..4b7603430c1 100644
--- a/src/locales/zh_CN/address/street_address.ts
+++ b/src/locales/zh_CN/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}}{{address.buildingNumber}}号',
-  '{{address.streetName}}{{address.buildingNumber}}号 {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}}{{address.buildingNumber}}号',
+  full: '{{address.streetName}}{{address.buildingNumber}}号 {{address.secondaryAddress}}',
+};
diff --git a/src/locales/zh_TW/address/street_address.ts b/src/locales/zh_TW/address/street_address.ts
index 469e9af5c05..21e9547332c 100644
--- a/src/locales/zh_TW/address/street_address.ts
+++ b/src/locales/zh_TW/address/street_address.ts
@@ -1,4 +1,4 @@
-export default [
-  '{{address.streetName}}{{address.buildingNumber}}號',
-  '{{address.streetName}}{{address.buildingNumber}}號 {{address.secondaryAddress}}',
-] as [string, string];
+export default {
+  normal: '{{address.streetName}}{{address.buildingNumber}}號',
+  full: '{{address.streetName}}{{address.buildingNumber}}號 {{address.secondaryAddress}}',
+};