From f698e1da115b30635d02b0ef3e7ded147f8fc681 Mon Sep 17 00:00:00 2001 From: Pascal Schumacher Date: Tue, 24 Oct 2017 01:04:29 +0200 Subject: [PATCH] use new and updated .yml files from ruby faker (#262) * use new and updated .yml files from ruby faker * fix WitcherTest#testWitcher regex * fix PokemonTest#name regex --- src/main/resources/de.yml | 10 +++- src/main/resources/en-MS.yml | 41 ++++++++++++++ src/main/resources/fr.yml | 7 ++- src/main/resources/ja.yml | 1 + src/main/resources/ko.yml | 1 + src/main/resources/nl.yml | 54 +++++++++---------- src/main/resources/ru.yml | 6 +++ src/main/resources/zh-CN.yml | 29 +++++++++- .../com/github/javafaker/PokemonTest.java | 2 +- .../com/github/javafaker/WitcherTest.java | 2 +- 10 files changed, 121 insertions(+), 32 deletions(-) create mode 100644 src/main/resources/en-MS.yml diff --git a/src/main/resources/de.yml b/src/main/resources/de.yml index 772daf37..7051bdcc 100644 --- a/src/main/resources/de.yml +++ b/src/main/resources/de.yml @@ -98,7 +98,7 @@ de: product_name: adjective: [Kleine, Ergonomische, Rustikale, Intelligente, Wunderschöne, Unglaubliche, Fantastische, Praktische, Elegante, Tolle, Enorme, Mittelmäßige, Synergetische, Schwerlast, Leichte, Aerodynamische, Haltbare] material: [Stahl, Holz, Beton, Plastik, Baumwoll, Granit, Gummi, Leder, Seiden, Wolle, Leinen, Marmor, Eisen, Bronze, Kupfer, Aluminium, Papier] - product: [Stühle, Autos, Computer, Handschue, Hosen, Hemden, Tische, Schuhe, Hüte, Teller, Messer, Flaschen, Jacke, Lampe, Tastatur, Tasche, Bank, Uhr, Armbanduhr, Geldbörse] + product: [Stühle, Autos, Computer, Handschuhe, Hosen, Hemden, Tische, Schuhe, Hüte, Teller, Messer, Flaschen, Jacke, Lampe, Tastatur, Tasche, Bank, Uhr, Armbanduhr, Geldbörse] phone_number: formats: ['(0###) #########', '(0####) #######', '+49-###-#######', '+49-####-########'] @@ -153,3 +153,11 @@ de: spices: ["Ajowan", "Anis", "Annatto", "Asant", "Bärlauch", "Bärwurz", "Basilikum", "Beifuß", "Berbere", "Bergkümmel", "Bertram", "Bockshornklee", "Bohnenkraut", "Borretsch", "Brunnenkresse", "Cardamom", "Cayennepfeffer", "Chili", "Cilantro", "Cumin", "Curcuma", "Curryblätter", "Currykraut", "Currypulver", "Dill", "Dost", "Eberraute", "Einlegegewürz", "Engelwurz", "Epazote", "Estragon", "Färberdistel", "Fenchel", "Fetthenne", "Gagel", "Galgant", "Galgant", "Gänseblümchen", "Garam", "Gelbwurz", "Gochujang", "Gomashio", "Gurkenkraut", "Harissa", "Herbes", "Honig", "gemeiner", "Ingwer", "Kaffernlimette", "Kakaopulver", "Kalmus", "Kapern", "Kapuzinerkresse", "Grüner", "Schwarzer", "Kerbel", "Kemirinuss", "Knoblauch", "Koriander", "Kren", "Kresse", "Große", "Kreuzkümmel", "Kubebenpfeffer", "Kümmel", "Kürbis", "Kurkuma", "Langer", "Lakritze", "Lavendel", "Liebstöckel", "Limette", "Lorbeer", "Lorbeer", "Löffelkraut", "Macis", "Mandel", "Majoran", "spreizende", "Meerrettich", "Melisse", "Minze", "Mitsuba", "Mohnsamen", "Muskat", "Myrrhenkerbel", "Nelkenpfeffer", "Ölkürbis", "Orangen", "Oregano", "Pandanus", "Paradieskörner", "Paprika", "Pastinake", "Peperoni", "Perilla", "Petersilie", "Pfeffer", "Pfefferminze", "Piment", "Pimpinelle", "Portulak", "Quendel", "Ras", "Rhabarber", "Rosmarin", "Rotwein", "Rouille", "Rucola", "Safran", "Salbei", "Salz", "Sambal", "Sassafras", "Sauerampfer", "Schabzigerklee", "Schalotte", "Schafgarbe", "Schnittknoblauch", "Schnittlauch", "Schwarzkümmel", "Sellerie", "Senf", "Soumbala", "Spitzwegerich", "Sternanis", "Stevia", "Sumach", "Süßdolde", "Süßholz", "Szechuanpfeffer", "Tamarinde", "Tanduri", "Tasmanischer", "Tonkabohne", "Thymian", "Tripmadam", "Trüffel", "Tschubritza", "Wasabi", "Wacholder", "Waldmeister", "Wald-Weidenröschen", "Wasserpfeffer", "Weinblätter", "Weinraute", "Ysop", "Zichorie", "Zimt", "Zitronengras", "Zitronenmelisse", "Zitronen", "Zitronenstrauch", "Zitronenthymian", "Zitwerwurzel", "Zucker", "Zwiebel"] measurements: ["Teelöffel", "Esslöffel", "Tasse", "Prise", "Messerspitze", "Packung"] measurement_sizes: ["1/4", "1/3", "1/2", "1", "2", "3"] + + simpsons: + characters: [ "Homer Simpson", "Marge Simpson", "Bart Simpson", "Lisa Simpson", "Maggie Simpson", "Grampa Simpson", "Abraham Jedediah \"Abe\" Simpson", "Patty Bouvier", "Selma Bouvier", "Mona Bouvier", "Charles Montgomery Burns", "Waylon Smithers", "Lenford \"Lenny\" Leonard", "Carl Carlson", "Charlie", "Ned Flanders", "Maude Flanders", "Rod Flanders", "Todd Flanders", "Janey Powell", "Ralph Wiggum", "Becky", "Alison Taylor", "Database", "Lewis", "Martin Prince", "Milhouse van Houten", "Nelson Muntz", "Richard", "Jaffee", "Melissa", "Sherri", "Terri", "Wendell Borton", "Dolphin Starbeam", "Jimbo Jones", "Kearney Zzyzwicz", "Uter Zörker", "Rektor Seymour Skinner", "Oberschulrat Chalmers", "Edna Krabappel", "Elizabeth Hoover", "Dewey Largo", "Sportlehrer Mr. Krupt", "Dr. J. Loren Pryor", "Hausmeister Willie", "Küchenhilfe Doris Peterson", "Otto Mann", "Krusty der Clown", "Herschel Krustofski", "Sideshow Raheem", "Tingeltangel-Bob", "Tingeltangel-Mel", "Mr. Teeny", "Bubbles", "Itchy", "Scratchy", "Bienenmann", "Scott Christian", "Kent Brockman", "Arnie Pye", "Rainier Wolfcastle", "Troy McClure", "Lurleen Lumpkin", "Duffman", "Chief Clancy Wiggum", "Lou", "Eddie", "Comicbuchverkäufer", "Roger Meyers Junior", "Artie Ziff", "Horatio McCallister", "Alter Kapitän", "Lothar Folkman", "Luigi Risotto", "Aristotle Amadopolis", "Herman", "Lindsay Naegle", "Cookie Kwan", "Dr. Julius Hibbert", "Dr. Nick Riviera", "Dr. Marvin Monroe", "Jasper Beardley", "Ralph Melish", "Hans Maulwurf", "Asa", "Mrs. Glick", "Sylvia Winfield", "Mr. Winfield", "Morris \"Moe\" Szyslak", "Barney Gumble", "Sam", "Larry", "Akira", "Joseph Quimby", "Freddy Quimby", "Mary Bailey", "Roy Snyder", "Constance Harm", "Lionel Hutz", "Blauhaariger Anwalt", "Gil Gunderson", "Der alte Gil", "In der Kirche", "Reverend Timothy Lovejoy", "Helen Lovejoy", "Jessica Lovejoy", "Anthony \"Fat Tony\" D'Amico", "Legs", "Louie", "Johnny", "Schmallippe", "Jacques Brunswick", "Disco Stu", "Eleanor Abernathy", "Katzenlady", "Prof. Frink", "Kirk van Houten", "Luann van Houten", "Shauna Tifton", "Prinzessin Kashmir", "Snake", "Jeremy Peterson", "Agnes Skinner", "Cletus Spuckler", "Brandine Spuckler", "Mary Spuckler", "Apu Nahasapeemapetilon", "Manjula Nahasapeemapetilon", "Zahnfleischbluter Murphy", "Reicher Texaner", "Hyman Krustofski", "Laura Powers", "Ruth Powers", "Drederick Tatum", "Kang", "Kodos" ] + dr_who: + the_doctors: [ + "Erster Doktor", "Zweiter Doktor", "Dritter Doktor", "Vierter Doktor", "Fünfter Doktor", "Sechster Doktor", + "Siebenter Doktor", "Achter Doktor", "Neunter Doktor", "Zehnter Doktor", "Elfter Doktor", "Zwölfter Doktor" + ] diff --git a/src/main/resources/en-MS.yml b/src/main/resources/en-MS.yml new file mode 100644 index 00000000..f7aaf435 --- /dev/null +++ b/src/main/resources/en-MS.yml @@ -0,0 +1,41 @@ +en-MS: + faker: + name: + prefix: [Dato, Datin] + malay_male_first_name: [Abu, Ahmad, Malik, Osman, Abdullah, Abu Bakar, Azuan, Sulaiman, Daud, Azizi, Jaafar] + malay_female_first_name: [Siti, Aminah, Aiza, Hajar, Sofia, Dahlia, Akma, Nur, Sariha, Syazana, Nuratika, Farah] + chinese_male_first_name: [Jin Quan, Wen Jun, Jun Jie, Cheng Han, Tze-Kwang, Jin Leong, Zi Liang, Zhi Ren, Jin Quan, Wen Jun, Chee Hin, Guo Jun, Kai Jie, Kun Qiang,Jun Kiat, Yong Zheng, Yong Jun, Chit Boon, You Ren, Wen Zhong, Yang Shun, Qi Guang, Kang Soon, Wee Heng, Kah Yang, Siew Beng, Jia Woei, Chean Meng, Wai Kay, Keng Hua, Yew Meng, Cheng Wen, Jiun Wei, Yee Sian, Shao Hong, Bin Shen, Wing Yiu, Ee Hong, Yu Pyn, Yong Sheng, Jun Peng, Jia Jie, Guang Yi, Si Heng, Wei Hou, Kang Sheng, Hong Ern, Jia Liang, Wei Lip, Wee Chen, Wee Leng, Yu Xi, Ming Yang, Wen Hao, Siang Meng, Mong Li, Ghim Huat, Jun Yi, Jie Kai, Zhiming, Wei Jie, Teng Qing, Wei Jian, Wei Kwan, Chee Chin] + chinese_male_last_name: [Tan, Lim, Lee, Ng, Ong, Wong, Goh, Chua, Chan, Koh, Teo, Ang, Yeo, Tay, Ho, Low] + chinese_female_first_name: [Xiu Yi, Wai Teng, Sing Yee, Jing Yi, Jia Yee, Jia Xuan, Shu En, Pei Ying, Pei Yu, Pih Foung, Li-ann, Shi Xuan, Yi Xuan, Shu En, Yi Xin, Hui Juan, Yu En, Yihui, Xin Yi, Yun Xuan, Xuan Xuan] + first_name: + - "#{malay_male_first_name}" + - "#{malay_female_first_name}" + - "#{chinese_male_first_name}" + - "#{chinese_female_first_name}" + name: + - "#{malay_male_first_name} bin #{malay_male_first_name}" + - "#{malay_female_first_name} binti #{malay_male_first_name}" + - "#{chinese_male_last_name} #{chinese_male_first_name}" + - "#{chinese_female_first_name} #{chinese_male_first_name}" + - "#{prefix} #{malay_male_first_name} bin #{malay_male_first_name}" + - "#{prefix} #{malay_female_first_name} binti #{malay_male_first_name}" + - "#{prefix} #{chinese_male_last_name} #{chinese_male_first_name}" + - "#{prefix} #{chinese_female_first_name} #{chinese_male_first_name}" + address: + city_name: [Subang Jaya, Kuala Lumpur, Johor Bahru, Ipoh, Klang, Seberang Perai, Ampang, Georgetown, Gombak, Kuching, Shah Alam, Seremban, Petaling Jaya, Cheras, Bandaraya Melaka, Kota Bharu, Kota Kinabalu, Kuantan, Sungai Petani, Kajang, Batu Pahat, Tawau, Sandakan, Alor Setar, Kuala Terengganu, Taiping, Miri, Kluang, Kulim, Selayang, Kulai, Sibu, Muar, Manjung, Perlis, Kubang Pasu, Sepang, Teluk Intan, Lahad Datu, Kota Tinggi, Segamat, Pasir Mas, Bintulu, Alor Gajah, Kerian, Batang Padang, Keningau, Kemaman, Temerloh, Kuala Kangsar, Pontian, Dungun, Tumpat, Kinabatangan, Besut, Semporna, Ledang, Baling, Jasin, Bachok, Papar, Penampang, Tanah Merah, Bentong, Pasir Puteh, Jempol, Maran, Port Dickson, Rompin, Pekan, Kuala Krai, Beluran, Sabak Bernam, Tuaran, Perak Tengah, Bera, Marang, Ranau, Raub, Pendang, Langkawi, Kota Belud, Machang, Serian, Hulu Perak, Jerantut, Gua Musang, Lipis, Samarahan, Labuan, Kudat, Tampin, Putrajaya, Hulu Terengganu, Mersing, Yan, Kota Marudu, Sik, Sri Aman, Beaufort, Kuala Pilah, Marudi, Kuala Nerang, Kunak, Betong, Sarikei, Tenom, Kapit, Putatan, Setiu, Bau, Pokok Sena, Limbang, Saratok, Rembau, Mukah, Bandar Baharu, Jeli, Simunjan, Jelebu, Pitas, Cameron Highlands, Lawas, Tambunan, Tongod, Belaga, Sipitang, Lundu, Nabawan, Asajaya, Daro, Tatau, Maradong, Kanowit, Lubok Antu, Selangau, Song, Kuala Penyu, Dalat, Matu, Julau, Pakan, Padawan, Lojing, Kampa, Muallim] + city: + - "#{city_name}" + province: [Johor, Kedah, Kelantan, Melaka, Negeri Sembilan, Pahang, Pulau Pinang, Perak, Perlis, Selangor, Terengganu, Sabah, Sarawak, WP Kuala Lumpur, WP Labuan, WP Putrajaya] + postcode: ['#####'] + building_number: ['##'] + street_prefix: [Jalan, Lorong, Pinggiran, Medan, Persiaran, Selekoh, Persisiran, Perkarangan, Pengkalan, Lurah, Lintang, Lingkungan, Lingkaran, Lengkung, Lengkok, Lebuhraya, Lebuh, Langgak, Laman, Halaman, Gerbang, Dataran, Bulatan, Laluan] + street_title: [Makmur, Bukit Bintang, Bangsar, Chow Kit, Hang Jebat, Hang Tuah, Kinabalu, Kuching, Maharajalela, Masjid India, Istana, Pudu] + street_name: + - "#{street_prefix} #{street_title}" + street_address: + - "No. #{building_number}, #{street_name}" + default_country: [Malaysia] + phone_number: + formats: ['03#######', '+601########'] + bank: + name: [Affin Bank Berhad, Agro Bank Berhad, Alliance Bank Malaysia Berhad, AmBank Berhad, Bank Islam Berhad, Bank Muamalat Berhad, Bank Rakyat Berhad, Bank Simpanan Nasional, CIMB Bank Berhad, Hong Leong Bank Berhad, Malayan Banking Berhad, Public Bank Berhad, RHB Bank Berhad, Tabung Haji] diff --git a/src/main/resources/fr.yml b/src/main/resources/fr.yml index 81eaa2d8..4d03a7c8 100644 --- a/src/main/resources/fr.yml +++ b/src/main/resources/fr.yml @@ -60,4 +60,9 @@ fr: book: title: ['La Discipline des orphelins', 'Le Couloir de tous les mépris', "L'Odeur du sanglier", 'La Promise du voyeur', "L'Odyssée invisible", 'La Soumission comme passion', 'Le Siècle de la rue voisine', 'Le Désir des femmes fortes', 'Pourquoi je mens ?', 'La Peau des savants', 'La progéniture du mal'] author: "#{Name.name}" - publisher: ['Éditions du Soleil', 'La Perdrix', 'Les Éditions jaune turquoise', 'Bordel père et fils', 'Au lecteur éclairé', 'Lire en dormant'] \ No newline at end of file + publisher: ['Éditions du Soleil', 'La Perdrix', 'Les Éditions jaune turquoise', 'Bordel père et fils', 'Au lecteur éclairé', 'Lire en dormant'] + + pokemon: + names: ["Bulbizarre", "Herbizarre", "Florizarre", "Salamèche", "Reptincel", "Dracaufeu", "Carapuce", "Carabaffe", "Tortank", "Chenipan", "Chrysacier", "Papilusion", "Aspicot", "Coconfort", "Dardargnan", "Roucool", "Roucoups", "Roucarnage", "Rattata", "Rattatac", "Piafabec", "Rapasdepic", "Abo", "Arbok", "Pikachu", "Raichu", "Sabelette", "Sablaireau", "Nidoran", "Nidorina", "Nidoqueen", "Nidoran", "Nidorino", "Nidoking", "Mélofée", "Mélodelfe", "Goupix", "Feunard", "Rondoudou", "Grodoudou", "Nosférapti", "Nosféralto", "Mystherbe", "Ortide", "Rafflésia", "Paras", "Parasect", "Mimitoss", "Aéromite", "Taupiqueur", "Triopikeur", "Miaouss", "Persian", "Psykokwak", "Akwakwak", "Férosinge", "Colossinge", "Canidos", "Arcanin", "Ptitard", "Tétarte", "Tartard", "Abra", "Kadabra", "Alakazam", "Machoc", "Machopeur", "Mackogneur", "Chétiflor", "Boustiflor", "Empiflor", "Tentacool", "Tentacruel", "Racaillou", "Gravalanche", "Grolem", "Ponyta", "Galopa", "Ramoloss", "Flagadoss", "Magnéti", "Magnéton", "Canarticho", "Doduo", "Dodrio", "Otaria", "Lamantine", "Tadmorv", "Grotadmorv", "Kokyas", "Crustabri", "Fantominus", "Spectrum", "Ectoplasma", "Onix", "Soporifik", "Hypnomade", "Krabby", "Kraboss", "Voltorb", "Electrode", "Noeunoeuf", "Noadkoko", "Osselait", "Ossatueur", "Kicklee", "Tygnon", "Excelangue", "Smogo", "Smogogo", "Rhinocorne", "Rhinoféros", "Leveinard", "Saquedeneu", "Kangourex", "Hypotrempe", "Hypocéan", "Poissirène", "Poissoroy", "Stari", "Staross", "Mr. Mime", "Insécateur", "Lippoutou", "Elektek", "Magmar", "Scarabrute", "Tauros", "Magicarpe", "Léviator", "Lokhlass", "Métamorph", "Evoli", "Aquali", "Voltali", "Pyroli", "Porygon", "Amonita", "Amonistar", "Kabuto", "Kabutops", "Ptéra", "Ronflex", "Artikodin", "Electhor", "Sulfura", "Minidraco", "Draco", "Dracolosse", "Mewtwo", "Mew"] + locations: ["Arabelle", "Roche-sur-Gliffe", "Flusselles", "Rotombourg", "Quarellis", "Pavonnay", "Ecorcia", "Ville noire", "Ebenelle", "Fort-Vanitas", "Joliberge", "Volucité", "Celadopole", "Célestia", "Azuria", "Ville-Griotte", "Irisia", "Cramois'Île", "Port Tempères", "Mozheim", "Relifac-le-Haut", "La Frescale", "Myokara", "Port Yoneuve", "Rosalia", "Vestigion", "Eternara", "Autéquia", "Zone de Combat", "Île 5", "Floraville", "Amaillide", "Cimetronelle", "Île 4", "Atrium Combat", "Parmanie", "Cromlac'h", "Doublonville", "Unionpolis", "Papeloa", "Flocombe", "Féli-Cité", "Batisques", "Entrelasque", "Vermilava", "Lavanville", "Romant-sous-Bois", "Arpentières", "Bourg-en-Vol", "Nénucrique", "Illumis", "Acajou", "Lavandia", "Parsemille", "Algatia", "Maillard", "Bourg Geon", "Méanville", "Renouet", "Rosyères", "Oliville", "Île 1", "Janusia", "Charbourg", "Pacifiville", "Bourg Palette", "Verchamps", "Clémenti-Ville", "Argenta", "Aire de Détente", "Mérouville", "Portail Safari", "Safrania", "Littorella", "Neuvartault", "Ogoesse", "Île 7", "Yantreizh", "Île 6", "Poivressel", "Auffrac-les-Congères", "Frimapic", "Bonville", "Atalanopolis", "Rivamar", "Aire de Survie", "Île 3", "Bonaugure", "Île 2", "Vaguelone", "Bourg Croquis", "Voilaroc", "Vergazon", "Carmin sur Mer", "Mauville", "Ondes-sur-Mer", "Jadielle", "Forêt Blanche"] + moves: ["Vol-Vie", "Acide", "Acidarmure", "Hâte", "Amnésie", "Onde Boréale", "Pilonnage", "Bouclier", "Patience", "Etreinte", "Morsure", "Blizzard", "Plaquage", "Massd'Os", "Osmerang", "Ecume", "Bulles d'O", "Claquoir", "Poing Comète", "Onde Folie", "Choc Mental", "Constriction", "Conversion", "Riposte", "Pince-Masse", "Coupe", "Boul'Armure", "Tunnel", "Entrave", "Uppercut", "Double-Pied", "Torgnoles", "Reflet", "Damoclès", "Draco-Rage", "Dévorêve", "Bec Vrille", "Séisme", "Bomb'Oeuf", "Flammèche", "Explosion", "Déflagration", "Poing de Feu", "Danse Flamme", "Abîme", "Lance-Flamme", "Flash", "Vol", "Puissance", "Furie", "Combo-Griffe", "Regard Médusant", "Rugissement", "Croissance", "Guillotine", "Tornade", "Armure", "Buée Noire", "Coup d'Boule", "Pied Voltige", "Koud'Korne", "Empal'Korne", "Hydrocanon", "Ultralaser", "Croc de Mort", "Hypnose", "Laser Glace", "Poing-Glace", "Pied Sauté", "Poing Karaté", "Télékinésie", "Vampirisme", "Vampigraine", "Groz'Yeux", "Léchouille", "Mur Lumière", "Grobisou", "Balayage", "Yoga", "Méga-Sangsue", "Ultimawashi", "Ultimapoing", "Métronome", "Copie", "Lilliput", "Mimique", "Brume", "Ombre Nocturne", "Jackpot", "Picpic", "Danse-Fleur", "Dard-Nuée", "Gaz Toxik", "Poudre Poison", "Dard-Venin", "Ecras'Face", "Rafale Psy", "Psyko", "Vague Psy", "Vive-Attaque", "Frénésie", "Tranch'Herbe", "Coupe-Vent", "Soin", "Protection", "Repos", "Hurlement", "Eboulement", "Jet-Pierres", "Mawashi Geri", "Jet de Sable", "Griffe", "Grincement", "Amplitude", "Destruction", "Affûtage", "Berceuse", "Coud'Krâne", "Piqué", "Souplesse", "Tranche", "Poudre Dodo", "Détritus", "Purédpois", "Brouillard", "E-Coque", "Lance-Soleil", "Sonicboom", "Picanon", "Trempette", "Spore", "Ecrasement", "Force", "Sécrétion", "Lutte", "Para-Spore", "Sacrifice", "Clonage", "Croc Fatal", "Ultrason", "Surf", "Météores", "Danse-Lames", "Charge", "Mimi-Queue", "Bélier", "Téléport", "Mania", "Fatal-Foudre", "Poing-Eclair", "Eclair", "Cage-Eclair", "Tonnerre", "Toxic", "Morphing", "Triplattaque", "Double-Dard", "Force Poigne", "Fouet Liane", "Pistolet à O", "Cascade", "Cyclone", "Cru-Aile", "Repli", "Ligotage"] diff --git a/src/main/resources/ja.yml b/src/main/resources/ja.yml index bc727326..9c56c4fd 100644 --- a/src/main/resources/ja.yml +++ b/src/main/resources/ja.yml @@ -14,6 +14,7 @@ ja: street_name: - "#{Name.first_name}#{street_suffix}" - "#{Name.last_name}#{street_suffix}" + default_country: [日本] phone_number: formats: ['0####-#-####', '0###-##-####', '0##-###-####', '0#-####-####'] diff --git a/src/main/resources/ko.yml b/src/main/resources/ko.yml index 6e1d5020..9f45baf4 100644 --- a/src/main/resources/ko.yml +++ b/src/main/resources/ko.yml @@ -12,6 +12,7 @@ ko: street_suffix: ["읍", "면", "동"] street_name: - "#{street_root}#{street_suffix}" + default_country: [대한민국] phone_number: formats: ['0#-#####-####', '0##-###-####', '0##-####-####'] diff --git a/src/main/resources/nl.yml b/src/main/resources/nl.yml index 1108662e..c4782a47 100644 --- a/src/main/resources/nl.yml +++ b/src/main/resources/nl.yml @@ -9,31 +9,31 @@ nl: - "#{city_prefix} #{Name.first_name}#{city_suffix}" - "#{city_prefix} #{Name.last_name}#{city_suffix}" country: [ "Afghanistan", "Akrotiri", "Albanië", "Algerije", "Amerikaanse Maagdeneilanden", "Amerikaans-Samoa", "Andorra", "Angola", "Anguilla", - "Antarctica", "Antigua en Barbuda", "Noordelijke IJszee", "Argentinië", "Armenië", "Aruba", "Ashmore- en Cartiereilanden", "Atlantische Oceaan", - "Australië", "Azerbeidzjan", "Bahama's", "Bahrein", "Bangladesh", "Barbados", "Belarus", "België", "Belize", "Benin", "Bermuda", "Bhutan", - "Bolivië", "Bosnië-Herzegovina", "Botswana", "Bouveteiland", "Brazilië", "Brits Indische Oceaanterritorium", "Britse Maagdeneilanden", + "Antarctica", "Antigua en Barbuda", "Noordelijke IJszee", "Argentinië", "Armenië", "Aruba", "Ashmore- en Cartiereilanden", "Atlantische Oceaan", + "Australië", "Azerbeidzjan", "Bahama's", "Bahrein", "Bangladesh", "Barbados", "Belarus", "België", "Belize", "Benin", "Bermuda", "Bhutan", + "Bolivië", "Bosnië-Herzegovina", "Botswana", "Bouveteiland", "Brazilië", "Brits Indische Oceaanterritorium", "Britse Maagdeneilanden", "Brunei", "Bulgarije", "Burkina Faso", "Burundi", "Cambodja", "Canada", "Caymaneilanden", "Centraal-Afrikaanse Republiek", "Chili", "China", - "Christmaseiland", "Clipperton", "Cocoseilanden", "Colombia", "Comoren (Unie)", "Congo (Democratische Republiek)", - "Congo (Volksrepubliek)", "Cook", "Coral Sea Islands", "Costa Rica", "Cuba", "Cyprus", "Denemarken", "Dhekelia", "Djibouti", "Dominica", - "Dominicaanse Republiek", "Duitsland", "Ecuador", "Egypte", "El Salvador", "Equatoriaal-Guinea", "Eritrea", "Estland", "Ethiopië", - "Europese Unie", "Falkland", "Faeröer", "Fiji", "Filipijnen", "Finland", "Frankrijk", "Frans-Polynesië", - "Franse Zuidelijke en Antarctische Gebieden", "Gabon", "Gambia", "Gaza Strip", "Georgië", "Ghana", "Gibraltar", "Grenada", "Griekenland", - "Groenland", "Guam", "Guatemala", "Guernsey", "Guinea", "Guinee-Bissau", "Guyana", "Haïti", "Heard en McDonaldeilanden", "Heilige Stoel", - "Honduras", "Hongarije", "Hongkong", "Ierland", "IJsland", "India", "Indian Ocean", "Indonesië", "Irak", "Iran", "Isle of Man", "Israël", - "Italië", "Ivoorkust", "Jamaica", "Jan Mayen", "Japan", "Jemen", "Jersey", "Jordanië", "Kaapverdië", "Kameroen", "Kazachstan", "Kenia", - "Kirgizstan", "Kiribati", "Koeweit", "Kroatië", "Laos", "Lesotho", "Letland", "Libanon", "Liberia", "Libië", "Liechtenstein", "Litouwen", - "Luxemburg", "Macao", "Macedonië", "Madagaskar", "Malawi", "Maldiven", "Maleisië", "Mali", "Malta", "Marokko", "Marshalleilanden", "Mauritanië", - "Mauritius", "Mayotte", "Mexico", "Micronesia, Federale Staten van", "Moldavië", "Monaco", "Mongolië", "Montenegro", "Montserrat", "Mozambique", - "Myanmar", "Namibië", "Nauru", "Navassa", "Nederland", "Nederlandse Antillen", "Nepal", "Ngwane", "Nicaragua", "Nieuw-Caledonië", - "Nieuw-Zeeland", "Niger", "Nigeria", "Niue", "Noordelijke Marianen", "Noord-Korea", "Noorwegen", "Norfolk (eiland)", "Oekraïne", "Oezbekistan", - "Oman", "Oostenrijk", "Grote Oceaan", "Pakistan", "Palau", "Panama", "Papoea-Nieuw-Guinea", "Paracel Islands", "Paraguay", "Peru", "Pitcairn", - "Polen", "Portugal", "Puerto Rico", "Qatar", "Roemenië", "Rusland", "Rwanda", "Saint Helena", "Saint Lucia", "Saint Vincent en de Grenadines", - "Saint-Pierre en Miquelon", "Salomon", "Samoa", "San Marino", "São Tomé en Principe", "Saudi-Arabië", "Senegal", "Servië", "Seychellen", - "Sierra Leone", "Singapore", "Sint-Kitts en Nevis", "Slovenië", "Slowakije", "Soedan", "Somalië", "South Georgia and the South Sandwich Islands", - "Zuidelijke Oceaan", "Spanje", "Spratly Islands", "Sri Lanka", "Suriname", "Svalbard", "Syrië", "Tadzjikistan", "Taiwan", "Tanzania", "Thailand", - "Timor Leste", "Togo", "Tokelau", "Tonga", "Trinidad en Tobago", "Tsjaad", "Tsjechië", "Tunesië", "Turkije", "Turkmenistan", - "Turks-en Caicoseilanden", "Tuvalu", "Uganda", "Uruguay", "Vanuatu", "Venezuela", "Verenigd Koninkrijk", "Verenigde Arabische Emiraten", - "Verenigde Staten van Amerika", "Vietnam", "Wake (eiland)", "Wallis en Futuna", "Wereld", "Westelijke Jordaanoever", "Westelijke Sahara", "Zambia", + "Christmaseiland", "Clipperton", "Cocoseilanden", "Colombia", "Comoren (Unie)", "Congo (Democratische Republiek)", + "Congo (Volksrepubliek)", "Cook", "Coral Sea Islands", "Costa Rica", "Cuba", "Cyprus", "Denemarken", "Dhekelia", "Djibouti", "Dominica", + "Dominicaanse Republiek", "Duitsland", "Ecuador", "Egypte", "El Salvador", "Equatoriaal-Guinea", "Eritrea", "Estland", "Ethiopië", + "Europese Unie", "Falkland", "Faeröer", "Fiji", "Filipijnen", "Finland", "Frankrijk", "Frans-Polynesië", + "Franse Zuidelijke en Antarctische Gebieden", "Gabon", "Gambia", "Gaza Strip", "Georgië", "Ghana", "Gibraltar", "Grenada", "Griekenland", + "Groenland", "Guam", "Guatemala", "Guernsey", "Guinea", "Guinee-Bissau", "Guyana", "Haïti", "Heard en McDonaldeilanden", "Heilige Stoel", + "Honduras", "Hongarije", "Hongkong", "Ierland", "IJsland", "India", "Indian Ocean", "Indonesië", "Irak", "Iran", "Isle of Man", "Israël", + "Italië", "Ivoorkust", "Jamaica", "Jan Mayen", "Japan", "Jemen", "Jersey", "Jordanië", "Kaapverdië", "Kameroen", "Kazachstan", "Kenia", + "Kirgizstan", "Kiribati", "Koeweit", "Kroatië", "Laos", "Lesotho", "Letland", "Libanon", "Liberia", "Libië", "Liechtenstein", "Litouwen", + "Luxemburg", "Macao", "Macedonië", "Madagaskar", "Malawi", "Maldiven", "Maleisië", "Mali", "Malta", "Marokko", "Marshalleilanden", "Mauritanië", + "Mauritius", "Mayotte", "Mexico", "Micronesia, Federale Staten van", "Moldavië", "Monaco", "Mongolië", "Montenegro", "Montserrat", "Mozambique", + "Myanmar", "Namibië", "Nauru", "Navassa", "Nederland", "Nederlandse Antillen", "Nepal", "Ngwane", "Nicaragua", "Nieuw-Caledonië", + "Nieuw-Zeeland", "Niger", "Nigeria", "Niue", "Noordelijke Marianen", "Noord-Korea", "Noorwegen", "Norfolk (eiland)", "Oekraïne", "Oezbekistan", + "Oman", "Oostenrijk", "Grote Oceaan", "Pakistan", "Palau", "Panama", "Papoea-Nieuw-Guinea", "Paracel Islands", "Paraguay", "Peru", "Pitcairn", + "Polen", "Portugal", "Puerto Rico", "Qatar", "Roemenië", "Rusland", "Rwanda", "Saint Helena", "Saint Lucia", "Saint Vincent en de Grenadines", + "Saint-Pierre en Miquelon", "Salomon", "Samoa", "San Marino", "São Tomé en Principe", "Saudi-Arabië", "Senegal", "Servië", "Seychellen", + "Sierra Leone", "Singapore", "Sint-Kitts en Nevis", "Slovenië", "Slowakije", "Soedan", "Somalië", "South Georgia and the South Sandwich Islands", + "Zuidelijke Oceaan", "Spanje", "Spratly Islands", "Sri Lanka", "Suriname", "Svalbard", "Syrië", "Tadzjikistan", "Taiwan", "Tanzania", "Thailand", + "Timor Leste", "Togo", "Tokelau", "Tonga", "Trinidad en Tobago", "Tsjaad", "Tsjechië", "Tunesië", "Turkije", "Turkmenistan", + "Turks-en Caicoseilanden", "Tuvalu", "Uganda", "Uruguay", "Vanuatu", "Venezuela", "Verenigd Koninkrijk", "Verenigde Arabische Emiraten", + "Verenigde Staten van Amerika", "Vietnam", "Wake (eiland)", "Wallis en Futuna", "Wereld", "Westelijke Jordaanoever", "Westelijke Sahara", "Zambia", "Zimbabwe", "Zuid-Afrika", "Zuid-Korea", "Zweden", "Zwitserland"] building_number: ["#", "##", "###", "###a", "###b", "###c", "### I", "### II", "### III"] street_suffix: ["straat", "laan", "weg", "plantsoen", "park"] @@ -44,7 +44,7 @@ nl: street_address: - "#{street_name} #{building_number}" - postcode: ["#### ??"] + postcode: /\d{4} [A-Z]{2}/ state: ["Noord-Holland", "Zuid-Holland", "Utrecht", "Zeeland", "Overijssel", "Gelderland", "Drenthe", "Friesland", "Groningen", "Noord-Brabant", "Limburg"] default_country: [Nederland] @@ -52,7 +52,7 @@ nl: suffix: [BV, V.O.F., Group, en Zonen] internet: - free_email: [gmail.com, yahoo.com, hotmail.nl, live.nl] + free_email: [gmail.com, yahoo.com, hotmail.nl, live.nl, outlook.com, kpnmail.nl] domain_suffix: [nl, com, net, org] lorem: @@ -60,7 +60,7 @@ nl: supplemental: [abbas, abduco, abeo, abscido, absconditus, absens, absorbeo, absque, abstergo, absum, abundans, abutor, accedo, accendo, acceptus, accipio, accommodo, accusator, acer, acerbitas, acervus, acidus, acies, acquiro, acsi, adamo, adaugeo, addo, adduco, ademptio, adeo, adeptio, adfectus, adfero, adficio, adflicto, adhaero, adhuc, adicio, adimpleo, adinventitias, adipiscor, adiuvo, administratio, admiratio, admitto, admoneo, admoveo, adnuo, adopto, adsidue, adstringo, adsuesco, adsum, adulatio, adulescens, adultus, aduro, advenio, adversus, advoco, aedificium, aeger, aegre, aegrotatio, aegrus, aeneus, aequitas, aequus, aer, aestas, aestivus, aestus, aetas, aeternus, ager, aggero, aggredior, agnitio, agnosco, ago, ait, aiunt, alienus, alii, alioqui, aliqua, alius, allatus, alo, alter, altus, alveus, amaritudo, ambitus, ambulo, amicitia, amiculum, amissio, amita, amitto, amo, amor, amoveo, amplexus, amplitudo, amplus, ancilla, angelus, angulus, angustus, animadverto, animi, animus, annus, anser, ante, antea, antepono, antiquus, aperio, aperte, apostolus, apparatus, appello, appono, appositus, approbo, apto, aptus, apud, aqua, ara, aranea, arbitro, arbor, arbustum, arca, arceo, arcesso, arcus, argentum, argumentum, arguo, arma, armarium, armo, aro, ars, articulus, artificiose, arto, arx, ascisco, ascit, asper, aspicio, asporto, assentator, astrum, atavus, ater, atqui, atrocitas, atrox, attero, attollo, attonbitus, auctor, auctus, audacia, audax, audentia, audeo, audio, auditor, aufero, aureus, auris, aurum, aut, autem, autus, auxilium, avaritia, avarus, aveho, averto, avoco, baiulus, balbus, barba, bardus, basium, beatus, bellicus, bellum, bene, beneficium, benevolentia, benigne, bestia, bibo, bis, blandior, bonus, bos, brevis, cado, caecus, caelestis, caelum, calamitas, calcar, calco, calculus, callide, campana, candidus, canis, canonicus, canto, capillus, capio, capitulus, capto, caput, carbo, carcer, careo, caries, cariosus, caritas, carmen, carpo, carus, casso, caste, casus, catena, caterva, cattus, cauda, causa, caute, caveo, cavus, cedo, celebrer, celer, celo, cena, cenaculum, ceno, censura, centum, cerno, cernuus, certe, certo, certus, cervus, cetera, charisma, chirographum, cibo, cibus, cicuta, cilicium, cimentarius, ciminatio, cinis, circumvenio, cito, civis, civitas, clam, clamo, claro, clarus, claudeo, claustrum, clementia, clibanus, coadunatio, coaegresco, coepi, coerceo, cogito, cognatus, cognomen, cogo, cohaero, cohibeo, cohors, colligo, colloco, collum, colo, color, coma, combibo, comburo, comedo, comes, cometes, comis, comitatus, commemoro, comminor, commodo, communis, comparo, compello, complectus, compono, comprehendo, comptus, conatus, concedo, concido, conculco, condico, conduco, confero, confido, conforto, confugo, congregatio, conicio, coniecto, conitor, coniuratio, conor, conqueror, conscendo, conservo, considero, conspergo, constans, consuasor, contabesco, contego, contigo, contra, conturbo, conventus, convoco, copia, copiose, cornu, corona, corpus, correptius, corrigo, corroboro, corrumpo, coruscus, cotidie, crapula, cras, crastinus, creator, creber, crebro, credo, creo, creptio, crepusculum, cresco, creta, cribro, crinis, cruciamentum, crudelis, cruentus, crur, crustulum, crux, cubicularis, cubitum, cubo, cui, cuius, culpa, culpo, cultellus, cultura, cum, cunabula, cunae, cunctatio, cupiditas, cupio, cuppedia, cupressus, cur, cura, curatio, curia, curiositas, curis, curo, curriculum, currus, cursim, curso, cursus, curto, curtus, curvo, curvus, custodia, damnatio, damno, dapifer, debeo, debilito, decens, decerno, decet, decimus, decipio, decor, decretum, decumbo, dedecor, dedico, deduco, defaeco, defendo, defero, defessus, defetiscor, deficio, defigo, defleo, defluo, defungo, degenero, degero, degusto, deinde, delectatio, delego, deleo, delibero, delicate, delinquo, deludo, demens, demergo, demitto, demo, demonstro, demoror, demulceo, demum, denego, denique, dens, denuncio, denuo, deorsum, depereo, depono, depopulo, deporto, depraedor, deprecator, deprimo, depromo, depulso, deputo, derelinquo, derideo, deripio, desidero, desino, desipio, desolo, desparatus, despecto, despirmatio, infit, inflammatio, paens, patior, patria, patrocinor, patruus, pauci, paulatim, pauper, pax, peccatus, pecco, pecto, pectus, pecunia, pecus, peior, pel, ocer, socius, sodalitas, sol, soleo, solio, solitudo, solium, sollers, sollicito, solum, solus, solutio, solvo, somniculosus, somnus, sonitus, sono, sophismata, sopor, sordeo, sortitus, spargo, speciosus, spectaculum, speculum, sperno, spero, spes, spiculum, spiritus, spoliatio, sponte, stabilis, statim, statua, stella, stillicidium, stipes, stips, sto, strenuus, strues, studio, stultus, suadeo, suasoria, sub, subito, subiungo, sublime, subnecto, subseco, substantia, subvenio, succedo, succurro, sufficio, suffoco, suffragium, suggero, sui, sulum, sum, summa, summisse, summopere, sumo, sumptus, supellex, super, suppellex, supplanto, suppono, supra, surculus, surgo, sursum, suscipio, suspendo, sustineo, suus, synagoga, tabella, tabernus, tabesco, tabgo, tabula, taceo, tactus, taedium, talio, talis, talus, tam, tamdiu, tamen, tametsi, tamisium, tamquam, tandem, tantillus, tantum, tardus, tego, temeritas, temperantia, templum, temptatio, tempus, tenax, tendo, teneo, tener, tenuis, tenus, tepesco, tepidus, ter, terebro, teres, terga, tergeo, tergiversatio, tergo, tergum, termes, terminatio, tero, terra, terreo, territo, terror, tersus, tertius, testimonium, texo, textilis, textor, textus, thalassinus, theatrum, theca, thema, theologus, thermae, thesaurus, thesis, thorax, thymbra, thymum, tibi, timidus, timor, titulus, tolero, tollo, tondeo, tonsor, torqueo, torrens, tot, totidem, toties, totus, tracto, trado, traho, trans, tredecim, tremo, trepide, tres, tribuo, tricesimus, triduana, triginta, tripudio, tristis, triumphus, trucido, truculenter, tubineus, tui, tum, tumultus, tunc, turba, turbo, turpe, turpis, tutamen, tutis, tyrannus, uberrime, ubi, ulciscor, ullus, ulterius, ultio, ultra, umbra, umerus, umquam, una, unde, undique, universe, unus, urbanus, urbs, uredo, usitas, usque, ustilo, ustulo, usus, uter, uterque, utilis, utique, utor, utpote, utrimque, utroque, utrum, uxor, vaco, vacuus, vado, vae, valde, valens, valeo, valetudo, validus, vallum, vapulus, varietas, varius, vehemens, vel, velociter, velum, velut, venia, venio, ventito, ventosus, ventus, venustas, ver, verbera, verbum, vere, verecundia, vereor, vergo, veritas, vero, versus, verto, verumtamen, verus, vesco, vesica, vesper, vespillo, vester, vestigium, vestrum, vetus, via, vicinus, vicissitudo, victoria, victus, videlicet, video, viduata, viduo, vigilo, vigor, vilicus, vilis, vilitas, villa, vinco, vinculum, vindico, vinitor, vinum, vir, virga, virgo, viridis, viriliter, virtus, vis, viscus, vita, vitiosus, vitium, vito, vivo, vix, vobis, vociferor, voco, volaticus, volo, volubilis, voluntarius, volup, volutabrum, volva, vomer, vomica, vomito, vorago, vorax, voro, vos, votum, voveo, vox, vulariter, vulgaris, vulgivagus, vulgo, vulgus, vulnero, vulnus, vulpes, vulticulus, vultuosus, xiphias] name: - first_name: ["Amber", "Anna", "Anne", "Anouk", "Arie", "Bard", "Bas", "Bram", "Britt", "Daan", "Dick", "Emma", "Eva", "Femke", "Finn", "Fleur", "Henk", "Iris", "Isa", "Jan", "Jasper", "Jayden", "Jens", "Jesse", "Johannes", "Julia", "Julian", "Kevin", "Lars", "Lieke", "Lisa", "Lotte", "Lucas", "Luuk", "Maud", "Max", "Mike", "Milan", "Nick", "Niels", "Noa", "Pascal", "Rick", "Roos", "Ruben", "Sander", "Sanne", "Sem", "Sophie", "Stijn", "Sven", "Tessa", "Thijs", "Thijs", "Thomas", "Tim", "Tom"] + first_name: ["Aad", "Aafje", "Aagje", "Aalbert", "Abdelouahab", "Abdul", "Aart", "Amber", "Anna", "Anne", "Anouk", "Arie", "Bard", "Bas", "Bastiaan", "Bauke", "Beau", "Bella", "Bram", "Britt", "Bob", "Caspar", "Caterina", "Catharina", "Daan", "Daniël", "Dani", "Daphne", "Dick", "Emma", "Eva", "Femke", "Finn", "Fleur", "Henk", "Iris", "Isa", "Jan", "Jasper", "Jayden", "Jens", "Jesse", "Johannes", "Julia", "Julian", "Kevin", "Lars", "Lieke", "Lisa", "Lotte", "Lucas", "Luuk", "Maud", "Max", "Mike", "Milan", "Nick", "Niels", "Noa", "Pascal", "Rick", "Roos", "Ruben", "Sander", "Sanne", "Sem", "Sophie", "Stijn", "Sven", "Tessa", "Thijs", "Thijs", "Thomas", "Tim", "Tom", "Tamara", "Tanja", "Tariq", "Tes", "Timo", "Veerle", "Vera", "Viktor", "Walid", "Walter", "Welmoed"] tussenvoegsel: ["van", "van de", "van den", "van 't", "van het", "de", "den"] last_name: ["Bakker", "Beek", "Berg", "Boer", "Bos", "Bosch", "Brink", "Broek", "Brouwer", "Bruin", "Dam", "Dekker", "Dijk", "Dijkstra", "Graaf", "Groot", "Haan", "Hendriks", "Heuvel", "Hoek", "Jacobs", "Jansen", "Janssen", "Jong", "Klein", "Kok", "Koning", "Koster", "Leeuwen", "Linden", "Maas", "Meer", "Meijer", "Mulder", "Peters", "Ruiter", "Schouten", "Smit", "Smits", "Stichting", "Veen", "Ven", "Vermeulen", "Visser", "Vliet", "Vos", "Vries", "Wal", "Willems", "Wit"] prefix: [Dhr., Mevr. Dr., Bsc, Msc, Prof.] diff --git a/src/main/resources/ru.yml b/src/main/resources/ru.yml index 520c593c..ce57231e 100644 --- a/src/main/resources/ru.yml +++ b/src/main/resources/ru.yml @@ -33,6 +33,12 @@ ru: female_first_name: [Анна, Алёна, Алевтина, Александра, Алина, Алла, Анастасия, Ангелина, Анжела, Анжелика, Антонида, Антонина, Анфиса, Арина, Валентина, Валерия, Варвара, Василиса, Вера, Вероника, Виктория, Галина, Дарья, Евгения, Екатерина, Елена, Елизавета, Жанна, Зинаида, Зоя, Ирина, Кира, Клавдия, Ксения, Лариса, Лидия, Любовь, Людмила, Маргарита, Марина, Мария, Надежда, Наталья, Нина, Оксана, Ольга, Раиса, Регина, Римма, Светлана, София, Таисия, Тамара, Татьяна, Ульяна, Юлия] female_middle_name: [Александровна, Алексеевна, Альбертовна, Анатольевна, Андреевна, Антоновна, Аркадьевна, Арсеньевна, Артёмовна, Борисовна, Вадимовна, Валентиновна, Валерьевна, Васильевна, Викторовна, Витальевна, Владимировна, Владиславовна, Вячеславовна, Геннадьевна, Георгиевна, Германовна, Григорьевна, Данииловна, Денисовна, Дмитриевна, Евгеньевна, Егоровна, Ивановна, Игнатьевна, Игоревна, Ильинична, Константиновна, Лаврентьевна, Леонидовна, Макаровна, Максимовна, Матвеевна, Михайловна, Никитична, Николаевна, Олеговна, Романовна, Семёновна, Сергеевна, Станиславовна, Степановна, Фёдоровна, Эдуардовна, Юрьевна, Ярославовна] female_last_name: [Смирнова, Иванова, Кузнецова, Попова, Соколова, Лебедева, Козлова, Новикова, Морозова, Петрова, Волкова, Соловьева, Васильева, Зайцева, Павлова, Семенова, Голубева, Виноградова, Богданова, Воробьева, Федорова, Михайлова, Беляева, Тарасова, Белова, Комарова, Орлова, Киселева, Макарова, Андреева, Ковалева, Ильина, Гусева, Титова, Кузьмина, Кудрявцева, Баранова, Куликова, Алексеева, Степанова, Яковлева, Сорокина, Сергеева, Романова, Захарова, Борисова, Королева, Герасимова, Пономарева, Григорьева, Лазарева, Медведева, Ершова, Никитина, Соболева, Рябова, Полякова, Цветкова, Данилова, Жукова, Фролова, Журавлева, Николаева, Крылова, Максимова, Сидорова, Осипова, Белоусова, Федотова, Дорофеева, Егорова, Матвеева, Боброва, Дмитриева, Калинина, Анисимова, Петухова, Антонова, Тимофеева, Никифорова, Веселова, Филиппова, Маркова, Большакова, Суханова, Миронова, Ширяева, Александрова, Коновалова, Шестакова, Казакова, Ефимова, Денисова, Громова, Фомина, Давыдова, Мельникова, Щербакова, Блинова, Колесникова, Карпова, Афанасьева, Власова, Маслова, Исакова, Тихонова, Аксенова, Гаврилова, Родионова, Котова, Горбунова, Кудряшова, Быкова, Зуева, Третьякова, Савельева, Панова, Рыбакова, Суворова, Абрамова, Воронова, Мухина, Архипова, Трофимова, Мартынова, Емельянова, Горшкова, Чернова, Овчинникова, Селезнева, Панфилова, Копылова, Михеева, Галкина, Назарова, Лобанова, Лукина, Белякова, Потапова, Некрасова, Хохлова, Жданова, Наумова, Шилова, Воронцова, Ермакова, Дроздова, Игнатьева, Савина, Логинова, Сафонова, Капустина, Кириллова, Моисеева, Елисеева, Кошелева, Костина, Горбачева, Орехова, Ефремова, Исаева, Евдокимова, Калашникова, Кабанова, Носкова, Юдина, Кулагина, Лапина, Прохорова, Нестерова, Харитонова, Агафонова, Муравьева, Ларионова, Федосеева, Зимина, Пахомова, Шубина, Игнатова, Филатова, Крюкова, Рогова, Кулакова, Терентьева, Молчанова, Владимирова, Артемьева, Гурьева, Зиновьева, Гришина, Кононова, Дементьева, Ситникова, Симонова, Мишина, Фадеева, Комиссарова, Мамонтова, Носова, Гуляева, Шарова, Устинова, Вишнякова, Евсеева, Лаврентьева, Брагина, Константинова, Корнилова, Авдеева, Зыкова, Бирюкова, Шарапова, Никонова, Щукина, Дьячкова, Одинцова, Сазонова, Якушева, Красильникова, Гордеева, Самойлова, Князева, Беспалова, Уварова, Шашкова, Бобылева, Доронина, Белозерова, Рожкова, Самсонова, Мясникова, Лихачева, Бурова, Сысоева, Фомичева, Русакова, Стрелкова, Гущина, Тетерина, Колобова, Субботина, Фокина, Блохина, Селиверстова, Пестова, Кондратьева, Силина, Меркушева, Лыткина, Турова] + first_name: + - "#{female_first_name}" + - "#{male_first_name}" + last_name: + - "#{female_last_name}" + - "#{male_last_name}" name: - "#{male_first_name} #{male_last_name}" - "#{male_last_name} #{male_first_name}" diff --git a/src/main/resources/zh-CN.yml b/src/main/resources/zh-CN.yml index 94ee37d0..fec78f4a 100644 --- a/src/main/resources/zh-CN.yml +++ b/src/main/resources/zh-CN.yml @@ -26,4 +26,31 @@ zh-CN: phone_number: formats: ['###-########', '####-########', '###########'] cell_phone: - formats: ['1##########'] + formats: + - '13#########' + - '145########' + - '147########' + - '150########' + - '151########' + - '152########' + - '153########' + - '155########' + - '156########' + - '157########' + - '158########' + - '159########' + - '170########' + - '171########' + - '172########' + - '173########' + - '175########' + - '176########' + - '177########' + - '178########' + - '18#########' + + university: + prefix: ["东", "南", "西", "北", "东南", "东北", "西南", "西北", "中国"] + suffix: ["理工大学", "技术大学", "艺术大学", "体育大学", "经贸大学", "农业大学", "科技大学", "大学"] + name: + - "#{University.prefix}#{University.suffix}" diff --git a/src/test/java/com/github/javafaker/PokemonTest.java b/src/test/java/com/github/javafaker/PokemonTest.java index e9e570db..09685612 100644 --- a/src/test/java/com/github/javafaker/PokemonTest.java +++ b/src/test/java/com/github/javafaker/PokemonTest.java @@ -9,7 +9,7 @@ public class PokemonTest extends AbstractFakerTest { @Test public void name() { - assertThat(faker.pokemon().name(), matchesRegularExpression("[\\w']+.?")); + assertThat(faker.pokemon().name(), matchesRegularExpression("[\\w']+.?( \\w+)?")); } @Test diff --git a/src/test/java/com/github/javafaker/WitcherTest.java b/src/test/java/com/github/javafaker/WitcherTest.java index 2b2f5aac..6c3f61a7 100644 --- a/src/test/java/com/github/javafaker/WitcherTest.java +++ b/src/test/java/com/github/javafaker/WitcherTest.java @@ -14,7 +14,7 @@ public class WitcherTest extends AbstractFakerTest { @Test public void testWitcher() { - assertThat(faker.witcher().character(), matchesRegularExpression("[A-Za-z -ë]+")); + assertThat(faker.witcher().character(), matchesRegularExpression("[A-Za-z -ëúï]+")); } @Test