Skip to content

Commit

Permalink
Merge branch 'main' into vitepress-v1
Browse files Browse the repository at this point in the history
  • Loading branch information
Shinigami92 authored Aug 6, 2022
2 parents 73d0f03 + 0668cfe commit e85c944
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 55 deletions.
35 changes: 12 additions & 23 deletions src/locales/en/word/conjunction.ts
Original file line number Diff line number Diff line change
@@ -1,64 +1,53 @@
export default [
'after',
'after all',
'although',
'and',
'as',
'as a result',
'as if',
'as long as',
'as much as',
'as soon as',
'as though',
'because',
'before',
'but',
'consequently',
'even',
'even if',
'even though',
'finally',
'for',
'for example',
'furthermore',
'hence',
'how',
'however',
'if',
'if only',
'if then',
'if when',
'in addition',
'in fact',
'in order that',
'inasmuch',
'incidentally',
'indeed',
'instead',
'just as',
'lest',
'likewise',
'meanwhile',
'nor',
'now',
'now since',
'now that',
'now when',
'once',
'or',
'provided',
'provided that',
'rather than',
'since',
'so',
'so that',
'supposing',
'than',
'that',
'though',
'till',
'unless',
'until',
'what',
'when',
'whenever',
'where',
'whereas',
'wherever',
'whether',
'which',
'while',
'who',
'whoever',
'whose',
'why',
'yet',
];
3 changes: 1 addition & 2 deletions src/locales/en/word/interjection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default [
'whoa',
'yowza',
'huzzah',
'boo hoo',
'boohoo',
'fooey',
'geez',
'pfft',
Expand All @@ -33,7 +33,6 @@ export default [
'duh',
'ha',
'mmm',
'tsk tsk',
'ouch',
'phew',
'ack',
Expand Down
5 changes: 0 additions & 5 deletions src/locales/en/word/noun.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1363,7 +1363,6 @@ export default [
'consumer',
'consumption',
'contact',
'contact lens',
'contagion',
'container',
'content',
Expand Down Expand Up @@ -1507,7 +1506,6 @@ export default [
'credit',
'creditor',
'creek',
'creme brulee',
'crepe',
'crest',
'crew',
Expand Down Expand Up @@ -1962,17 +1960,14 @@ export default [
'dulcimer',
'dumbwaiter',
'dump',
'dump truck',
'dune',
'dune buggy',
'dungarees',
'dungeon',
'duplexer',
'duration',
'durian',
'dusk',
'dust',
'dust storm',
'duster',
'duty',
'dwarf',
Expand Down
1 change: 0 additions & 1 deletion src/modules/address/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,6 @@ export class Address {
* faker.address.nearbyGPSCoordinate([33, -170]) // [ '33.0165', '-170.0636' ]
* faker.address.nearbyGPSCoordinate([33, -170], 1000, true) // [ '37.9163', '-179.2408' ]
*/
// TODO ST-DDT 2022-02-10: Allow coordinate parameter to be [string, string].
nearbyGPSCoordinate(
coordinate?: [latitude: number, longitude: number],
radius: number = 10,
Expand Down
18 changes: 9 additions & 9 deletions test/__snapshots__/internet.spec.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ exports[`internet > 42 > color > noArgs 1`] = `"#30667a"`;

exports[`internet > 42 > color > with color base 1`] = `"#6298ac"`;

exports[`internet > 42 > domainName 1`] = `"harmonious-shift.org"`;
exports[`internet > 42 > domainName 1`] = `"harmonious-shin.org"`;

exports[`internet > 42 > domainSuffix 1`] = `"info"`;

exports[`internet > 42 > domainWord 1`] = `"harmonious-shift"`;
exports[`internet > 42 > domainWord 1`] = `"harmonious-shin"`;

exports[`internet > 42 > email > noArgs 1`] = `"Peyton73@yahoo.com"`;

Expand Down Expand Up @@ -52,7 +52,7 @@ exports[`internet > 42 > port 1`] = `24545`;

exports[`internet > 42 > protocol 1`] = `"http"`;

exports[`internet > 42 > url 1`] = `"http://stable-vehicle.biz"`;
exports[`internet > 42 > url 1`] = `"http://stable-veil.biz"`;

exports[`internet > 42 > userAgent 1`] = `"Mozilla/5.0 (Windows; U; Windows NT 6.2) AppleWebKit/538.0.2 (KHTML, like Gecko) Chrome/29.0.815.0 Safari/538.0.2"`;

Expand All @@ -66,11 +66,11 @@ exports[`internet > 1211 > color > noArgs 1`] = `"#773a72"`;

exports[`internet > 1211 > color > with color base 1`] = `"#a96ca4"`;

exports[`internet > 1211 > domainName 1`] = `"verifiable-infection.org"`;
exports[`internet > 1211 > domainName 1`] = `"verifiable-infix.org"`;

exports[`internet > 1211 > domainSuffix 1`] = `"org"`;

exports[`internet > 1211 > domainWord 1`] = `"verifiable-infection"`;
exports[`internet > 1211 > domainWord 1`] = `"verifiable-infix"`;

exports[`internet > 1211 > email > noArgs 1`] = `"Jadon.Trantow12@hotmail.com"`;

Expand Down Expand Up @@ -112,7 +112,7 @@ exports[`internet > 1211 > port 1`] = `60851`;

exports[`internet > 1211 > protocol 1`] = `"https"`;

exports[`internet > 1211 > url 1`] = `"https://joyous-temperature.net"`;
exports[`internet > 1211 > url 1`] = `"https://joyous-temple.net"`;

exports[`internet > 1211 > userAgent 1`] = `"Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_6 rv:3.0; PT) AppleWebKit/538.2.0 (KHTML, like Gecko) Version/4.1.0 Safari/538.2.0"`;

Expand All @@ -126,11 +126,11 @@ exports[`internet > 1337 > color > noArgs 1`] = `"#214814"`;

exports[`internet > 1337 > color > with color base 1`] = `"#537a46"`;

exports[`internet > 1337 > domainName 1`] = `"fabulous-might.com"`;
exports[`internet > 1337 > domainName 1`] = `"fabulous-migration.com"`;

exports[`internet > 1337 > domainSuffix 1`] = `"biz"`;

exports[`internet > 1337 > domainWord 1`] = `"fabulous-might"`;
exports[`internet > 1337 > domainWord 1`] = `"fabulous-migration"`;

exports[`internet > 1337 > email > noArgs 1`] = `"Keith27@gmail.com"`;

Expand Down Expand Up @@ -172,7 +172,7 @@ exports[`internet > 1337 > port 1`] = `17172`;

exports[`internet > 1337 > protocol 1`] = `"http"`;

exports[`internet > 1337 > url 1`] = `"http://neat-chopsticks.biz"`;
exports[`internet > 1337 > url 1`] = `"http://neat-chopstick.biz"`;

exports[`internet > 1337 > userAgent 1`] = `"Mozilla/5.0 (Windows; U; Windows NT 6.1) AppleWebKit/532.0.0 (KHTML, like Gecko) Chrome/13.0.832.0 Safari/532.0.0"`;

Expand Down
30 changes: 15 additions & 15 deletions test/__snapshots__/word.spec.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@ exports[`word > 42 > adverb > with length = 10 1`] = `"generously"`;

exports[`word > 42 > adverb > with length = 20 1`] = `"jealously"`;

exports[`word > 42 > conjunction > noArgs 1`] = `"however"`;
exports[`word > 42 > conjunction > noArgs 1`] = `"instead"`;

exports[`word > 42 > conjunction > with length = 10 1`] = `"as much as"`;
exports[`word > 42 > conjunction > with length = 10 1`] = `"instead"`;

exports[`word > 42 > conjunction > with length = 20 1`] = `"however"`;
exports[`word > 42 > conjunction > with length = 20 1`] = `"instead"`;

exports[`word > 42 > interjection > noArgs 1`] = `"yahoo"`;

exports[`word > 42 > interjection > with length = 10 1`] = `"yahoo"`;

exports[`word > 42 > interjection > with length = 20 1`] = `"yahoo"`;

exports[`word > 42 > noun > noArgs 1`] = `"gale"`;
exports[`word > 42 > noun > noArgs 1`] = `"galley"`;

exports[`word > 42 > noun > with length = 10 1`] = `"exposition"`;
exports[`word > 42 > noun > with length = 10 1`] = `"extinction"`;

exports[`word > 42 > noun > with length = 20 1`] = `"gale"`;
exports[`word > 42 > noun > with length = 20 1`] = `"galley"`;

exports[`word > 42 > preposition > noArgs 1`] = `"concerning"`;

Expand All @@ -54,23 +54,23 @@ exports[`word > 1211 > adverb > with length = 10 1`] = `"unbearably"`;

exports[`word > 1211 > adverb > with length = 20 1`] = `"viciously"`;

exports[`word > 1211 > conjunction > noArgs 1`] = `"whereas"`;
exports[`word > 1211 > conjunction > noArgs 1`] = `"whoever"`;

exports[`word > 1211 > conjunction > with length = 10 1`] = `"as soon as"`;
exports[`word > 1211 > conjunction > with length = 10 1`] = `"whoever"`;

exports[`word > 1211 > conjunction > with length = 20 1`] = `"whereas"`;
exports[`word > 1211 > conjunction > with length = 20 1`] = `"whoever"`;

exports[`word > 1211 > interjection > noArgs 1`] = `"er"`;

exports[`word > 1211 > interjection > with length = 10 1`] = `"er"`;

exports[`word > 1211 > interjection > with length = 20 1`] = `"er"`;

exports[`word > 1211 > noun > noArgs 1`] = `"trick"`;
exports[`word > 1211 > noun > noArgs 1`] = `"trigger"`;

exports[`word > 1211 > noun > with length = 10 1`] = `"trafficker"`;

exports[`word > 1211 > noun > with length = 20 1`] = `"trick"`;
exports[`word > 1211 > noun > with length = 20 1`] = `"trigger"`;

exports[`word > 1211 > preposition > noArgs 1`] = `"upon"`;

Expand All @@ -96,11 +96,11 @@ exports[`word > 1337 > adverb > with length = 10 1`] = `"enormously"`;

exports[`word > 1337 > adverb > with length = 20 1`] = `"frankly"`;

exports[`word > 1337 > conjunction > noArgs 1`] = `"even if"`;
exports[`word > 1337 > conjunction > noArgs 1`] = `"how"`;

exports[`word > 1337 > conjunction > with length = 10 1`] = `"as long as"`;
exports[`word > 1337 > conjunction > with length = 10 1`] = `"how"`;

exports[`word > 1337 > conjunction > with length = 20 1`] = `"even if"`;
exports[`word > 1337 > conjunction > with length = 20 1`] = `"how"`;

exports[`word > 1337 > interjection > noArgs 1`] = `"ew"`;

Expand All @@ -110,7 +110,7 @@ exports[`word > 1337 > interjection > with length = 20 1`] = `"ew"`;

exports[`word > 1337 > noun > noArgs 1`] = `"digit"`;

exports[`word > 1337 > noun > with length = 10 1`] = `"depressive"`;
exports[`word > 1337 > noun > with length = 10 1`] = `"depression"`;

exports[`word > 1337 > noun > with length = 20 1`] = `"digit"`;

Expand Down

0 comments on commit e85c944

Please sign in to comment.