Merge pull request #360 from landretk/master

Added gendered first names to en locale

1 files changed, 9 insertions, 3 deletions

diff --git a/lib/name.js b/lib/name.js
index 1d2bf5e6..49b54614 100644
--- a/lib/name.js
+++ b/lib/name.js
@@ -16,12 +16,18 @@ function Name (faker) {
       // some locale datasets ( like ru ) have first_name split by gender. since the name.first_name field does not exist in these datasets,
       // we must randomly pick a name from either gender array so faker.name.firstName will return the correct locale data ( and not fallback )
       if (typeof gender !== 'number') {
-        gender = faker.random.number(1);
+        if(typeof faker.definitions.name.first_name === "undefined") {
+          gender = faker.random.number(1);
+        }
+        else {
+          //Fall back to non-gendered names if they exist and gender wasn't specified
+          return faker.random.arrayElement(faker.definitions.name.first_name);
+        }
       }
       if (gender === 0) {
-        return faker.random.arrayElement(faker.locales[faker.locale].name.male_first_name)
+        return faker.random.arrayElement(faker.definitions.name.male_first_name)
       } else {
-        return faker.random.arrayElement(faker.locales[faker.locale].name.female_first_name);
+        return faker.random.arrayElement(faker.definitions.name.female_first_name);
       }
     }
     return faker.random.arrayElement(faker.definitions.name.first_name);