Skip to content

Commit

Permalink
fix(person): avoid repeated double last name in en_SG, es, es_MX, lv,…
Browse files Browse the repository at this point in the history
… nb_NO, sv
  • Loading branch information
matthewmayer committed Feb 8, 2023
1 parent 1b9ca01 commit 2b1be18
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/locales/en_GH/person/name.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export default [
{ value: '{{person.firstName}} {{person.lastName}}', weight: 1 },
{
value: '{{person.firstName}} {{person.lastName}}-{{person.lastName}}',
value: '{{person.firstName}} {{person.lastName}}-{{person.lastName2}}',
weight: 1,
},
];
4 changes: 2 additions & 2 deletions src/locales/es/person/name.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
export default [
{
value:
'{{person.prefix}} {{person.firstName}} {{person.lastName}} {{person.lastName}}',
'{{person.prefix}} {{person.firstName}} {{person.lastName}} {{person.lastName2}}',
weight: 1,
},
{
value: '{{person.firstName}} {{person.lastName}} {{person.lastName}}',
value: '{{person.firstName}} {{person.lastName}} {{person.lastName2}}',
weight: 9,
},
];
8 changes: 4 additions & 4 deletions src/locales/es_MX/person/name.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
export default [
{
value:
'{{person.prefix}} {{person.firstName}} {{person.lastName}} {{person.lastName}}',
'{{person.prefix}} {{person.firstName}} {{person.lastName}} {{person.lastName2}}',
weight: 1,
},
{
value: '{{person.firstName}} {{person.lastName}} de {{person.lastName}}',
value: '{{person.firstName}} {{person.lastName}} de {{person.lastName2}}',
weight: 3,
},
{
value:
'{{person.suffix}} {{person.firstName}} {{person.lastName}} {{person.lastName}}',
'{{person.suffix}} {{person.firstName}} {{person.lastName}} {{person.lastName2}}',
weight: 1,
},
{
value: '{{person.firstName}} {{person.lastName}} {{person.lastName}}',
value: '{{person.firstName}} {{person.lastName}} {{person.lastName2}}',
weight: 5,
},
];
2 changes: 1 addition & 1 deletion src/locales/lv/person/name.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default [
weight: 2,
},
{
value: '{{person.firstName}} {{person.lastName}}-{{person.lastName}}',
value: '{{person.firstName}} {{person.lastName}}-{{person.lastName2}}',
weight: 2,
},
];
4 changes: 2 additions & 2 deletions src/locales/nb_NO/person/name.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ export default [
weight: 1,
},
{
value: '{{person.firstName}} {{person.firstName}} {{person.lastName}}',
value: '{{person.firstName}} {{person.firstName}} {{person.lastName2}}',
weight: 1,
},
{
value: '{{person.firstName}} {{person.lastName}} {{person.lastName}}',
value: '{{person.firstName}} {{person.lastName}} {{person.lastName2}}',
weight: 1,
},
{ value: '{{person.firstName}} {{person.lastName}}', weight: 8 },
Expand Down
2 changes: 1 addition & 1 deletion src/locales/sv/person/name.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default [
},
{ value: '{{person.firstName}} {{person.lastName}}', weight: 8 },
{
value: '{{person.firstName}} {{person.lastName}} {{person.lastName}}',
value: '{{person.firstName}} {{person.lastName}} {{person.lastName2}}',
weight: 1,
},
];
4 changes: 4 additions & 0 deletions src/modules/person/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,16 @@ export class PersonModule {
const fullNamePattern: string = this.faker.helpers.weightedArrayElement(
this.faker.definitions.person.name
);
const lastName2 = fullNamePattern.includes('{{person.lastName2}}')
? this.lastName(sex)
: '';

const fullName = this.faker.helpers.mustache(fullNamePattern, {
'person.prefix': () => this.prefix(sex),
'person.firstName': () => firstName,
'person.middleName': () => this.middleName(sex),
'person.lastName': () => lastName,
'person.lastName2': () => lastName2,
'person.suffix': () => this.suffix(),
});
return fullName;
Expand Down

0 comments on commit 2b1be18

Please sign in to comment.