From 3395210d8251005a6e1030c9bfef2c50dbeb21a4 Mon Sep 17 00:00:00 2001
From: "Mona,Lisa" <matt@matthewmayer.co.uk>
Date: Fri, 28 Apr 2023 21:56:03 +0700
Subject: [PATCH 1/2] fix(locale): county should be city_name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The `el` city_pattern file isn’t very useful, as it refers to city_prefix and city_suffix which don’t exist in `el`

- {{location.city_prefix}} {{person.firstName}} {{location.city_suffix}} e.g. Lake Χρήστοςton
- {{location.city_prefix}} {{person.firstName}} e.g. West Βασίλης
- {{person.firstName}}{{location.city_suffix}} e.g. Μαριαburgh
- {{person.lastName}}{{location.city_suffix}} e.g. Κανακάρης-Ρούφοςboro

In fact, the country.ts file actually includes city names, not 1st level administrative entities. So rename that to city_name and use `'{{location.city_name}}'` for cities.
---
 src/locales/el/location/{county.ts => city_name.ts} | 0
 src/locales/el/location/city_pattern.ts             | 7 +------
 src/locales/el/location/index.ts                    | 4 ++--
 3 files changed, 3 insertions(+), 8 deletions(-)
 rename src/locales/el/location/{county.ts => city_name.ts} (100%)

diff --git a/src/locales/el/location/county.ts b/src/locales/el/location/city_name.ts
similarity index 100%
rename from src/locales/el/location/county.ts
rename to src/locales/el/location/city_name.ts
diff --git a/src/locales/el/location/city_pattern.ts b/src/locales/el/location/city_pattern.ts
index 7375aa8378a..ad43b68fc5c 100644
--- a/src/locales/el/location/city_pattern.ts
+++ b/src/locales/el/location/city_pattern.ts
@@ -1,6 +1 @@
-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}}',
-];
+export default ['{{location.city_name}}'];
diff --git a/src/locales/el/location/index.ts b/src/locales/el/location/index.ts
index 0817e8ba6a8..bcae147c4ac 100644
--- a/src/locales/el/location/index.ts
+++ b/src/locales/el/location/index.ts
@@ -3,14 +3,14 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocationDefinitions } from '../../..';
+import city_name from './city_name';
 import city_pattern from './city_pattern';
-import county from './county';
 import default_country from './default_country';
 import street_pattern from './street_pattern';
 
 const location: LocationDefinitions = {
+  city_name,
   city_pattern,
-  county,
   default_country,
   street_pattern,
 };

From 8e64482312af2d7539c935ffc47a762ad6b7bcfc Mon Sep 17 00:00:00 2001
From: "Mona,Lisa" <matt@matthewmayer.co.uk>
Date: Mon, 1 May 2023 16:46:41 +0700
Subject: [PATCH 2/2] fix conflicts caused by aftermath of #2058

---
 src/locales/el/location/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/locales/el/location/index.ts b/src/locales/el/location/index.ts
index 5b284bd30c1..1c59f60005e 100644
--- a/src/locales/el/location/index.ts
+++ b/src/locales/el/location/index.ts
@@ -3,14 +3,14 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocationDefinition } from '../../..';
+import city_name from './city_name';
 import city_pattern from './city_pattern';
-import county from './county';
 import default_country from './default_country';
 import street_pattern from './street_pattern';
 
 const location: LocationDefinition = {
+  city_name,
   city_pattern,
-  county,
   default_country,
   street_pattern,
 };