Merge pull request #1106 from vulcaryn/use-french-cities-name

Allow using real city names when available

3 files changed, 99 insertions, 85 deletions

diff --git a/lib/address.js b/lib/address.js
index 38c1e38c..29a0653a 100644
--- a/lib/address.js
+++ b/lib/address.js
@@ -55,6 +55,7 @@ function Address (faker) {
    * * `{{address.cityPrefix}} {{name.firstName}}`
    * * `{{name.firstName}}{{address.citySuffix}}`
    * * `{{name.lastName}}{{address.citySuffix}}`
+   * * `{{address.cityName}}` when city name is available
    *
    * @method faker.address.city
    * @param {String} format
@@ -67,6 +68,10 @@ function Address (faker) {
       '{{name.lastName}}{{address.citySuffix}}'
     ];
 
+    if (!format && faker.definitions.address.city_name) {
+      formats.push('{{address.cityName}}');
+    }
+
     if (typeof format !== "number") {
       format = faker.random.number(formats.length - 1);
     }
@@ -93,6 +98,15 @@ function Address (faker) {
   }
 
   /**
+   * Returns a random city name
+   * 
+   * @method faker.address.cityName
+   */
+  this.cityName = function() {
+    return faker.random.arrayElement(faker.definitions.address.city_name);
+  }
+
+  /**
    * Returns a random localized street name
    *
    * @method faker.address.streetName
diff --git a/lib/index.js b/lib/index.js
index 454c90ab..433a6b81 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -106,7 +106,7 @@ function Faker (opts) {
 
   var _definitions = {
     "name": ["first_name", "last_name", "prefix", "suffix", "binary_gender", "gender", "title", "male_prefix", "female_prefix", "male_first_name", "female_first_name", "male_middle_name", "female_middle_name", "male_last_name", "female_last_name"],
-    "address": ["city_prefix", "city_suffix", "street_suffix", "county", "country", "country_code", "country_code_alpha_3", "state", "state_abbr", "street_prefix", "postcode", "postcode_by_state", "direction", "direction_abbr", "time_zone"],
+    "address": ["city_name", "city_prefix", "city_suffix", "street_suffix", "county", "country", "country_code", "country_code_alpha_3", "state", "state_abbr", "street_prefix", "postcode", "postcode_by_state", "direction", "direction_abbr", "time_zone"],
     "animal": ["dog", "cat", "snake", "bear", "lion", "cetacean", "insect", "crocodilia", "cow", "bird", "fish", "rabbit", "horse", "type"],
     "company": ["adjective", "noun", "descriptor", "bs_adjective", "bs_noun", "bs_verb", "suffix"],
     "lorem": ["words"],
diff --git a/lib/locales/fr/address/city_name.js b/lib/locales/fr/address/city_name.js
index 740dd2d9..b63c05aa 100644
--- a/lib/locales/fr/address/city_name.js
+++ b/lib/locales/fr/address/city_name.js
@@ -1,102 +1,102 @@
 module["exports"] = [
-  "Paris",
-  "Marseille",
-  "Lyon",
-  "Toulouse",
-  "Nice",
-  "Nantes",
-  "Strasbourg",
-  "Montpellier",
-  "Bordeaux",
-  "Lille",
-  "Rennes",
-  "Reims",
-  "Le Havre",
-  "Saint-Étienne",
-  "Toulon",
-  "Grenoble",
-  "Dijon",
-  "Angers",
-  "Saint-Denis",
-  "Villeurbanne",
-  "Le Mans",
   "Aix-en-Provence",
-  "Brest",
-  "Nîmes",
-  "Limoges",
-  "Clermont-Ferrand",
-  "Tours",
+  "Ajaccio",
   "Amiens",
-  "Metz",
-  "Perpignan",
-  "Besançon",
-  "Orléans",
-  "Boulogne-Billancourt",
-  "Mulhouse",
-  "Rouen",
-  "Caen",
-  "Nancy",
-  "Saint-Denis",
-  "Saint-Paul",
-  "Montreuil",
+  "Angers",
+  "Antibes",
+  "Antony",
   "Argenteuil",
-  "Roubaix",
-  "Dunkerque14",
-  "Tourcoing",
-  "Nanterre",
-  "Avignon",
-  "Créteil",
-  "Poitiers",
-  "Fort-de-France",
-  "Courbevoie",
-  "Versailles",
-  "Vitry-sur-Seine",
-  "Colombes",
-  "Pau",
-  "Aulnay-sous-Bois",
   "Asnières-sur-Seine",
-  "Rueil-Malmaison",
-  "Saint-Pierre",
-  "Antibes",
-  "Saint-Maur-des-Fossés",
-  "Champigny-sur-Marne",
-  "La Rochelle",
   "Aubervilliers",
+  "Aulnay-sous-Bois",
+  "Avignon",
+  "Beauvais",
+  "Besançon",
+  "Béziers",
+  "Bordeaux",
+  "Boulogne-Billancourt",
+  "Bourges",
+  "Brest",
+  "Caen",
   "Calais",
   "Cannes",
-  "Le Tampon",
-  "Béziers",
+  "Cayenne",
+  "Cergy",
+  "Chambéry",
+  "Champigny-sur-Marne",
+  "Cholet",
+  "Clermont-Ferrand",
+  "Clichy",
   "Colmar",
-  "Bourges",
+  "Colombes",
+  "Courbevoie",
+  "Créteil",
+  "Dijon",
   "Drancy",
-  "Mérignac",
-  "Saint-Nazaire",
-  "Valence",
-  "Ajaccio",
+  "Dunkerque",
+  "Fort-de-France",
+  "Grenoble",
+  "Hyères",
   "Issy-les-Moulineaux",
-  "Villeneuve-d'Ascq",
-  "Levallois-Perret",
-  "Noisy-le-Grand",
-  "Quimper",
+  "Ivry-sur-Seine",
+  "La Rochelle",
   "La Seyne-sur-Mer",
-  "Antony",
-  "Troyes",
-  "Neuilly-sur-Seine",
-  "Sarcelles",
+  "Le Havre",
+  "Le Mans",
+  "Le Tampon",
   "Les Abymes",
-  "Vénissieux",
-  "Clichy",
+  "Levallois-Perret",
+  "Lille",
+  "Limoges",
   "Lorient",
-  "Pessac",
-  "Ivry-sur-Seine",
-  "Cergy",
-  "Cayenne",
-  "Niort",
-  "Chambéry",
+  "Lyon",
+  "Marseille",
+  "Mérignac",
+  "Metz",
   "Montauban",
+  "Montpellier",
+  "Montreuil",
+  "Mulhouse",
+  "Nancy",
+  "Nanterre",
+  "Nantes",
+  "Neuilly-sur-Seine",
+  "Nice",
+  "Nîmes",
+  "Niort",
+  "Noisy-le-Grand",
+  "Orléans",
+  "Paris",
+  "Pau",
+  "Perpignan",
+  "Pessac",
+  "Poitiers",
+  "Quimper",
+  "Reims",
+  "Rennes",
+  "Roubaix",
+  "Rouen",
+  "Rueil-Malmaison",
+  "Saint-Denis",
+  "Saint-Denis",
+  "Saint-Étienne",
+  "Saint-Maur-des-Fossés",
+  "Saint-Nazaire",
+  "Saint-Paul",
+  "Saint-Pierre",
   "Saint-Quentin",
+  "Sarcelles",
+  "Strasbourg",
+  "Toulon",
+  "Toulouse",
+  "Tourcoing",
+  "Tours",
+  "Troyes",
+  "Valence",
+  "Vénissieux",
+  "Versailles",
   "Villejuif",
-  "Hyères",
-  "Beauvais",
-  "Cholet"
+  "Villeneuve-d'Ascq",
+  "Villeurbanne",
+  "Vitry-sur-Seine"
 ];