Skip to content

Commit 201511e

Browse files
authored
Merge branch 'next' into 1598-change-numberint-default-max-to-numbermax_safe_integer
2 parents f53bfea + b7dbfac commit 201511e

File tree

14 files changed

+38
-13
lines changed

14 files changed

+38
-13
lines changed

src/internal/merge.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/**
2+
* Merges and sorts the given arrays.
3+
*
4+
* @template T The type of the elements in the arrays.
5+
*
6+
* @internal
7+
*
8+
* @param args The arrays to merge.
9+
*/
10+
export function mergeArrays<T>(...args: T[][]): T[] {
11+
return Array.from(new Set(args.flat())).sort();
12+
}

src/locales/cz/person/first_name.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1+
import { mergeArrays } from './../../../internal/merge';
12
import female_first_name from './female_first_name';
23
import male_first_name from './male_first_name';
34

4-
export default [...new Set([...female_first_name, ...male_first_name])];
5+
export default mergeArrays(female_first_name, male_first_name);

src/locales/cz/person/last_name.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1+
import { mergeArrays } from './../../../internal/merge';
12
import female_last_name from './female_last_name';
23
import male_last_name from './male_last_name';
34

4-
export default [...new Set([...female_last_name, ...male_last_name])];
5+
export default mergeArrays(female_last_name, male_last_name);

src/locales/dv/person/first_name.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1+
import { mergeArrays } from './../../../internal/merge';
12
import female_first_name from './female_first_name';
23
import male_first_name from './male_first_name';
34

4-
export default [...new Set([...female_first_name, ...male_first_name])];
5+
export default mergeArrays(female_first_name, male_first_name);

src/locales/dv/person/last_name.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1+
import { mergeArrays } from './../../../internal/merge';
12
import female_last_name from './female_last_name';
23
import male_last_name from './male_last_name';
34

4-
export default [...new Set([...female_last_name, ...male_last_name])];
5+
export default mergeArrays(female_last_name, male_last_name);
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1+
import { mergeArrays } from './../../../internal/merge';
12
import female_first_name from './female_first_name';
23
import male_first_name from './male_first_name';
34

4-
export default [...new Set([...female_first_name, ...male_first_name])];
5+
export default mergeArrays(female_first_name, male_first_name);

src/locales/fr/person/first_name.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1+
import { mergeArrays } from './../../../internal/merge';
12
import female_first_name from './female_first_name';
23
import male_first_name from './male_first_name';
34

4-
export default [...new Set([...female_first_name, ...male_first_name])];
5+
export default mergeArrays(female_first_name, male_first_name);
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1+
import { mergeArrays } from './../../../internal/merge';
12
import female_first_name from './female_first_name';
23
import male_first_name from './male_first_name';
34

4-
export default [...new Set([...female_first_name, ...male_first_name])];
5+
export default mergeArrays(female_first_name, male_first_name);

src/locales/he/person/first_name.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1+
import { mergeArrays } from './../../../internal/merge';
12
import female_first_name from './female_first_name';
23
import male_first_name from './male_first_name';
34

4-
export default [...new Set([...female_first_name, ...male_first_name])];
5+
export default mergeArrays(female_first_name, male_first_name);

src/locales/hu/person/first_name.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1+
import { mergeArrays } from './../../../internal/merge';
12
import female_first_name from './female_first_name';
23
import male_first_name from './male_first_name';
34

4-
export default [...new Set([...female_first_name, ...male_first_name])];
5+
export default mergeArrays(female_first_name, male_first_name);

src/locales/mk/person/first_name.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1+
import { mergeArrays } from './../../../internal/merge';
12
import female_first_name from './female_first_name';
23
import male_first_name from './male_first_name';
34

4-
export default [...new Set([...female_first_name, ...male_first_name])];
5+
export default mergeArrays(female_first_name, male_first_name);

src/locales/mk/person/last_name.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1+
import { mergeArrays } from './../../../internal/merge';
12
import female_last_name from './female_last_name';
23
import male_last_name from './male_last_name';
34

4-
export default [...new Set([...female_last_name, ...male_last_name])];
5+
export default mergeArrays(female_last_name, male_last_name);

src/locales/pl/person/first_name.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1+
import { mergeArrays } from './../../../internal/merge';
12
import female_first_name from './female_first_name';
23
import male_first_name from './male_first_name';
34

4-
export default [...new Set([...female_first_name, ...male_first_name])];
5+
export default mergeArrays(female_first_name, male_first_name);

src/locales/vi/person/first_name.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1+
import { mergeArrays } from './../../../internal/merge';
12
import female_first_name from './female_first_name';
23
import male_first_name from './male_first_name';
34

4-
export default [...new Set([...female_first_name, ...male_first_name])];
5+
export default mergeArrays(female_first_name, male_first_name);

0 commit comments

Comments
 (0)