From e490ed3e505124585857421cac73d6f8418280aa Mon Sep 17 00:00:00 2001 From: "Mona,Lisa" Date: Tue, 2 May 2023 19:34:03 +0700 Subject: [PATCH 1/3] fix(location): avoid hyphenated surnames in city patterns --- src/locales/af_ZA/location/city_pattern.ts | 2 +- src/locales/en_AU/location/city_pattern.ts | 2 +- src/locales/en_CA/location/city_pattern.ts | 2 +- src/locales/en_GB/location/city_pattern.ts | 8 ++++---- src/locales/en_IE/location/city_pattern.ts | 2 +- src/locales/en_US/location/city_pattern.ts | 2 +- src/locales/fr_CA/location/city_pattern.ts | 2 +- src/locales/ne/location/city_pattern.ts | 2 +- src/locales/pt_BR/location/city_pattern.ts | 2 +- src/locales/ro/location/city_pattern.ts | 2 +- src/locales/tr/location/city_pattern.ts | 2 +- src/locales/zu_ZA/location/city_pattern.ts | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/locales/af_ZA/location/city_pattern.ts b/src/locales/af_ZA/location/city_pattern.ts index 7375aa8378a..ef9b5e4c0dd 100644 --- a/src/locales/af_ZA/location/city_pattern.ts +++ b/src/locales/af_ZA/location/city_pattern.ts @@ -2,5 +2,5 @@ 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}}', + '{{person.last_name}}{{location.city_suffix}}', ]; diff --git a/src/locales/en_AU/location/city_pattern.ts b/src/locales/en_AU/location/city_pattern.ts index 7375aa8378a..ef9b5e4c0dd 100644 --- a/src/locales/en_AU/location/city_pattern.ts +++ b/src/locales/en_AU/location/city_pattern.ts @@ -2,5 +2,5 @@ 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}}', + '{{person.last_name}}{{location.city_suffix}}', ]; diff --git a/src/locales/en_CA/location/city_pattern.ts b/src/locales/en_CA/location/city_pattern.ts index 0d422527891..64af48542db 100644 --- a/src/locales/en_CA/location/city_pattern.ts +++ b/src/locales/en_CA/location/city_pattern.ts @@ -2,6 +2,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}}', + '{{person.last_name}}{{location.city_suffix}}', '{{location.city_name}}', ]; diff --git a/src/locales/en_GB/location/city_pattern.ts b/src/locales/en_GB/location/city_pattern.ts index ed5e7f31aed..44e87e85d45 100644 --- a/src/locales/en_GB/location/city_pattern.ts +++ b/src/locales/en_GB/location/city_pattern.ts @@ -1,6 +1,6 @@ export default [ - '{{location.city_prefix}} {{person.lastName}}{{location.city_suffix}}', - '{{location.city_prefix}} {{person.lastName}}', - '{{person.lastName}}{{location.city_suffix}}', - '{{person.lastName}}{{location.city_infix}}{{person.lastName}}', + '{{location.city_prefix}} {{person.last_name}}{{location.city_suffix}}', + '{{location.city_prefix}} {{person.last_name}}', + '{{person.last_name}}{{location.city_suffix}}', + '{{person.last_name}}{{location.city_infix}}{{person.last_name}}', ]; diff --git a/src/locales/en_IE/location/city_pattern.ts b/src/locales/en_IE/location/city_pattern.ts index 7375aa8378a..ef9b5e4c0dd 100644 --- a/src/locales/en_IE/location/city_pattern.ts +++ b/src/locales/en_IE/location/city_pattern.ts @@ -2,5 +2,5 @@ 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}}', + '{{person.last_name}}{{location.city_suffix}}', ]; diff --git a/src/locales/en_US/location/city_pattern.ts b/src/locales/en_US/location/city_pattern.ts index 7375aa8378a..ef9b5e4c0dd 100644 --- a/src/locales/en_US/location/city_pattern.ts +++ b/src/locales/en_US/location/city_pattern.ts @@ -2,5 +2,5 @@ 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}}', + '{{person.last_name}}{{location.city_suffix}}', ]; diff --git a/src/locales/fr_CA/location/city_pattern.ts b/src/locales/fr_CA/location/city_pattern.ts index 7375aa8378a..ef9b5e4c0dd 100644 --- a/src/locales/fr_CA/location/city_pattern.ts +++ b/src/locales/fr_CA/location/city_pattern.ts @@ -2,5 +2,5 @@ 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}}', + '{{person.last_name}}{{location.city_suffix}}', ]; diff --git a/src/locales/ne/location/city_pattern.ts b/src/locales/ne/location/city_pattern.ts index 0d422527891..64af48542db 100644 --- a/src/locales/ne/location/city_pattern.ts +++ b/src/locales/ne/location/city_pattern.ts @@ -2,6 +2,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}}', + '{{person.last_name}}{{location.city_suffix}}', '{{location.city_name}}', ]; diff --git a/src/locales/pt_BR/location/city_pattern.ts b/src/locales/pt_BR/location/city_pattern.ts index 40c397bf553..91f74556747 100644 --- a/src/locales/pt_BR/location/city_pattern.ts +++ b/src/locales/pt_BR/location/city_pattern.ts @@ -1,4 +1,4 @@ export default [ '{{person.firstName}}{{location.city_suffix}}', - '{{person.lastName}}{{location.city_suffix}}', + '{{person.last_name}}{{location.city_suffix}}', ]; diff --git a/src/locales/ro/location/city_pattern.ts b/src/locales/ro/location/city_pattern.ts index 0d422527891..64af48542db 100644 --- a/src/locales/ro/location/city_pattern.ts +++ b/src/locales/ro/location/city_pattern.ts @@ -2,6 +2,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}}', + '{{person.last_name}}{{location.city_suffix}}', '{{location.city_name}}', ]; diff --git a/src/locales/tr/location/city_pattern.ts b/src/locales/tr/location/city_pattern.ts index 0d422527891..64af48542db 100644 --- a/src/locales/tr/location/city_pattern.ts +++ b/src/locales/tr/location/city_pattern.ts @@ -2,6 +2,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}}', + '{{person.last_name}}{{location.city_suffix}}', '{{location.city_name}}', ]; diff --git a/src/locales/zu_ZA/location/city_pattern.ts b/src/locales/zu_ZA/location/city_pattern.ts index 7375aa8378a..ef9b5e4c0dd 100644 --- a/src/locales/zu_ZA/location/city_pattern.ts +++ b/src/locales/zu_ZA/location/city_pattern.ts @@ -2,5 +2,5 @@ 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}}', + '{{person.last_name}}{{location.city_suffix}}', ]; From cba2e450c2ee4aba6edbba04a966164144631cc0 Mon Sep 17 00:00:00 2001 From: "Mona,Lisa" Date: Thu, 4 May 2023 12:10:59 +0700 Subject: [PATCH 2/3] relint --- src/locales/ne/location/city_pattern.ts | 2 +- src/locales/ro/location/city_pattern.ts | 2 +- src/locales/tr/location/city_pattern.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/locales/ne/location/city_pattern.ts b/src/locales/ne/location/city_pattern.ts index e02fa965e28..ad43b68fc5c 100644 --- a/src/locales/ne/location/city_pattern.ts +++ b/src/locales/ne/location/city_pattern.ts @@ -1 +1 @@ -export default ['{{location.city_name}}']; \ No newline at end of file +export default ['{{location.city_name}}']; diff --git a/src/locales/ro/location/city_pattern.ts b/src/locales/ro/location/city_pattern.ts index e02fa965e28..ad43b68fc5c 100644 --- a/src/locales/ro/location/city_pattern.ts +++ b/src/locales/ro/location/city_pattern.ts @@ -1 +1 @@ -export default ['{{location.city_name}}']; \ No newline at end of file +export default ['{{location.city_name}}']; diff --git a/src/locales/tr/location/city_pattern.ts b/src/locales/tr/location/city_pattern.ts index e02fa965e28..ad43b68fc5c 100644 --- a/src/locales/tr/location/city_pattern.ts +++ b/src/locales/tr/location/city_pattern.ts @@ -1 +1 @@ -export default ['{{location.city_name}}']; \ No newline at end of file +export default ['{{location.city_name}}']; From c928c99fcb2503a50d11f081e7c775a5ba47c999 Mon Sep 17 00:00:00 2001 From: Matt Mayer Date: Sat, 17 Jun 2023 20:28:31 +0700 Subject: [PATCH 3/3] relint --- src/locales/af_ZA/location/city_pattern.ts | 2 +- src/locales/zu_ZA/location/city_pattern.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locales/af_ZA/location/city_pattern.ts b/src/locales/af_ZA/location/city_pattern.ts index e02fa965e28..ad43b68fc5c 100644 --- a/src/locales/af_ZA/location/city_pattern.ts +++ b/src/locales/af_ZA/location/city_pattern.ts @@ -1 +1 @@ -export default ['{{location.city_name}}']; \ No newline at end of file +export default ['{{location.city_name}}']; diff --git a/src/locales/zu_ZA/location/city_pattern.ts b/src/locales/zu_ZA/location/city_pattern.ts index e02fa965e28..ad43b68fc5c 100644 --- a/src/locales/zu_ZA/location/city_pattern.ts +++ b/src/locales/zu_ZA/location/city_pattern.ts @@ -1 +1 @@ -export default ['{{location.city_name}}']; \ No newline at end of file +export default ['{{location.city_name}}'];