From 307c2d20c6cafef55a10fb424e5683c0d018cc55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leyla=20J=C3=A4hnig?=
 <77127505+xDivisionByZerox@users.noreply.github.com>
Date: Tue, 5 Apr 2022 18:16:41 +0200
Subject: [PATCH 1/8] refactor(helpers.shuffle): remove unused default value
 (#698)

---
 src/helpers.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/helpers.ts b/src/helpers.ts
index f302ac46c12..e451eaab130 100644
--- a/src/helpers.ts
+++ b/src/helpers.ts
@@ -417,11 +417,9 @@ export class Helpers {
       return o || [];
     }
 
-    // TODO ST-DDT 2022-02-06: This default will never be taken!?
-    o = o || (['a', 'b', 'c'] as unknown as T[]);
-    for (let x: T, j: number, i = o.length - 1; i > 0; --i) {
-      j = this.faker.datatype.number(i);
-      x = o[i];
+    for (let i = o.length - 1; i > 0; --i) {
+      const j = this.faker.datatype.number(i);
+      const x = o[i];
       o[i] = o[j];
       o[j] = x;
     }

From ccb58a177f2c311130b85b7a7c2efe0e0402d886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leyla=20J=C3=A4hnig?=
 <77127505+xDivisionByZerox@users.noreply.github.com>
Date: Tue, 5 Apr 2022 18:54:19 +0200
Subject: [PATCH 2/8] refactor(address.countryCode): signature (#588)

---
 src/address.ts | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/src/address.ts b/src/address.ts
index 246f4d9b455..f7ceeddc297 100644
--- a/src/address.ts
+++ b/src/address.ts
@@ -340,25 +340,12 @@ export class Address {
    * faker.address.countryCode() // 'SJ'
    * faker.address.countryCode('alpha-2') // 'GA'
    * faker.address.countryCode('alpha-3') // 'TJK'
-   * faker.address.countryCode('unsupported') // 'DJ'
    */
-  // TODO ST-DDT 2022-02-10: Limit the parameter to the two values.
-  countryCode(alphaCode: string = 'alpha-2'): string {
-    if (alphaCode === 'alpha-2') {
-      return this.faker.random.arrayElement(
-        this.faker.definitions.address.country_code
-      );
-    }
+  countryCode(alphaCode: 'alpha-2' | 'alpha-3' = 'alpha-2'): string {
+    const key: keyof typeof this.faker.definitions.address =
+      alphaCode === 'alpha-3' ? 'country_code_alpha_3' : 'country_code';
 
-    if (alphaCode === 'alpha-3') {
-      return this.faker.random.arrayElement(
-        this.faker.definitions.address.country_code_alpha_3
-      );
-    }
-
-    return this.faker.random.arrayElement(
-      this.faker.definitions.address.country_code
-    );
+    return this.faker.random.arrayElement(this.faker.definitions.address[key]);
   }
 
   /**

From 2c93fa3d7f280e8acf2e7193620bcff1f4cacd31 Mon Sep 17 00:00:00 2001
From: doughlass <38209263+doughlass@users.noreply.github.com>
Date: Tue, 5 Apr 2022 22:02:55 +0100
Subject: [PATCH 3/8] chore: additional domain suffixes added for GB locale
 (#253)

---
 src/locales/en_GB/internet/domain_suffix.ts | 22 ++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/locales/en_GB/internet/domain_suffix.ts b/src/locales/en_GB/internet/domain_suffix.ts
index 4ef54a67512..d6de8904c55 100644
--- a/src/locales/en_GB/internet/domain_suffix.ts
+++ b/src/locales/en_GB/internet/domain_suffix.ts
@@ -1 +1,21 @@
-export default ['co.uk', 'com', 'biz', 'info', 'name'];
+export default [
+  'ac.uk',
+  'biz',
+  'co',
+  'co.uk',
+  'com',
+  'cymru',
+  'gov.uk',
+  'info',
+  'london',
+  'ltd.uk',
+  'me.uk',
+  'name',
+  'nhs.uk',
+  'org.uk',
+  'plc.uk',
+  'sch.uk',
+  'scot',
+  'uk',
+  'wales',
+];

From 28f49466eb9d76a6a96ed34a8d463ecb030bdf79 Mon Sep 17 00:00:00 2001
From: ST-DDT <ST-DDT@gmx.de>
Date: Tue, 5 Apr 2022 23:14:26 +0200
Subject: [PATCH 4/8] chore: simplify lorem.sentences() (#784)

---
 src/lorem.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/lorem.ts b/src/lorem.ts
index 39ce9d3f73f..9a4f9e04ae8 100644
--- a/src/lorem.ts
+++ b/src/lorem.ts
@@ -101,13 +101,10 @@ export class Lorem {
    * // 'Et rerum a unde tempora magnam sit nisi.
    * // Et perspiciatis ipsam omnis.'
    */
-  sentences(sentenceCount?: number, separator?: string): string {
+  sentences(sentenceCount?: number, separator: string = ' '): string {
     if (sentenceCount == null) {
       sentenceCount = this.faker.datatype.number({ min: 2, max: 6 });
     }
-    if (separator == null) {
-      separator = ' ';
-    }
     const sentences: string[] = [];
     for (sentenceCount; sentenceCount > 0; sentenceCount--) {
       sentences.push(this.faker.lorem.sentence());

From 6a2d8fce89e0b46f7b9693a7b1f697c108e8af04 Mon Sep 17 00:00:00 2001
From: ST-DDT <ST-DDT@gmx.de>
Date: Tue, 5 Apr 2022 23:25:45 +0200
Subject: [PATCH 5/8] fix: use `\n` as default separator for lorem.paragraphs()
 (#783)

---
 src/lorem.ts       | 5 ++---
 test/lorem.spec.ts | 8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/lorem.ts b/src/lorem.ts
index 9a4f9e04ae8..a605aa2f743 100644
--- a/src/lorem.ts
+++ b/src/lorem.ts
@@ -131,7 +131,7 @@ export class Lorem {
    * Generates the given number of paragraphs.
    *
    * @param paragraphCount The number of paragraphs to generate. Defaults to `3`.
-   * @param separator The separator to use. Defaults to `'\n \r'`.
+   * @param separator The separator to use. Defaults to `'\n'`.
    *
    * @example
    * faker.lorem.paragraphs()
@@ -150,8 +150,7 @@ export class Lorem {
    * // 'Eos magnam aut qui accusamus. Sapiente quas culpa totam excepturi. Blanditiis totam distinctio occaecati dignissimos cumque atque qui officiis.<br/>
    * // Nihil quis vel consequatur. Blanditiis commodi deserunt sunt animi dolorum. A optio porro hic dolorum fugit aut et sint voluptas. Minima ad sed ipsa est non dolores.'
    */
-  // TODO ST-DDT 2022-02-09: The separator looks odd.
-  paragraphs(paragraphCount: number = 3, separator: string = '\n \r'): string {
+  paragraphs(paragraphCount: number = 3, separator: string = '\n'): string {
     const paragraphs: string[] = [];
     for (paragraphCount; paragraphCount > 0; paragraphCount--) {
       paragraphs.push(this.faker.lorem.paragraph());
diff --git a/test/lorem.spec.ts b/test/lorem.spec.ts
index 2ceb670f3b6..1f2dbc5b22f 100644
--- a/test/lorem.spec.ts
+++ b/test/lorem.spec.ts
@@ -19,7 +19,7 @@ const seededRuns = [
         'Hic sit minus dolor animi mollitia sequi ducimus sequi. Inventore praesentium et. Animi qui impedit et voluptatem. Ut quisquam fugiat.',
         'Alias sit asperiores sit. Corporis laborum cupiditate consequatur et voluptatem nostrum. Laborum in eos quae nostrum aut consequatur. Blanditiis sunt repellendus et. Eum sint voluptatibus deserunt. Quae eos est soluta ipsum qui.',
         'Hic earum delectus. Consequatur eum corporis perferendis aspernatur incidunt nobis. Odio nobis quia est.',
-      ].join('\n \r'),
+      ].join('\n'),
       text: 'Hic sit minus dolor animi mollitia sequi ducimus sequi.',
       lines: [
         'Hic sit minus dolor animi mollitia sequi ducimus sequi.',
@@ -42,7 +42,7 @@ const seededRuns = [
         'Nesciunt non minima perspiciatis praesentium aperiam voluptatem. Occaecati deserunt voluptatem suscipit. Enim minus nemo fugit et iure explicabo et commodi consequuntur. Voluptatibus nesciunt dignissimos eos temporibus temporibus autem consequatur.',
         'Esse vel qui occaecati omnis quis. Voluptatum quis et libero. Et odio dolor qui velit qui. Eveniet provident non fugiat.',
         'A a aut nihil. Quas eligendi excepturi eligendi perferendis quo minus et asperiores. Neque blanditiis consequuntur esse autem harum eligendi aut. Cum consequatur pariatur. Omnis temporibus sapiente.',
-      ].join('\n \r'),
+      ].join('\n'),
       text: 'natus nesciunt non',
       lines: [
         'Nesciunt non minima perspiciatis praesentium aperiam voluptatem.',
@@ -66,7 +66,7 @@ const seededRuns = [
         'Saepe omnis tempora magni repellat eaque. Nesciunt nobis non voluptas quam ex neque eligendi. Vel perferendis assumenda nam expedita est eum molestiae. Ullam et maiores vero doloribus eius. Officia et velit voluptatem quis dolorum. Dignissimos voluptas aut qui corporis itaque sit provident quam aut.',
         'In ullam quia impedit. Occaecati repudiandae ut maiores pariatur enim. Deserunt voluptatem in enim in quia.',
         'Ut eligendi tempora eos ipsa cumque nulla. Quidem et sed voluptate et quia. Nulla esse in similique deleniti beatae eaque.',
-      ].join('\n \r'),
+      ].join('\n'),
       text: [
         'Omnis tempora magni repellat eaque tempore nesciunt nobis non voluptas.',
         'Ex neque eligendi placeat vel perferendis.',
@@ -320,7 +320,7 @@ describe('lorem', () => {
           expect(actual).toBeTypeOf('string');
           expect(actual[actual.length - 1]).toBe('.');
 
-          const paragraphs = actual.split('\n \r');
+          const paragraphs = actual.split('\n');
 
           expect(paragraphs).toHaveLength(paragraphCount);
         });

From b04dc914eec44ec3c5ae760976b616ce1d2584e1 Mon Sep 17 00:00:00 2001
From: ST-DDT <ST-DDT@gmx.de>
Date: Tue, 5 Apr 2022 23:35:01 +0200
Subject: [PATCH 6/8] feat: use street address templates from locales (#754)

---
 src/address.ts                              | 45 +++++++++------------
 src/definitions/address.ts                  | 22 ++++++++++
 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    |  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    |  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    |  8 ++--
 src/locales/lv/address/street_address.ts    |  8 ++--
 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, 178 insertions(+), 74 deletions(-)

diff --git a/src/address.ts b/src/address.ts
index f7ceeddc297..5c862f5c59f 100644
--- a/src/address.ts
+++ b/src/address.ts
@@ -206,6 +206,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.
    *
@@ -242,30 +256,10 @@ 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;
-    }
-    return useFullAddress
-      ? address + ' ' + this.faker.address.secondaryAddress()
-      : address;
+    const formats = this.faker.definitions.address.street_address;
+    const format = formats[useFullAddress ? 'full' : 'normal'];
+
+    return this.faker.fake(format);
   }
 
   /**
@@ -293,7 +287,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 24f9b7cc81d..c5d5409f926 100644
--- a/src/definitions/address.ts
+++ b/src/definitions/address.ts
@@ -54,6 +54,11 @@ export interface AddressDefinitions {
    */
   direction_abbr: string[];
 
+  /**
+   * The pattern used to generate building numbers.
+   */
+  building_number: string[];
+
   /**
    * Common street prefixes
    */
@@ -63,6 +68,20 @@ export interface AddressDefinitions {
    */
   street_suffix: string[];
 
+  /**
+   * The pattern used to generate street addresses.
+   */
+  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.
    */
@@ -100,9 +119,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/ar/address/street_address.ts b/src/locales/ar/address/street_address.ts
index 0fcaf4695d6..d6c5878a730 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 {
+  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 a6c7cff8a2d..73037a5c55f 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 {
+  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 51642bdd055..aaf5810e3a4 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 {
+  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 51642bdd055..aaf5810e3a4 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 {
+  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 51642bdd055..aaf5810e3a4 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 {
+  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 0fcaf4695d6..d6c5878a730 100644
--- a/src/locales/en/address/street_address.ts
+++ b/src/locales/en/address/street_address.ts
@@ -1 +1,4 @@
-export default ['#{building_number} #{street_name}'];
+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 0fcaf4695d6..d6c5878a730 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 {
+  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 b313d432161..36449d0b2e1 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}',
-];
+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 b313d432161..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 [
-  '#{street_name}#{building_number}',
-  '#{street_name}#{building_number} #{secondary_address}',
-];
+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 22ab96e3e01..74133d4015a 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}',
-];
+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 0fcaf4695d6..d6c5878a730 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 {
+  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 51642bdd055..aaf5810e3a4 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 {
+  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 51642bdd055..aaf5810e3a4 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 {
+  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 0fcaf4695d6..d6c5878a730 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 {
+  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 51642bdd055..aaf5810e3a4 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 {
+  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 41ed0474025..aaf5810e3a4 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 {
+  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 33d2e0ce565..1a4028a2498 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 {
+  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 98c792d0608..fc1a70df4b5 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}',
-];
+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 5987b430a30..aaf5810e3a4 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}',
-];
+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 51642bdd055..aaf5810e3a4 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 {
+  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 51642bdd055..aaf5810e3a4 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 {
+  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 51642bdd055..aaf5810e3a4 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 {
+  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 51642bdd055..aaf5810e3a4 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 {
+  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 51642bdd055..aaf5810e3a4 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 {
+  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 51642bdd055..aaf5810e3a4 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 {
+  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 4a09fa36918..b8624265269 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 {
+  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 a6c7cff8a2d..73037a5c55f 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 {
+  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 51642bdd055..aaf5810e3a4 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 {
+  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 51642bdd055..aaf5810e3a4 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 {
+  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 51642bdd055..aaf5810e3a4 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 {
+  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 a6c7cff8a2d..73037a5c55f 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 {
+  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 0fcaf4695d6..d6c5878a730 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 {
+  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 ad30a40d255..4b7603430c1 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 {
+  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 cb37c30c607..21e9547332c 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 {
+  normal: '{{address.streetName}}{{address.buildingNumber}}號',
+  full: '{{address.streetName}}{{address.buildingNumber}}號 {{address.secondaryAddress}}',
+};

From c6d0cc7ae4f8ea220803bcee5a5e84a7b8230951 Mon Sep 17 00:00:00 2001
From: Krychaxp <55843050+krychaxp@users.noreply.github.com>
Date: Tue, 5 Apr 2022 23:56:13 +0200
Subject: [PATCH 7/8] feat: add os. as street prefix for pl (#640)

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

diff --git a/src/locales/pl/address/street_prefix.ts b/src/locales/pl/address/street_prefix.ts
index 45b9ba5740f..04bf4b2b72a 100644
--- a/src/locales/pl/address/street_prefix.ts
+++ b/src/locales/pl/address/street_prefix.ts
@@ -1 +1 @@
-export default ['ul.', 'al.'];
+export default ['ul.', 'al.', 'os.'];

From 46b2bd4837643b7a97b801d88134dc6b4ceeda21 Mon Sep 17 00:00:00 2001
From: ST-DDT <ST-DDT@gmx.de>
Date: Wed, 6 Apr 2022 00:29:25 +0200
Subject: [PATCH 8/8] chore: fix finance.iban warnings (#781)

---
 src/iban.ts | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/iban.ts b/src/iban.ts
index b608357ee93..2e67f2813a6 100644
--- a/src/iban.ts
+++ b/src/iban.ts
@@ -30,21 +30,13 @@ export = {
   pattern10: ['01', '02', '03', '04', '05', '06', '07', '08', '09'],
   pattern100: ['001', '002', '003', '004', '005', '006', '007', '008', '009'],
   toDigitString: (str: string): string =>
-    str.replace(
-      /[A-Z]/gi,
-      (match) =>
-        // TODO @Shinigami92 2022-01-13: This needs to be converted to string
-        // @ts-expect-error
-        match.toUpperCase().charCodeAt(0) - 55
+    str.replace(/[A-Z]/gi, (match) =>
+      String(match.toUpperCase().charCodeAt(0) - 55)
     ),
   mod97: (digitStr: string): number => {
     let m = 0;
     for (let i = 0; i < digitStr.length; i++) {
-      m =
-        (m * 10 +
-          // @ts-expect-error: We need to convert this properly
-          (digitStr[i] | 0)) %
-        97;
+      m = (m * 10 + +digitStr[i]) % 97;
     }
     return m;
   },