Merge branch 'master' of https://github.com/Marak/faker.js into master

6 files changed, 168 insertions, 4 deletions

diff --git a/lib/locales/en/vehicle/bicycle.js b/lib/locales/en/vehicle/bicycle.js
new file mode 100644
index 00000000..519e3525
--- /dev/null
+++ b/lib/locales/en/vehicle/bicycle.js
@@ -0,0 +1,20 @@
+module["exports"] = [
+  "Adventure Road Bicycle",
+  "BMX Bicycle",
+  "City Bicycle",
+  "Cruiser Bicycle",
+  "Cyclocross Bicycle",
+  "Dual-Sport Bicycle",
+  "Fitness Bicycle",
+  "Flat-Foot Comfort Bicycle",
+  "Folding Bicycle",
+  "Hybrid Bicycle",
+  "Mountain Bicycle",
+  "Recumbent Bicycle",
+  "Road Bicycle",
+  "Tandem Bicycle",
+  "Touring Bicycle",
+  "Track/Fixed-Gear Bicycle",
+  "Triathlon/Time Trial Bicycle",
+  "Tricycle"
+];
\ No newline at end of file
diff --git a/lib/locales/en/vehicle/index.js b/lib/locales/en/vehicle/index.js
index 73407875..4a2c8172 100644
--- a/lib/locales/en/vehicle/index.js
+++ b/lib/locales/en/vehicle/index.js
@@ -4,3 +4,4 @@ vehicle.manufacturer = require("./manufacturer");
 vehicle.model = require("./model");
 vehicle.type = require("./vehicle_type");
 vehicle.fuel = require("./fuel");
+vehicle.bicycle = require("./bicycle");
\ No newline at end of file
diff --git a/lib/locales/id_ID/name/female_first_name.js b/lib/locales/id_ID/name/female_first_name.js
index 090fa555..74cb8c8a 100644
--- a/lib/locales/id_ID/name/female_first_name.js
+++ b/lib/locales/id_ID/name/female_first_name.js
@@ -15,6 +15,9 @@ module["exports"] = [
   "Anastasia",
   "Amelia",
   "Almira",
+  "Agustina",
+  "Aulia",
+  "Anggun",
   "Bella",
   "Betania",
   "Belinda",
@@ -30,12 +33,16 @@ module["exports"] = [
   "Carla",
   "Calista",
   "Devi",
-  "Dewi","Dian",
+  "Dewi",
+  "Dian",
   "Diah",
   "Diana",
   "Dina",
   "Dinda",
   "Dalima",
+  "Dwi",
+  "Dyah",
+  "Ditya",
   "Eka",
   "Eva",
   "Endah",
@@ -52,6 +59,10 @@ module["exports"] = [
   "Farah",
   "Farhunnisa",
   "Fathonah",
+  "Febrina",
+  "Febriana",
+  "Fitri",
+  "Fara",
   "Gabriella",
   "Gasti",
   "Gawati",
@@ -59,6 +70,8 @@ module["exports"] = [
   "Ghaliyati",
   "Gina",
   "Gilda",
+  "Ganesha",
+  "Gadis",
   "Halima",
   "Hesti",
   "Hilda",
@@ -79,6 +92,8 @@ module["exports"] = [
   "Ina",
   "Ira",
   "Iriana",
+  "Irawati",
+  "Indira",
   "Jamalia",
   "Janet",
   "Jane",
@@ -99,6 +114,7 @@ module["exports"] = [
   "Kiandra",
   "Kayla",
   "Kania",
+  "Kirana",
   "Lala",
   "Lalita",
   "Latika",
@@ -107,6 +123,9 @@ module["exports"] = [
   "Lidya",
   "Lili",
   "Lintang",
+  "Lestari",
+  "Linda",
+  "Laksita",
   "Maria",
   "Mala",
   "Maya",
@@ -117,6 +136,7 @@ module["exports"] = [
   "Mutia",
   "Michelle",
   "Malika",
+  "Melani",
   "Nadia",
   "Nadine",
   "Nabila",
@@ -126,6 +146,12 @@ module["exports"] = [
   "Nurul",
   "Nilam",
   "Najwa",
+  "Nada",
+  "Naura",
+  "Nur",
+  "Novita",
+  "Nimas",
+  "Noviana",
   "Olivia",
   "Ophelia",
   "Oni",
@@ -143,6 +169,9 @@ module["exports"] = [
   "Puti",
   "Putri",
   "Padmi",
+  "Puspita",
+  "Pratiwi",
+  "Prita",
   "Qori",
   "Queen",
   "Ratih",
@@ -157,6 +186,12 @@ module["exports"] = [
   "Rahmi",
   "Raisa",
   "Raina",
+  "Rahmawati",
+  "Retno",
+  "Ria",
+  "Rosalina",
+  "Rita",
+  "Rosa",
   "Sarah",
   "Sari",
   "Siti",
@@ -175,6 +210,11 @@ module["exports"] = [
   "Sabrina",
   "Silvia",
   "Shakila",
+  "Sintia",
+  "Sartika",
+  "Safira",
+  "Sasha",
+  "Sherly",
   "Talia",
   "Tami",
   "Tira",
@@ -185,6 +225,8 @@ module["exports"] = [
   "Tantri",
   "Tari",
   "Titi",
+  "Tri",
+  "Tsabita",
   "Uchita",
   "Unjani",
   "Ulya",
@@ -199,11 +241,13 @@ module["exports"] = [
   "Vicky",
   "Victoria",
   "Violet",
+  "Vania",
   "Winda",
   "Widya",
   "Wulan",
   "Wirda",
   "Wani",
+  "Wulandari",
   "Yani",
   "Yessi",
   "Yulia",
diff --git a/lib/locales/id_ID/name/female_last_name.js b/lib/locales/id_ID/name/female_last_name.js
index 5c6a542e..ab0a1618 100644
--- a/lib/locales/id_ID/name/female_last_name.js
+++ b/lib/locales/id_ID/name/female_last_name.js
@@ -4,8 +4,25 @@ module["exports"] = [
   "Anggraini",
   "Aryani",
   "Astuti",
+  "Ananda",
+  "Anandya",
+  "Azzahra",
+  "Aqila",
+  "Amanta",
+  "Afifah",
+  "Ardiyanti",
+  "Andini",
+  "Aurelia",
+  "Aryanti",
+  "Azizah",
+  "Anjani",
+  "Damayanti",
+  "Elvina",
   "Fujiati",
   "Farida",
+  "Fathina",
+  "Fernanda",
+  "Febrianti",
   "Handayani",
   "Hassanah",
   "Hartati",
@@ -14,24 +31,38 @@ module["exports"] = [
   "Hariyah",
   "Hastuti",
   "Halimah",
+  "Harini",
+  "Juwita",
+  "Jelita",
   "Kusmawati",
   "Kuswandari",
+  "Kusuma",
+  "Kahyang",
   "Laksmiwati",
   "Laksita",
   "Lestari",
   "Lailasari",
+  "Leilani",
   "Mandasari",
   "Mardhiyah",
   "Mayasari",
   "Melani",
   "Mulyani",
   "Maryati",
+  "Mahestri",
+  "Maharani",
+  "Maheswari",
+  "Melinda",
+  "Mustika",
   "Nurdiyanti",
   "Novitasari",
   "Nuraini",
   "Nasyidah",
   "Nasyiah",
   "Namaga",
+  "Nathania",
+  "Nurlaela",
+  "Ningrum",
   "Palastri",
   "Pudjiastuti",
   "Puspasari",
@@ -43,15 +74,23 @@ module["exports"] = [
   "Permata",
   "Prastuti",
   "Padmasari",
+  "Putri",
+  "Purnama",
   "Rahmawati",
   "Rahayu",
   "Riyanti",
   "Rahimah",
+  "Ramadhani",
+  "Rachmawati",
   "Suartini",
   "Sudiati",
   "Suryatmi",
   "Susanti",
   "Safitri",
+  "Salsabilla",
+  "Salma",
+  "Saputri",
+  "Saraswati",
   "Oktaviani",
   "Utami",
   "Usamah",
@@ -67,5 +106,6 @@ module["exports"] = [
   "Winarsih",
   "Wulandari",
   "Wastuti",
-  "Zulaika"
+  "Zulaika",
+  "Zahrah"
 ];
\ No newline at end of file
diff --git a/lib/locales/id_ID/name/male_last_name.js b/lib/locales/id_ID/name/male_last_name.js
index 32bb41d8..d3ad5863 100644
--- a/lib/locales/id_ID/name/male_last_name.js
+++ b/lib/locales/id_ID/name/male_last_name.js
@@ -2,13 +2,29 @@ module["exports"] = [
   "Adriansyah",
   "Ardianto",
   "Anggriawan",
+  "Ahmad",
+  "Adhitama",
+  "Abiputra",
+  "Antoni",
+  "Alamsyah",
+  "Airlangga",
+  "Abimanyu",
+  "Agustian",
+  "Arifin",
+  "Ardana",
+  "Aswandi",
   "Budiman",
   "Budiyanto",
+  "Bagaskara",
   "Damanik",
-  "Dongoran",
-  "Dabukke",
+  "Darmawan",
+  "Dirgantara",
+  "Darojat",
   "Firmansyah",
   "Firgantoro",
+  "Fabian",
+  "Febian",
+  "Faresta",
   "Gunarto",
   "Gunawan",
   "Hardiansyah",
@@ -21,8 +37,14 @@ module["exports"] = [
   "Hutagalung",
   "Hutapea",
   "Hutasoit",
+  "Himawan",
+  "Hermawan",
+  "Herlambang",
+  "Handoko",
+  "Haikal",
   "Irawan",
   "Iswahyudi",
+  "Irfandi",
   "Kuswoyo",
   "Januar",
   "Jailani",
@@ -30,6 +52,7 @@ module["exports"] = [
   "Kusumo",
   "Latupono",
   "Lazuardi",
+  "Lesmana",
   "Maheswara",
   "Mahendra",
   "Mustofa",
@@ -42,6 +65,7 @@ module["exports"] = [
   "Manullang",
   "Marpaung",
   "Marbun",
+  "Mahardika",
   "Narpati",
   "Natsir",
   "Nugroho",
@@ -50,6 +74,10 @@ module["exports"] = [
   "Nainggolan",
   "Nababan",
   "Napitupulu",
+  "Nugraha",
+  "Nanda",
+  "Oktavian",
+  "Oktovian",
   "Pangestu",
   "Putra",
   "Pranowo",
@@ -63,9 +91,16 @@ module["exports"] = [
   "Permadi",
   "Prasasta",
   "Prayoga",
+  "Perdana",
+  "Purnawarman",
+  "Purnama",
+  "Purwadi",
   "Ramadan",
   "Rajasa",
   "Rajata",
+  "Rendra",
+  "Rayhan",
+  "Rahardian",
   "Saptono",
   "Santoso",
   "Saputra",
@@ -88,6 +123,11 @@ module["exports"] = [
   "Sirait",
   "Siregar",
   "Situmorang",
+  "Syahreza",
+  "Sabian",
+  "Satria",
+  "Supriyanto",
+  "Sudrajat",
   "Tampubolon",
   "Thamrin",
   "Tamba",
@@ -104,5 +144,10 @@ module["exports"] = [
   "Wacana",
   "Waskita",
   "Wasita",
+  "Wicaksono",
+  "Wardana",
+  "Yulianto",
+  "Yanuar",
+  "Yudhistira",
   "Zulkarnain"
 ];
\ No newline at end of file
diff --git a/lib/vehicle.js b/lib/vehicle.js
index 7f1ae782..125055e6 100644
--- a/lib/vehicle.js
+++ b/lib/vehicle.js
@@ -129,6 +129,20 @@ var Vehicle = function (faker) {
         "description": "Generates a vehicle vrm",
         "sampleResults": ["MF56UPA", "GL19AAQ", "SF20TTA"]
     };
+
+  /**
+  * bicycle
+  *
+  * @method faker.vehicle.bicycle
+  */
+  self.bicycle = function () {
+    return faker.random.arrayElement(faker.definitions.vehicle.bicycle_type);
+  };
+
+  self.bicycle.schema = {
+    "description": "Generates a type of bicycle",
+    "sampleResults": ["Adventure Road Bicycle", "City Bicycle", "Recumbent Bicycle"]
+  };
 };
 
 module["exports"] = Vehicle;