feat(address): use localized fake pattern in city (#948)

37 files changed, 523 insertions, 427 deletions

diff --git a/src/locales/af_ZA/address/city.ts b/src/locales/af_ZA/address/city.ts
new file mode 100644
index 00000000..757d4d0e
--- /dev/null
+++ b/src/locales/af_ZA/address/city.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{address.cityPrefix}} {{name.firstName}}{{address.citySuffix}}',
+  '{{address.cityPrefix}} {{name.firstName}}',
+  '{{name.firstName}}{{address.citySuffix}}',
+  '{{name.lastName}}{{address.citySuffix}}',
+];
diff --git a/src/locales/af_ZA/address/index.ts b/src/locales/af_ZA/address/index.ts
index 0d9219e7..bd0e2aa7 100644
--- a/src/locales/af_ZA/address/index.ts
+++ b/src/locales/af_ZA/address/index.ts
@@ -3,10 +3,12 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { AddressDefinitions } from '../../..';
+import city from './city';
 import default_country from './default_country';
 import postcode from './postcode';
 
 const address: AddressDefinitions = {
+  city,
   default_country,
   postcode,
 };
diff --git a/src/locales/el/address/city.ts b/src/locales/el/address/city.ts
new file mode 100644
index 00000000..757d4d0e
--- /dev/null
+++ b/src/locales/el/address/city.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{address.cityPrefix}} {{name.firstName}}{{address.citySuffix}}',
+  '{{address.cityPrefix}} {{name.firstName}}',
+  '{{name.firstName}}{{address.citySuffix}}',
+  '{{name.lastName}}{{address.citySuffix}}',
+];
diff --git a/src/locales/el/address/index.ts b/src/locales/el/address/index.ts
index d6efb162..3b467ad7 100644
--- a/src/locales/el/address/index.ts
+++ b/src/locales/el/address/index.ts
@@ -3,10 +3,12 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { AddressDefinitions } from '../../..';
+import city from './city';
 import county from './county';
 import default_country from './default_country';
 
 const address: AddressDefinitions = {
+  city,
   county,
   default_country,
 };
diff --git a/src/locales/en/address/city.ts b/src/locales/en/address/city.ts
index d518527b..6032f4a7 100644
--- a/src/locales/en/address/city.ts
+++ b/src/locales/en/address/city.ts
@@ -3,4 +3,5 @@ export default [
   '{{address.city_prefix}} {{name.first_name}}',
   '{{name.first_name}}{{address.city_suffix}}',
   '{{name.last_name}}{{address.city_suffix}}',
+  '{{address.city_name}}',
 ];
diff --git a/src/locales/en_AU/address/city.ts b/src/locales/en_AU/address/city.ts
new file mode 100644
index 00000000..757d4d0e
--- /dev/null
+++ b/src/locales/en_AU/address/city.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{address.cityPrefix}} {{name.firstName}}{{address.citySuffix}}',
+  '{{address.cityPrefix}} {{name.firstName}}',
+  '{{name.firstName}}{{address.citySuffix}}',
+  '{{name.lastName}}{{address.citySuffix}}',
+];
diff --git a/src/locales/en_AU/address/index.ts b/src/locales/en_AU/address/index.ts
index 2c896fff..ab3988cb 100644
--- a/src/locales/en_AU/address/index.ts
+++ b/src/locales/en_AU/address/index.ts
@@ -4,6 +4,7 @@
  */
 import type { AddressDefinitions } from '../../..';
 import building_number from './building_number';
+import city from './city';
 import default_country from './default_country';
 import postcode from './postcode';
 import state from './state';
@@ -12,6 +13,7 @@ import street_suffix from './street_suffix';
 
 const address: AddressDefinitions = {
   building_number,
+  city,
   default_country,
   postcode,
   state,
diff --git a/src/locales/en_CA/address/city.ts b/src/locales/en_CA/address/city.ts
new file mode 100644
index 00000000..757d4d0e
--- /dev/null
+++ b/src/locales/en_CA/address/city.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{address.cityPrefix}} {{name.firstName}}{{address.citySuffix}}',
+  '{{address.cityPrefix}} {{name.firstName}}',
+  '{{name.firstName}}{{address.citySuffix}}',
+  '{{name.lastName}}{{address.citySuffix}}',
+];
diff --git a/src/locales/en_CA/address/index.ts b/src/locales/en_CA/address/index.ts
index 7fcaaf57..85f15fd0 100644
--- a/src/locales/en_CA/address/index.ts
+++ b/src/locales/en_CA/address/index.ts
@@ -3,12 +3,14 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { AddressDefinitions } from '../../..';
+import city from './city';
 import default_country from './default_country';
 import postcode from './postcode';
 import state from './state';
 import state_abbr from './state_abbr';
 
 const address: AddressDefinitions = {
+  city,
   default_country,
   postcode,
   state,
diff --git a/src/locales/en_GB/address/city.ts b/src/locales/en_GB/address/city.ts
new file mode 100644
index 00000000..757d4d0e
--- /dev/null
+++ b/src/locales/en_GB/address/city.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{address.cityPrefix}} {{name.firstName}}{{address.citySuffix}}',
+  '{{address.cityPrefix}} {{name.firstName}}',
+  '{{name.firstName}}{{address.citySuffix}}',
+  '{{name.lastName}}{{address.citySuffix}}',
+];
diff --git a/src/locales/en_GB/address/index.ts b/src/locales/en_GB/address/index.ts
index 24517b91..21314cbc 100644
--- a/src/locales/en_GB/address/index.ts
+++ b/src/locales/en_GB/address/index.ts
@@ -3,12 +3,14 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { AddressDefinitions } from '../../..';
+import city from './city';
 import county from './county';
 import default_country from './default_country';
 import postcode from './postcode';
 import uk_country from './uk_country';
 
 const address: AddressDefinitions = {
+  city,
   county,
   default_country,
   postcode,
diff --git a/src/locales/en_IE/address/city.ts b/src/locales/en_IE/address/city.ts
new file mode 100644
index 00000000..757d4d0e
--- /dev/null
+++ b/src/locales/en_IE/address/city.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{address.cityPrefix}} {{name.firstName}}{{address.citySuffix}}',
+  '{{address.cityPrefix}} {{name.firstName}}',
+  '{{name.firstName}}{{address.citySuffix}}',
+  '{{name.lastName}}{{address.citySuffix}}',
+];
diff --git a/src/locales/en_IE/address/index.ts b/src/locales/en_IE/address/index.ts
index d6efb162..3b467ad7 100644
--- a/src/locales/en_IE/address/index.ts
+++ b/src/locales/en_IE/address/index.ts
@@ -3,10 +3,12 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { AddressDefinitions } from '../../..';
+import city from './city';
 import county from './county';
 import default_country from './default_country';
 
 const address: AddressDefinitions = {
+  city,
   county,
   default_country,
 };
diff --git a/src/locales/en_US/address/city.ts b/src/locales/en_US/address/city.ts
new file mode 100644
index 00000000..757d4d0e
--- /dev/null
+++ b/src/locales/en_US/address/city.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{address.cityPrefix}} {{name.firstName}}{{address.citySuffix}}',
+  '{{address.cityPrefix}} {{name.firstName}}',
+  '{{name.firstName}}{{address.citySuffix}}',
+  '{{name.lastName}}{{address.citySuffix}}',
+];
diff --git a/src/locales/en_US/address/index.ts b/src/locales/en_US/address/index.ts
index 5b2f2765..524868e9 100644
--- a/src/locales/en_US/address/index.ts
+++ b/src/locales/en_US/address/index.ts
@@ -3,10 +3,12 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { AddressDefinitions } from '../../..';
+import city from './city';
 import default_country from './default_country';
 import postcode_by_state from './postcode_by_state';
 
 const address: AddressDefinitions = {
+  city,
   default_country,
   postcode_by_state,
 };
diff --git a/src/locales/fr_CA/address/city.ts b/src/locales/fr_CA/address/city.ts
new file mode 100644
index 00000000..757d4d0e
--- /dev/null
+++ b/src/locales/fr_CA/address/city.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{address.cityPrefix}} {{name.firstName}}{{address.citySuffix}}',
+  '{{address.cityPrefix}} {{name.firstName}}',
+  '{{name.firstName}}{{address.citySuffix}}',
+  '{{name.lastName}}{{address.citySuffix}}',
+];
diff --git a/src/locales/fr_CA/address/index.ts b/src/locales/fr_CA/address/index.ts
index 7fcaaf57..85f15fd0 100644
--- a/src/locales/fr_CA/address/index.ts
+++ b/src/locales/fr_CA/address/index.ts
@@ -3,12 +3,14 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { AddressDefinitions } from '../../..';
+import city from './city';
 import default_country from './default_country';
 import postcode from './postcode';
 import state from './state';
 import state_abbr from './state_abbr';
 
 const address: AddressDefinitions = {
+  city,
   default_country,
   postcode,
   state,
diff --git a/src/locales/nb_NO/address/city.ts b/src/locales/nb_NO/address/city.ts
index f6103caa..67bd1b88 100644
--- a/src/locales/nb_NO/address/city.ts
+++ b/src/locales/nb_NO/address/city.ts
@@ -1 +1 @@
-export default ['{{address.city_root}}{{address.city_suffix}}'];
+export default ['{{address.city_name}}{{address.city_suffix}}'];
diff --git a/src/locales/nb_NO/address/city_root.ts b/src/locales/nb_NO/address/city_name.ts
index 91763d2e..91763d2e 100644
--- a/src/locales/nb_NO/address/city_root.ts
+++ b/src/locales/nb_NO/address/city_name.ts
diff --git a/src/locales/nb_NO/address/index.ts b/src/locales/nb_NO/address/index.ts
index eb2468ab..17bc5fb8 100644
--- a/src/locales/nb_NO/address/index.ts
+++ b/src/locales/nb_NO/address/index.ts
@@ -5,7 +5,7 @@
 import type { AddressDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
-import city_root from './city_root';
+import city_name from './city_name';
 import city_suffix from './city_suffix';
 import common_street_suffix from './common_street_suffix';
 import default_country from './default_country';
@@ -21,7 +21,7 @@ import street_suffix from './street_suffix';
 const address: AddressDefinitions = {
   building_number,
   city,
-  city_root,
+  city_name,
   city_suffix,
   common_street_suffix,
   default_country,
diff --git a/src/locales/ne/address/city.ts b/src/locales/ne/address/city.ts
index 3aa3d059..d869d1e9 100644
--- a/src/locales/ne/address/city.ts
+++ b/src/locales/ne/address/city.ts
@@ -1,18 +1,7 @@
 export default [
-  'Bhaktapur',
-  'Biratnagar',
-  'Birendranagar',
-  'Birgunj',
-  'Butwal',
-  'Damak',
-  'Dharan',
-  'Gaur',
-  'Gorkha',
-  'Hetauda',
-  'Itahari',
-  'Janakpur',
-  'Kathmandu',
-  'Lahan',
-  'Nepalgunj',
-  'Pokhara',
+  '{{address.cityPrefix}} {{name.firstName}}{{address.citySuffix}}',
+  '{{address.cityPrefix}} {{name.firstName}}',
+  '{{name.firstName}}{{address.citySuffix}}',
+  '{{name.lastName}}{{address.citySuffix}}',
+  '{{address.city_name}}',
 ];
diff --git a/src/locales/ne/address/city_name.ts b/src/locales/ne/address/city_name.ts
new file mode 100644
index 00000000..3aa3d059
--- /dev/null
+++ b/src/locales/ne/address/city_name.ts
@@ -0,0 +1,18 @@
+export default [
+  'Bhaktapur',
+  'Biratnagar',
+  'Birendranagar',
+  'Birgunj',
+  'Butwal',
+  'Damak',
+  'Dharan',
+  'Gaur',
+  'Gorkha',
+  'Hetauda',
+  'Itahari',
+  'Janakpur',
+  'Kathmandu',
+  'Lahan',
+  'Nepalgunj',
+  'Pokhara',
+];
diff --git a/src/locales/ne/address/index.ts b/src/locales/ne/address/index.ts
index ec4a46a8..cf6b21c7 100644
--- a/src/locales/ne/address/index.ts
+++ b/src/locales/ne/address/index.ts
@@ -4,11 +4,13 @@
  */
 import type { AddressDefinitions } from '../../..';
 import city from './city';
+import city_name from './city_name';
 import default_country from './default_country';
 import state from './state';
 
 const address: AddressDefinitions = {
   city,
+  city_name,
   default_country,
   state,
 };
diff --git a/src/locales/pt_BR/address/city.ts b/src/locales/pt_BR/address/city.ts
new file mode 100644
index 00000000..757d4d0e
--- /dev/null
+++ b/src/locales/pt_BR/address/city.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{address.cityPrefix}} {{name.firstName}}{{address.citySuffix}}',
+  '{{address.cityPrefix}} {{name.firstName}}',
+  '{{name.firstName}}{{address.citySuffix}}',
+  '{{name.lastName}}{{address.citySuffix}}',
+];
diff --git a/src/locales/pt_BR/address/index.ts b/src/locales/pt_BR/address/index.ts
index 10be9fe3..eafce9da 100644
--- a/src/locales/pt_BR/address/index.ts
+++ b/src/locales/pt_BR/address/index.ts
@@ -4,6 +4,7 @@
  */
 import type { AddressDefinitions } from '../../..';
 import building_number from './building_number';
+import city from './city';
 import city_prefix from './city_prefix';
 import city_suffix from './city_suffix';
 import country from './country';
@@ -16,6 +17,7 @@ import street_suffix from './street_suffix';
 
 const address: AddressDefinitions = {
   building_number,
+  city,
   city_prefix,
   city_suffix,
   country,
diff --git a/src/locales/ro/address/city.ts b/src/locales/ro/address/city.ts
index a44711e4..d869d1e9 100644
--- a/src/locales/ro/address/city.ts
+++ b/src/locales/ro/address/city.ts
@@ -1,302 +1,7 @@
 export default [
-  'București',
-  'Cluj-Napoca',
-  'Timișoara',
-  'Iași',
-  'Constanța',
-  'Craiova',
-  'Brașov',
-  'Galați',
-  'Ploiești',
-  'Oradea',
-  'Brăila',
-  'Arad',
-  'Pitești',
-  'Sibiu',
-  'Bacău',
-  'Târgu Mureș',
-  'Baia Mare',
-  'Buzău',
-  'Botoșani',
-  'Satu Mare',
-  'Râmnicu Vâlcea',
-  'Drobeta-Turnu Severin',
-  'Suceava',
-  'Piatra Neamț',
-  'Târgu Jiu',
-  'Târgoviște',
-  'Focșani',
-  'Bistrița',
-  'Reșița',
-  'Tulcea',
-  'Călărași',
-  'Alba Iulia',
-  'Giurgiu',
-  'Deva',
-  'Hunedoara',
-  'Zalău',
-  'Sfântu Gheorghe',
-  'Bârlad',
-  'Vaslui',
-  '1387',
-  'Slobozia',
-  'Turda',
-  'Mediaș',
-  'Voluntari',
-  'Lugoj',
-  'Medgidia',
-  'Onești',
-  'Miercurea Ciuc',
-  'Sighetu Marmației',
-  'Petroșani',
-  'Mangalia',
-  'Tecuci',
-  'Râmnicu Sărat',
-  'Pașcani',
-  'Dej',
-  'Reghin',
-  'Năvodari',
-  'Odorheiu Secuiesc',
-  'Câmpina',
-  'Mioveni',
-  'Câmpulung',
-  'Caracal',
-  'Săcele',
-  'Făgăraș',
-  'Fetești',
-  'Sighișoara',
-  'Borșa',
-  'Roșiorii de Vede',
-  'Curtea de Argeș',
-  'Sebeș',
-  'Huși',
-  'Fălticeni',
-  'Pantelimon',
-  'Oltenița',
-  'Turnu Măgurele',
-  'Caransebeș',
-  'Dorohoi',
-  'Rădăuți',
-  'Zărnești',
-  'Lupeni',
-  'Aiud',
-  'Petrila',
-  'Buftea',
-  'Moinești',
-  'Târnăveni',
-  'Câmpia Turzii',
-  'Popești-Leordeni',
-  'Gherla',
-  'Carei',
-  'Cugir',
-  'Blaj',
-  'Codlea',
-  'Comănești',
-  'Târgu Neamț',
-  'Motru',
-  'Târgu Secuiesc',
-  'Moreni',
-  'Gheorgheni',
-  'Băicoi',
-  'Orăștie',
-  'Salonta',
-  'Balș',
-  'Drăgășani',
-  'Băilești',
-  'Calafat',
-  'Filiași',
-  'Cernavodă',
-  'Câmpulung Moldovenesc',
-  'Breaza',
-  'Marghita',
-  'Baia Sprie',
-  'Luduș',
-  'Corabia',
-  'Adjud',
-  'Vișeu de Sus',
-  'Bragadiru',
-  'Bocșa',
-  'Râșnov',
-  'Urziceni',
-  'Pucioasa',
-  'Vatra Dornei',
-  'Cisnădie',
-  'Mizil',
-  'Toplița',
-  'Chitila',
-  'Șimleu Silvaniei',
-  'Buhuși',
-  'Vicovu de Sus',
-  'Zimnicea',
-  'Găești',
-  'Gura Humorului',
-  'Otopeni',
-  'Ocna Mureș',
-  'Avrig',
-  'Simeria',
-  'Pecica',
-  'Dăbuleni',
-  'Bolintin-Vale',
-  'Rovinari',
-  'Comarnic',
-  'Vălenii de Munte',
-  'Sânnicolau Mare',
-  'Dărmănești',
-  'Moldova Nouă',
-  'Târgu Lăpuș',
-  'Săcueni',
-  'Videle',
-  'Scornicești',
-  'Boldești-Scăeni',
-  'Sântana',
-  'Târgu Ocna',
-  'Măgurele',
-  'Călan',
-  'Beclean',
-  'Țăndărei',
-  'Sovata',
-  'Oravița',
-  'Jibou',
-  'Urlați',
-  'Hârlău',
-  'Beiuș',
-  'Ianca',
-  'Jimbolia',
-  'Topoloveni',
-  'Drăgănești-Olt',
-  'Sinaia',
-  'Nehoiu',
-  'Covasna',
-  'Negrești-Oaș',
-  'Strehaia',
-  'Dolhasca',
-  'Orșova',
-  'Valea lui Mihai',
-  'Murfatlar',
-  'Aleșd',
-  'Darabani',
-  'Cristuru Secuiesc',
-  'Flămânzi',
-  'Mărășești',
-  'Sângeorz-Băi',
-  'Liteni',
-  'Târgu Frumos',
-  'Titu',
-  'Hațeg',
-  'Oțelu Roșu',
-  'Ineu',
-  'Năsăud',
-  'Huedin',
-  'Odobești',
-  'Hârșova',
-  'Bumbești-Jiu',
-  'Seini',
-  'Salcea',
-  'Podu Iloaiei',
-  'Eforie',
-  'Uricani',
-  'Baraolt',
-  'Bușteni',
-  'Tășnad',
-  'Iernut',
-  'Agnita',
-  'Babadag',
-  'Băbeni',
-  'Târgu Cărbunești',
-  'Negrești',
-  'Recaș',
-  'Siret',
-  'Măcin',
-  'Chișineu-Criș',
-  'Plopeni',
-  'Mihăilești',
-  'Șomcuta Mare',
-  'Fieni',
-  'Întorsura Buzăului',
-  'Călimănești',
-  'Panciu',
-  'Nădlac',
-  'Zlatna',
-  'Pătârlagele',
-  'Cehu Silvaniei',
-  'Amara',
-  'Budești',
-  'Anina',
-  'Dumbrăveni',
-  'Câmpeni',
-  'Pogoanele',
-  'Tăuții-Măgherăuș',
-  'Tismana',
-  'Curtici',
-  'Techirghiol',
-  'Sărmașu',
-  'Vlăhița',
-  'Cajvana',
-  'Săveni',
-  'Segarcea',
-  'Pâncota',
-  'Răcari',
-  'Făget',
-  'Tălmaciu',
-  'Buziaș',
-  'Fundulea',
-  'Murgeni',
-  'Teiuș',
-  'Însurăței',
-  'Bicaz',
-  'Târgu Bujor',
-  'Ștei',
-  'Lehliu Gară',
-  'Horezu',
-  'Deta',
-  'Slănic',
-  'Piatra-Olt',
-  'Ardud',
-  'Bălan',
-  'Sebiș',
-  'Brezoi',
-  'Potcoava',
-  'Gătaia',
-  'Novaci',
-  'Miercurea Nirajului',
-  'Baia de Aramă',
-  'Copșa Mică',
-  'Vânju Mare',
-  'Sângeorgiu de Pădure',
-  'Geoagiu',
-  'Săliște',
-  'Ciacova',
-  'Rupea',
-  'Milișăuți',
-  'Isaccea',
-  'Abrud',
-  'Fierbinți-Târg',
-  'Cavnic',
-  'Săliștea de Sus',
-  'Băile Herculane',
-  'Bălcești',
-  'Berbești',
-  'Ghimbav',
-  'Predeal',
-  'Țicleni',
-  'Azuga',
-  'Aninoasa',
-  'Bucecea',
-  'Băile Olănești',
-  'Slănic Moldova',
-  'Miercurea Sibiului',
-  'Sulina',
-  'Baia de Arieș',
-  'Făurei',
-  'Ocna Sibiului',
-  'Bechet',
-  'Căzănești',
-  'Ocnele Mari',
-  'Berești',
-  'Borsec',
-  'Băile Govora',
-  'Vașcău',
-  'Nucet',
-  'Solca',
-  'Băile Tușnad',
+  '{{address.cityPrefix}} {{name.firstName}}{{address.citySuffix}}',
+  '{{address.cityPrefix}} {{name.firstName}}',
+  '{{name.firstName}}{{address.citySuffix}}',
+  '{{name.lastName}}{{address.citySuffix}}',
+  '{{address.city_name}}',
 ];
diff --git a/src/locales/ro/address/city_name.ts b/src/locales/ro/address/city_name.ts
new file mode 100644
index 00000000..a44711e4
--- /dev/null
+++ b/src/locales/ro/address/city_name.ts
@@ -0,0 +1,302 @@
+export default [
+  'București',
+  'Cluj-Napoca',
+  'Timișoara',
+  'Iași',
+  'Constanța',
+  'Craiova',
+  'Brașov',
+  'Galați',
+  'Ploiești',
+  'Oradea',
+  'Brăila',
+  'Arad',
+  'Pitești',
+  'Sibiu',
+  'Bacău',
+  'Târgu Mureș',
+  'Baia Mare',
+  'Buzău',
+  'Botoșani',
+  'Satu Mare',
+  'Râmnicu Vâlcea',
+  'Drobeta-Turnu Severin',
+  'Suceava',
+  'Piatra Neamț',
+  'Târgu Jiu',
+  'Târgoviște',
+  'Focșani',
+  'Bistrița',
+  'Reșița',
+  'Tulcea',
+  'Călărași',
+  'Alba Iulia',
+  'Giurgiu',
+  'Deva',
+  'Hunedoara',
+  'Zalău',
+  'Sfântu Gheorghe',
+  'Bârlad',
+  'Vaslui',
+  '1387',
+  'Slobozia',
+  'Turda',
+  'Mediaș',
+  'Voluntari',
+  'Lugoj',
+  'Medgidia',
+  'Onești',
+  'Miercurea Ciuc',
+  'Sighetu Marmației',
+  'Petroșani',
+  'Mangalia',
+  'Tecuci',
+  'Râmnicu Sărat',
+  'Pașcani',
+  'Dej',
+  'Reghin',
+  'Năvodari',
+  'Odorheiu Secuiesc',
+  'Câmpina',
+  'Mioveni',
+  'Câmpulung',
+  'Caracal',
+  'Săcele',
+  'Făgăraș',
+  'Fetești',
+  'Sighișoara',
+  'Borșa',
+  'Roșiorii de Vede',
+  'Curtea de Argeș',
+  'Sebeș',
+  'Huși',
+  'Fălticeni',
+  'Pantelimon',
+  'Oltenița',
+  'Turnu Măgurele',
+  'Caransebeș',
+  'Dorohoi',
+  'Rădăuți',
+  'Zărnești',
+  'Lupeni',
+  'Aiud',
+  'Petrila',
+  'Buftea',
+  'Moinești',
+  'Târnăveni',
+  'Câmpia Turzii',
+  'Popești-Leordeni',
+  'Gherla',
+  'Carei',
+  'Cugir',
+  'Blaj',
+  'Codlea',
+  'Comănești',
+  'Târgu Neamț',
+  'Motru',
+  'Târgu Secuiesc',
+  'Moreni',
+  'Gheorgheni',
+  'Băicoi',
+  'Orăștie',
+  'Salonta',
+  'Balș',
+  'Drăgășani',
+  'Băilești',
+  'Calafat',
+  'Filiași',
+  'Cernavodă',
+  'Câmpulung Moldovenesc',
+  'Breaza',
+  'Marghita',
+  'Baia Sprie',
+  'Luduș',
+  'Corabia',
+  'Adjud',
+  'Vișeu de Sus',
+  'Bragadiru',
+  'Bocșa',
+  'Râșnov',
+  'Urziceni',
+  'Pucioasa',
+  'Vatra Dornei',
+  'Cisnădie',
+  'Mizil',
+  'Toplița',
+  'Chitila',
+  'Șimleu Silvaniei',
+  'Buhuși',
+  'Vicovu de Sus',
+  'Zimnicea',
+  'Găești',
+  'Gura Humorului',
+  'Otopeni',
+  'Ocna Mureș',
+  'Avrig',
+  'Simeria',
+  'Pecica',
+  'Dăbuleni',
+  'Bolintin-Vale',
+  'Rovinari',
+  'Comarnic',
+  'Vălenii de Munte',
+  'Sânnicolau Mare',
+  'Dărmănești',
+  'Moldova Nouă',
+  'Târgu Lăpuș',
+  'Săcueni',
+  'Videle',
+  'Scornicești',
+  'Boldești-Scăeni',
+  'Sântana',
+  'Târgu Ocna',
+  'Măgurele',
+  'Călan',
+  'Beclean',
+  'Țăndărei',
+  'Sovata',
+  'Oravița',
+  'Jibou',
+  'Urlați',
+  'Hârlău',
+  'Beiuș',
+  'Ianca',
+  'Jimbolia',
+  'Topoloveni',
+  'Drăgănești-Olt',
+  'Sinaia',
+  'Nehoiu',
+  'Covasna',
+  'Negrești-Oaș',
+  'Strehaia',
+  'Dolhasca',
+  'Orșova',
+  'Valea lui Mihai',
+  'Murfatlar',
+  'Aleșd',
+  'Darabani',
+  'Cristuru Secuiesc',
+  'Flămânzi',
+  'Mărășești',
+  'Sângeorz-Băi',
+  'Liteni',
+  'Târgu Frumos',
+  'Titu',
+  'Hațeg',
+  'Oțelu Roșu',
+  'Ineu',
+  'Năsăud',
+  'Huedin',
+  'Odobești',
+  'Hârșova',
+  'Bumbești-Jiu',
+  'Seini',
+  'Salcea',
+  'Podu Iloaiei',
+  'Eforie',
+  'Uricani',
+  'Baraolt',
+  'Bușteni',
+  'Tășnad',
+  'Iernut',
+  'Agnita',
+  'Babadag',
+  'Băbeni',
+  'Târgu Cărbunești',
+  'Negrești',
+  'Recaș',
+  'Siret',
+  'Măcin',
+  'Chișineu-Criș',
+  'Plopeni',
+  'Mihăilești',
+  'Șomcuta Mare',
+  'Fieni',
+  'Întorsura Buzăului',
+  'Călimănești',
+  'Panciu',
+  'Nădlac',
+  'Zlatna',
+  'Pătârlagele',
+  'Cehu Silvaniei',
+  'Amara',
+  'Budești',
+  'Anina',
+  'Dumbrăveni',
+  'Câmpeni',
+  'Pogoanele',
+  'Tăuții-Măgherăuș',
+  'Tismana',
+  'Curtici',
+  'Techirghiol',
+  'Sărmașu',
+  'Vlăhița',
+  'Cajvana',
+  'Săveni',
+  'Segarcea',
+  'Pâncota',
+  'Răcari',
+  'Făget',
+  'Tălmaciu',
+  'Buziaș',
+  'Fundulea',
+  'Murgeni',
+  'Teiuș',
+  'Însurăței',
+  'Bicaz',
+  'Târgu Bujor',
+  'Ștei',
+  'Lehliu Gară',
+  'Horezu',
+  'Deta',
+  'Slănic',
+  'Piatra-Olt',
+  'Ardud',
+  'Bălan',
+  'Sebiș',
+  'Brezoi',
+  'Potcoava',
+  'Gătaia',
+  'Novaci',
+  'Miercurea Nirajului',
+  'Baia de Aramă',
+  'Copșa Mică',
+  'Vânju Mare',
+  'Sângeorgiu de Pădure',
+  'Geoagiu',
+  'Săliște',
+  'Ciacova',
+  'Rupea',
+  'Milișăuți',
+  'Isaccea',
+  'Abrud',
+  'Fierbinți-Târg',
+  'Cavnic',
+  'Săliștea de Sus',
+  'Băile Herculane',
+  'Bălcești',
+  'Berbești',
+  'Ghimbav',
+  'Predeal',
+  'Țicleni',
+  'Azuga',
+  'Aninoasa',
+  'Bucecea',
+  'Băile Olănești',
+  'Slănic Moldova',
+  'Miercurea Sibiului',
+  'Sulina',
+  'Baia de Arieș',
+  'Făurei',
+  'Ocna Sibiului',
+  'Bechet',
+  'Căzănești',
+  'Ocnele Mari',
+  'Berești',
+  'Borsec',
+  'Băile Govora',
+  'Vașcău',
+  'Nucet',
+  'Solca',
+  'Băile Tușnad',
+];
diff --git a/src/locales/ro/address/index.ts b/src/locales/ro/address/index.ts
index 5698ded1..aa920b0f 100644
--- a/src/locales/ro/address/index.ts
+++ b/src/locales/ro/address/index.ts
@@ -5,6 +5,7 @@
 import type { AddressDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
+import city_name from './city_name';
 import county from './county';
 import default_country from './default_country';
 import postcode from './postcode';
@@ -19,6 +20,7 @@ import street_suffix from './street_suffix';
 const address: AddressDefinitions = {
   building_number,
   city,
+  city_name,
   county,
   default_country,
   postcode,
diff --git a/src/locales/tr/address/city.ts b/src/locales/tr/address/city.ts
index 0e7f14c2..d869d1e9 100644
--- a/src/locales/tr/address/city.ts
+++ b/src/locales/tr/address/city.ts
@@ -1,83 +1,7 @@
 export default [
-  'Adana',
-  'Adıyaman',
-  'Afyon',
-  'Ağrı',
-  'Amasya',
-  'Ankara',
-  'Antalya',
-  'Artvin',
-  'Aydın',
-  'Balıkesir',
-  'Bilecik',
-  'Bingöl',
-  'Bitlis',
-  'Bolu',
-  'Burdur',
-  'Bursa',
-  'Çanakkale',
-  'Çankırı',
-  'Çorum',
-  'Denizli',
-  'Diyarbakır',
-  'Edirne',
-  'Elazığ',
-  'Erzincan',
-  'Erzurum',
-  'Eskişehir',
-  'Gaziantep',
-  'Giresun',
-  'Gümüşhane',
-  'Hakkari',
-  'Hatay',
-  'Isparta',
-  'İçel (Mersin)',
-  'İstanbul',
-  'İzmir',
-  'Kars',
-  'Kastamonu',
-  'Kayseri',
-  'Kırklareli',
-  'Kırşehir',
-  'Kocaeli',
-  'Konya',
-  'Kütahya',
-  'Malatya',
-  'Manisa',
-  'K.maraş',
-  'Mardin',
-  'Muğla',
-  'Muş',
-  'Nevşehir',
-  'Niğde',
-  'Ordu',
-  'Rize',
-  'Sakarya',
-  'Samsun',
-  'Siirt',
-  'Sinop',
-  'Sivas',
-  'Tekirdağ',
-  'Tokat',
-  'Trabzon',
-  'Tunceli',
-  'Şanlıurfa',
-  'Uşak',
-  'Van',
-  'Yozgat',
-  'Zonguldak',
-  'Aksaray',
-  'Bayburt',
-  'Karaman',
-  'Kırıkkale',
-  'Batman',
-  'Şırnak',
-  'Bartın',
-  'Ardahan',
-  'Iğdır',
-  'Yalova',
-  'Karabük',
-  'Kilis',
-  'Osmaniye',
-  'Düzce',
+  '{{address.cityPrefix}} {{name.firstName}}{{address.citySuffix}}',
+  '{{address.cityPrefix}} {{name.firstName}}',
+  '{{name.firstName}}{{address.citySuffix}}',
+  '{{name.lastName}}{{address.citySuffix}}',
+  '{{address.city_name}}',
 ];
diff --git a/src/locales/tr/address/city_name.ts b/src/locales/tr/address/city_name.ts
new file mode 100644
index 00000000..0e7f14c2
--- /dev/null
+++ b/src/locales/tr/address/city_name.ts
@@ -0,0 +1,83 @@
+export default [
+  'Adana',
+  'Adıyaman',
+  'Afyon',
+  'Ağrı',
+  'Amasya',
+  'Ankara',
+  'Antalya',
+  'Artvin',
+  'Aydın',
+  'Balıkesir',
+  'Bilecik',
+  'Bingöl',
+  'Bitlis',
+  'Bolu',
+  'Burdur',
+  'Bursa',
+  'Çanakkale',
+  'Çankırı',
+  'Çorum',
+  'Denizli',
+  'Diyarbakır',
+  'Edirne',
+  'Elazığ',
+  'Erzincan',
+  'Erzurum',
+  'Eskişehir',
+  'Gaziantep',
+  'Giresun',
+  'Gümüşhane',
+  'Hakkari',
+  'Hatay',
+  'Isparta',
+  'İçel (Mersin)',
+  'İstanbul',
+  'İzmir',
+  'Kars',
+  'Kastamonu',
+  'Kayseri',
+  'Kırklareli',
+  'Kırşehir',
+  'Kocaeli',
+  'Konya',
+  'Kütahya',
+  'Malatya',
+  'Manisa',
+  'K.maraş',
+  'Mardin',
+  'Muğla',
+  'Muş',
+  'Nevşehir',
+  'Niğde',
+  'Ordu',
+  'Rize',
+  'Sakarya',
+  'Samsun',
+  'Siirt',
+  'Sinop',
+  'Sivas',
+  'Tekirdağ',
+  'Tokat',
+  'Trabzon',
+  'Tunceli',
+  'Şanlıurfa',
+  'Uşak',
+  'Van',
+  'Yozgat',
+  'Zonguldak',
+  'Aksaray',
+  'Bayburt',
+  'Karaman',
+  'Kırıkkale',
+  'Batman',
+  'Şırnak',
+  'Bartın',
+  'Ardahan',
+  'Iğdır',
+  'Yalova',
+  'Karabük',
+  'Kilis',
+  'Osmaniye',
+  'Düzce',
+];
diff --git a/src/locales/tr/address/index.ts b/src/locales/tr/address/index.ts
index 8c8323e0..4132aa63 100644
--- a/src/locales/tr/address/index.ts
+++ b/src/locales/tr/address/index.ts
@@ -5,6 +5,7 @@
 import type { AddressDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
+import city_name from './city_name';
 import country from './country';
 import default_country from './default_country';
 import postcode from './postcode';
@@ -15,6 +16,7 @@ import street_root from './street_root';
 const address: AddressDefinitions = {
   building_number,
   city,
+  city_name,
   country,
   default_country,
   postcode,
diff --git a/src/locales/vi/address/city.ts b/src/locales/vi/address/city.ts
index df5dc9ac..e3da346b 100644
--- a/src/locales/vi/address/city.ts
+++ b/src/locales/vi/address/city.ts
@@ -1 +1 @@
-export default ['{{address.city_root}}'];
+export default ['{{address.city_name}}'];
diff --git a/src/locales/vi/address/city_root.ts b/src/locales/vi/address/city_name.ts
index 46d1817d..46d1817d 100644
--- a/src/locales/vi/address/city_root.ts
+++ b/src/locales/vi/address/city_name.ts
diff --git a/src/locales/vi/address/index.ts b/src/locales/vi/address/index.ts
index dc1ca309..c1d90b32 100644
--- a/src/locales/vi/address/index.ts
+++ b/src/locales/vi/address/index.ts
@@ -4,14 +4,14 @@
  */
 import type { AddressDefinitions } from '../../..';
 import city from './city';
-import city_root from './city_root';
+import city_name from './city_name';
 import country from './country';
 import default_country from './default_country';
 import postcode from './postcode';
 
 const address: AddressDefinitions = {
   city,
-  city_root,
+  city_name,
   country,
   default_country,
   postcode,
diff --git a/src/locales/zu_ZA/address/city.ts b/src/locales/zu_ZA/address/city.ts
new file mode 100644
index 00000000..757d4d0e
--- /dev/null
+++ b/src/locales/zu_ZA/address/city.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{address.cityPrefix}} {{name.firstName}}{{address.citySuffix}}',
+  '{{address.cityPrefix}} {{name.firstName}}',
+  '{{name.firstName}}{{address.citySuffix}}',
+  '{{name.lastName}}{{address.citySuffix}}',
+];
diff --git a/src/locales/zu_ZA/address/index.ts b/src/locales/zu_ZA/address/index.ts
index 0d9219e7..bd0e2aa7 100644
--- a/src/locales/zu_ZA/address/index.ts
+++ b/src/locales/zu_ZA/address/index.ts
@@ -3,10 +3,12 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { AddressDefinitions } from '../../..';
+import city from './city';
 import default_country from './default_country';
 import postcode from './postcode';
 
 const address: AddressDefinitions = {
+  city,
   default_country,
   postcode,
 };
diff --git a/src/modules/address/index.ts b/src/modules/address/index.ts
index bf50c7c5..0030fac7 100644
--- a/src/modules/address/index.ts
+++ b/src/modules/address/index.ts
@@ -1,4 +1,5 @@
 import type { Faker } from '../..';
+import { deprecated } from '../../internal/deprecated';
 
 /**
  * Module to generate addresses and locations.
@@ -65,34 +66,21 @@ export class Address {
   /**
    * Generates a random localized city name.
    *
-   * @param format The format to use. Can be either the index of the format to use or
-   * any method provided by faker wrapped in `{{}}`, e.g. `{{name.firstName}}` in
-   * order to build the city name.
-   *
-   * If no format string is provided one of the following is randomly used:
-   *
-   * - `{{address.cityPrefix}} {{name.firstName}}{{address.citySuffix}}`
-   * - `{{address.cityPrefix}} {{name.firstName}}`
-   * - `{{name.firstName}}{{address.citySuffix}}`
-   * - `{{name.lastName}}{{address.citySuffix}}`
-   * - `{{address.cityName}}` when city name is available
+   * @param format The index of the format to use. Deprecated do not use.
    *
    * @example
-   * faker.address.city() // 'Gleasonbury'
-   * faker.address.city(2) // 'Jadenshire'
+   * faker.address.city() // 'East Jarretmouth'
    */
-  // TODO ST-DDT 2022-02-10: The string parameter doesn't work as expected.
   city(format?: string | number): string {
-    const formats = [
-      '{{address.cityPrefix}} {{name.firstName}}{{address.citySuffix}}',
-      '{{address.cityPrefix}} {{name.firstName}}',
-      '{{name.firstName}}{{address.citySuffix}}',
-      '{{name.lastName}}{{address.citySuffix}}',
-    ];
-
-    if (!format && this.faker.definitions.address.city_name) {
-      formats.push('{{address.cityName}}');
+    if (format != null) {
+      deprecated({
+        deprecated: 'faker.address.city(format)',
+        proposed: 'faker.address.city() or faker.fake(format)',
+        since: 'v7.0',
+        until: 'v8.0',
+      });
     }
+    const formats = this.faker.definitions.address.city;
 
     if (typeof format !== 'number') {
       format = this.faker.datatype.number(formats.length - 1);
@@ -126,7 +114,7 @@ export class Address {
   }
 
   /**
-   * Returns a random localized city name.
+   * Returns a random localized and existing city name.
    *
    * @example
    * faker.address.cityName() // 'San Rafael'