Skip to content

Commit

Permalink
Merge branch 'next' into infra/unicorn/prevent-abbreviations
Browse files Browse the repository at this point in the history
  • Loading branch information
ST-DDT authored Dec 9, 2024
2 parents 462502a + 8b2976f commit b717fb3
Show file tree
Hide file tree
Showing 25 changed files with 433 additions and 342 deletions.
525 changes: 309 additions & 216 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

17 changes: 9 additions & 8 deletions src/internal/deprecated.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,20 @@ export interface DeprecatedOptions {
/**
* @internal
*/
export function deprecated(opts: DeprecatedOptions): void {
let message = `[@faker-js/faker]: ${opts.deprecated} is deprecated`;
export function deprecated(options: DeprecatedOptions): void {
const { deprecated, since, until, proposed } = options;
let message = `[@faker-js/faker]: ${deprecated} is deprecated`;

if (opts.since) {
message += ` since v${opts.since}`;
if (since) {
message += ` since v${since}`;
}

if (opts.until) {
message += ` and will be removed in v${opts.until}`;
if (until) {
message += ` and will be removed in v${until}`;
}

if (opts.proposed) {
message += `. Please use ${opts.proposed} instead`;
if (proposed) {
message += `. Please use ${proposed} instead`;
}

// eslint-disable-next-line no-undef -- Using console here is intentional and required
Expand Down
1 change: 0 additions & 1 deletion src/locales/ar/location/state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ export default [
'عرابة',
'رام الله',
'طولكرم',
'بئر السبع ',
'تونس',
'بن عروس',
'أريانة',
Expand Down
25 changes: 0 additions & 25 deletions src/locales/en/animal/cow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ export default [
'Barrosã',
'Barzona',
'Bazadaise',
'Bedit',
'Beef Freisian',
'Beefalo',
'Beefmaker',
Expand Down Expand Up @@ -136,7 +135,6 @@ export default [
'Caracu',
'Carinthian Blondvieh',
'Carora',
'Cedit',
'Charbray',
'Charolais',
'Chateaubriand',
Expand All @@ -157,7 +155,6 @@ export default [
'Danish Black-Pied',
'Danish Jersey',
'Danish Red',
'Dedit',
'Deep Red cattle',
'Deoni',
'Devon',
Expand All @@ -175,14 +172,12 @@ export default [
'East Anatolian Red',
'Eastern Finncattle',
'Eastern Red Polled',
'Eedit',
'Enderby Island cattle',
'English Longhorn',
'Ennstaler Bergscheck',
'Estonian Holstein',
'Estonian Native',
'Estonian Red cattle',
'Fedit',
'Finncattle',
'Finnish Ayrshire',
'Finnish Holstein-Friesian',
Expand All @@ -201,7 +196,6 @@ export default [
'Gaolao',
'Garvonesa',
'Gascon cattle',
'Gedit',
'Gelbvieh',
'Georgian Mountain cattle',
'German Angus',
Expand All @@ -225,7 +219,6 @@ export default [
'Harzer Rotvieh',
'Hays Converter',
'Heck cattle',
'Hedit',
'Hereford',
'Herens',
'Highland cattle',
Expand All @@ -238,7 +231,6 @@ export default [
'Hybridmaster',
'Iberian cattle',
'Icelandic',
'Iedit',
'Illawarra cattle',
'Improved Red and White',
'Indo-Brazilian',
Expand All @@ -253,7 +245,6 @@ export default [
'Japanese Brown',
'Jarmelista',
'Javari cattle',
'Jedit',
'Jersey cattle',
'Jutland cattle',
'Kabin Buri cattle',
Expand All @@ -265,7 +256,6 @@ export default [
'Kasaragod Dwarf cattle',
'Kathiawadi',
'Kazakh Whiteheaded',
'Kedit',
'Kenana cattle',
'Kenkatha cattle',
'Kerry cattle',
Expand All @@ -284,7 +274,6 @@ export default [
'Latvian Brown',
'Latvian Danish Red',
'Lebedyn',
'Ledit',
'Levantina',
'Limia cattle',
'Limousin',
Expand Down Expand Up @@ -313,7 +302,6 @@ export default [
'Maronesa',
'Masai',
'Mashona',
'Medit',
'Menorquina',
'Mertolenga',
'Meuse-Rhine-Issel',
Expand All @@ -334,7 +322,6 @@ export default [
'Muturu',
"N'Dama",
'Nagori',
'Nedit',
'Negra Andaluza',
'Nelore',
'Nguni',
Expand All @@ -344,7 +331,6 @@ export default [
'Northern Finncattle',
'Northern Shorthorn',
'Norwegian Red',
'Oedit]',
'Ongole',
'Original Simmental',
'Pajuna',
Expand All @@ -353,7 +339,6 @@ export default [
'Parda Alpina',
'Parthenaise',
'Pasiega',
'Pedit',
'Pembroke',
'Philippine Native',
'Pie Rouge des Plaines',
Expand All @@ -373,7 +358,6 @@ export default [
'Pulikulam',
'Punganur',
'Pustertaler Sprinzen',
'Qedit',
'Qinchaun',
'Queensland Miniature Boran',
'RX3',
Expand All @@ -393,7 +377,6 @@ export default [
'Red Poll',
'Red Polled Østland',
'Red Sindhi',
'Redit',
'Retinta',
'Riggit Galloway',
'Ringamåla',
Expand All @@ -413,7 +396,6 @@ export default [
'Santa Gertrudis',
'Sayaguesa',
'Schwyz',
'Sedit',
'Selembu',
'Senepol',
'Serbian Pied',
Expand All @@ -440,7 +422,6 @@ export default [
'Tarentaise',
'Tasmanian Grey',
'Tauros',
'Tedit',
'Telemark',
'Texas Longhorn',
'Texon',
Expand All @@ -456,15 +437,13 @@ export default [
'Turkish Grey Steppe',
'Tux-Zillertal',
'Tyrol Grey',
'Uedit',
'Ukrainian Grey',
'Umblachery',
'Valdostana Castana',
'Valdostana Pezzata Nera',
'Valdostana Pezzata Rossa',
'Vaynol',
'Vechur8',
'Vedit',
'Vestland Fjord',
'Vestland Red Polled',
'Vianesa',
Expand All @@ -475,23 +454,19 @@ export default [
'Waguli',
'Wagyu',
'Wangus',
'Wedit',
'Welsh Black',
'Western Finncattle',
'White Cáceres',
'White Fulani',
'White Lamphun',
'White Park',
'Whitebred Shorthorn',
'Xedit',
'Xingjiang Brown',
'Yakutian',
'Yanbian',
'Yanhuang',
'Yedit',
'Yurino',
'Zebu',
'Zedit',
'Évolène cattle',
'Żubroń',
];
2 changes: 1 addition & 1 deletion src/locales/en/animal/horse.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export default [
'Bavarian Warmblood',
'Belgian Half-blood',
'Belgian Horse',
'Belgian Warmblood ',
'Belgian Warmblood',
'Bhutia Horse',
'Black Forest Horse',
'Blazer Horse',
Expand Down
2 changes: 1 addition & 1 deletion src/locales/en/book/title.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export default [
'Nightmare Abbey',
'Nineteen Eighty Four',
'Nostromo',
'Notes from the Underground ',
'Notes from the Underground',
'Of Mice and Men',
'Oliver Twist',
'On the Duty of Civil Disobedience',
Expand Down
Loading

0 comments on commit b717fb3

Please sign in to comment.