Skip to content

Commit aa41222

Browse files
ST-DDTST-DDT
authored
Merge branch 'next' into 1777-dutch-names
2 parents 915b439 + d5b78c7 commit aa41222

6 files changed

Lines changed: 56 additions & 38 deletions

File tree

‎docs/about/team/members.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,13 @@
8282
{ "icon": "github", "link": "https://github.com/xDivisionByZerox" }
8383
]
8484
},
85+
{
86+
"avatar": "https://github.com/matthewmayer.png",
87+
"name": "Matt Mayer",
88+
"title": "Contributor",
89+
"desc": "",
90+
"links": [{ "icon": "github", "link": "https://github.com/matthewmayer" }]
91+
},
8592
{
8693
"avatar": "https://github.com/pkuczynski.png",
8794
"name": "Piotr Kuczynski",

‎src/locales/pt_BR/person/index.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import prefix from './prefix';
1414
import sex from './sex';
1515
import suffix from './suffix';
1616
import title from './title';
17+
import western_zodiac_sign from './western_zodiac_sign';
1718

1819
const person: PersonDefinitions = {
1920
female_first_name,
@@ -27,6 +28,7 @@ const person: PersonDefinitions = {
2728
sex,
2829
suffix,
2930
title,
31+
western_zodiac_sign,
3032
};
3133

3234
export default person;

‎src/locales/pt_BR/person/western_zodiac_sign.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
export default [
2+
'Aquário',
3+
'Peixes',
4+
'Áries',
5+
'Touro',
6+
'Gêmeos',
7+
'Câncer',
8+
'Leão',
9+
'Virgem',
10+
'Libra',
11+
'Escorpião',
12+
'Sagitário',
13+
'Capricórnio',
14+
];

‎src/modules/string/index.ts‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -678,14 +678,9 @@ export class StringModule {
678678
* @since 8.0.0
679679
*/
680680
uuid(): string {
681-
const RFC4122_TEMPLATE = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx';
682-
const replacePlaceholders = (placeholder: string) => {
683-
const random = this.faker.number.int(15);
684-
const value = placeholder === 'x' ? random : (random & 0x3) | 0x8;
685-
return value.toString(16);
686-
};
687-
688-
return RFC4122_TEMPLATE.replace(/[xy]/g, replacePlaceholders);
681+
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'
682+
.replace(/x/g, () => this.faker.number.hex({ min: 0x0, max: 0xf }))
683+
.replace(/y/g, () => this.faker.number.hex({ min: 0x8, max: 0xb }));
689684
}
690685

691686
/**

‎test/__snapshots__/datatype.spec.ts.snap‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -121,15 +121,15 @@ exports[`datatype > 42 > string > with length option 1`] = `"Cky2eiXX/J/*&Kq@X.b
121121

122122
exports[`datatype > 42 > string > with number 1`] = `"Cky2eiXX/J/*&Kq@X.b]\\"&{dnx4!1}2Z=YQ!I#<QYF"`;
123123

124-
exports[`datatype > 42 > uuid 1`] = `"5cf2bc99-2721-407d-992b-a00fbdf302f2"`;
124+
exports[`datatype > 42 > uuid 1`] = `"5cf2bc99-2721-407d-8592-ba00fbdf302f"`;
125125

126-
exports[`datatype > 42 > uuid 2`] = `"94980604-8962-404f-9371-c9368f970d9a"`;
126+
exports[`datatype > 42 > uuid 2`] = `"94980604-8962-404f-a537-1c9368f970d9"`;
127127

128-
exports[`datatype > 42 > uuid 3`] = `"2710fff9-c640-413a-b7a1-97d02e642ac4"`;
128+
exports[`datatype > 42 > uuid 3`] = `"2710fff9-c640-413a-937a-197d02e642ac"`;
129129

130-
exports[`datatype > 42 > uuid 4`] = `"6838920f-dc7f-46ee-9be5-19380f5d6b48"`;
130+
exports[`datatype > 42 > uuid 4`] = `"6838920f-dc7f-46ee-a9be-519380f5d6b4"`;
131131

132-
exports[`datatype > 42 > uuid 5`] = `"d95f4984-24c2-410f-ac63-400d3bbbcc91"`;
132+
exports[`datatype > 42 > uuid 5`] = `"d95f4984-24c2-410f-86c6-3400d3bbbcc9"`;
133133

134134
exports[`datatype > 1211 > array > noArgs 1`] = `
135135
[
@@ -253,15 +253,15 @@ exports[`datatype > 1211 > string > with length option 1`] = `"wKti5-}$_/\`4hHA0
253253

254254
exports[`datatype > 1211 > string > with number 1`] = `"wKti5-}$_/\`4hHA0afl\\"h^]dnwI<q|p|5KWu3/CZ|J"`;
255255

256-
exports[`datatype > 1211 > uuid 1`] = `"e7ec32f0-a2a3-4c65-abbd-0caabde64dfd"`;
256+
exports[`datatype > 1211 > uuid 1`] = `"e7ec32f0-a2a3-4c65-b2bb-d0caabde64df"`;
257257

258-
exports[`datatype > 1211 > uuid 2`] = `"f379e325-9f7c-4064-a086-f23942b68e5f"`;
258+
exports[`datatype > 1211 > uuid 2`] = `"f379e325-9f7c-4064-be08-6f23942b68e5"`;
259259

260-
exports[`datatype > 1211 > uuid 3`] = `"d4694649-2183-4b32-8bd7-a336639d6997"`;
260+
exports[`datatype > 1211 > uuid 3`] = `"d4694649-2183-4b32-90bd-7a336639d699"`;
261261

262-
exports[`datatype > 1211 > uuid 4`] = `"10ab829b-742c-4a8b-b732-98d718d77069"`;
262+
exports[`datatype > 1211 > uuid 4`] = `"10ab829b-742c-4a8b-a773-298d718d7706"`;
263263

264-
exports[`datatype > 1211 > uuid 5`] = `"7b91ce88-effb-4d1d-93bb-ad759e00b86c"`;
264+
exports[`datatype > 1211 > uuid 5`] = `"7b91ce88-effb-4d1d-b13b-bad759e00b86"`;
265265

266266
exports[`datatype > 1337 > array > noArgs 1`] = `
267267
[
@@ -383,12 +383,12 @@ exports[`datatype > 1337 > string > with length option 1`] = `"9U/4:SK$>6QX9@{:e
383383
384384
exports[`datatype > 1337 > string > with number 1`] = `"9U/4:SK$>6QX9@{:e=+kD)[B,e|/Jqjjj!BLGDWQgC"`;
385385
386-
exports[`datatype > 1337 > uuid 1`] = `"48234870-5389-445f-8b41-c61a52bf27dc"`;
386+
exports[`datatype > 1337 > uuid 1`] = `"48234870-5389-445f-b4b4-1c61a52bf27d"`;
387387
388-
exports[`datatype > 1337 > uuid 2`] = `"cc057669-8c53-474d-a677-226d3e8ed92f"`;
388+
exports[`datatype > 1337 > uuid 2`] = `"cc057669-8c53-474d-ba67-7226d3e8ed92"`;
389389
390-
exports[`datatype > 1337 > uuid 3`] = `"fe6d8b8b-0db9-4fa2-b265-abc0a5d0ccf5"`;
390+
exports[`datatype > 1337 > uuid 3`] = `"fe6d8b8b-0db9-4fa2-9726-5abc0a5d0ccf"`;
391391
392-
exports[`datatype > 1337 > uuid 4`] = `"0b87afbd-8949-4dfb-8d04-19f4fe7458b2"`;
392+
exports[`datatype > 1337 > uuid 4`] = `"0b87afbd-8949-4dfb-84d0-419f4fe7458b"`;
393393
394-
exports[`datatype > 1337 > uuid 5`] = `"0bcea83c-a7ea-428e-85db-d448f2b777a6"`;
394+
exports[`datatype > 1337 > uuid 5`] = `"0bcea83c-a7ea-428e-9c5d-bd448f2b777a"`;

‎test/__snapshots__/string.spec.ts.snap‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -164,15 +164,15 @@ exports[`string > 42 > symbol > with length parameter 5`] = `"!\\"~\\\\_"`;
164164
165165
exports[`string > 42 > symbol > with length range 1`] = `"^}&\\\\]>>%/%$\\"/\`"`;
166166
167-
exports[`string > 42 > uuid 1`] = `"5cf2bc99-2721-407d-992b-a00fbdf302f2"`;
167+
exports[`string > 42 > uuid 1`] = `"5cf2bc99-2721-407d-8592-ba00fbdf302f"`;
168168
169-
exports[`string > 42 > uuid 2`] = `"94980604-8962-404f-9371-c9368f970d9a"`;
169+
exports[`string > 42 > uuid 2`] = `"94980604-8962-404f-a537-1c9368f970d9"`;
170170
171-
exports[`string > 42 > uuid 3`] = `"2710fff9-c640-413a-b7a1-97d02e642ac4"`;
171+
exports[`string > 42 > uuid 3`] = `"2710fff9-c640-413a-937a-197d02e642ac"`;
172172
173-
exports[`string > 42 > uuid 4`] = `"6838920f-dc7f-46ee-9be5-19380f5d6b48"`;
173+
exports[`string > 42 > uuid 4`] = `"6838920f-dc7f-46ee-a9be-519380f5d6b4"`;
174174
175-
exports[`string > 42 > uuid 5`] = `"d95f4984-24c2-410f-ac63-400d3bbbcc91"`;
175+
exports[`string > 42 > uuid 5`] = `"d95f4984-24c2-410f-86c6-3400d3bbbcc9"`;
176176
177177
exports[`string > 1211 > alpha > noArgs 1`] = `"W"`;
178178
@@ -338,15 +338,15 @@ exports[`string > 1211 > symbol > with length parameter 5`] = `"]@?\\\\_"`;
338338
339339
exports[`string > 1211 > symbol > with length range 1`] = `"/{](%~\\"@&@'].,&[\\\\_!]"`;
340340
341-
exports[`string > 1211 > uuid 1`] = `"e7ec32f0-a2a3-4c65-abbd-0caabde64dfd"`;
341+
exports[`string > 1211 > uuid 1`] = `"e7ec32f0-a2a3-4c65-b2bb-d0caabde64df"`;
342342
343-
exports[`string > 1211 > uuid 2`] = `"f379e325-9f7c-4064-a086-f23942b68e5f"`;
343+
exports[`string > 1211 > uuid 2`] = `"f379e325-9f7c-4064-be08-6f23942b68e5"`;
344344
345-
exports[`string > 1211 > uuid 3`] = `"d4694649-2183-4b32-8bd7-a336639d6997"`;
345+
exports[`string > 1211 > uuid 3`] = `"d4694649-2183-4b32-90bd-7a336639d699"`;
346346
347-
exports[`string > 1211 > uuid 4`] = `"10ab829b-742c-4a8b-b732-98d718d77069"`;
347+
exports[`string > 1211 > uuid 4`] = `"10ab829b-742c-4a8b-a773-298d718d7706"`;
348348
349-
exports[`string > 1211 > uuid 5`] = `"7b91ce88-effb-4d1d-93bb-ad759e00b86c"`;
349+
exports[`string > 1211 > uuid 5`] = `"7b91ce88-effb-4d1d-b13b-bad759e00b86"`;
350350
351351
exports[`string > 1337 > alpha > noArgs 1`] = `"n"`;
352352
@@ -512,12 +512,12 @@ exports[`string > 1337 > symbol > with length parameter 5`] = `"-$?,%"`;
512512
513513
exports[`string > 1337 > symbol > with length range 1`] = `"<&')</\\"+(;=)"`;
514514
515-
exports[`string > 1337 > uuid 1`] = `"48234870-5389-445f-8b41-c61a52bf27dc"`;
515+
exports[`string > 1337 > uuid 1`] = `"48234870-5389-445f-b4b4-1c61a52bf27d"`;
516516
517-
exports[`string > 1337 > uuid 2`] = `"cc057669-8c53-474d-a677-226d3e8ed92f"`;
517+
exports[`string > 1337 > uuid 2`] = `"cc057669-8c53-474d-ba67-7226d3e8ed92"`;
518518
519-
exports[`string > 1337 > uuid 3`] = `"fe6d8b8b-0db9-4fa2-b265-abc0a5d0ccf5"`;
519+
exports[`string > 1337 > uuid 3`] = `"fe6d8b8b-0db9-4fa2-9726-5abc0a5d0ccf"`;
520520
521-
exports[`string > 1337 > uuid 4`] = `"0b87afbd-8949-4dfb-8d04-19f4fe7458b2"`;
521+
exports[`string > 1337 > uuid 4`] = `"0b87afbd-8949-4dfb-84d0-419f4fe7458b"`;
522522
523-
exports[`string > 1337 > uuid 5`] = `"0bcea83c-a7ea-428e-85db-d448f2b777a6"`;
523+
exports[`string > 1337 > uuid 5`] = `"0bcea83c-a7ea-428e-9c5d-bd448f2b777a"`;

0 commit comments

Comments
 (0)