Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: improve and extend 🇫🇷 fr and 🇨🇭fr_CH locales #973

Merged
merged 9 commits into from
May 22, 2022
Merged

feat: improve and extend 🇫🇷 fr and 🇨🇭fr_CH locales #973

merged 9 commits into from
May 22, 2022

Conversation

Yago
Copy link
Contributor

@Yago Yago commented May 20, 2022

Adds a lot of locales to fr and fr_CH with a focus on inclusive words; mostly for nouns and adjectives.

@Yago Yago requested a review from a team as a code owner May 20, 2022 07:50
@Yago Yago changed the title improve and extend fr and fr_CH locales feat: improve and extend fr and fr_CH locales May 20, 2022
@Yago Yago changed the title feat: improve and extend fr and fr_CH locales feat: improve and extend fr and fr_CH locales 🇫🇷🇨🇭 May 20, 2022
@Yago Yago changed the title feat: improve and extend fr and fr_CH locales 🇫🇷🇨🇭 feat: improve and extend 🇫🇷 fr and 🇨🇭 fr_CH locales May 20, 2022
@Yago Yago changed the title feat: improve and extend 🇫🇷 fr and 🇨🇭 fr_CH locales feat: improve and extend 🇫🇷 fr and 🇨🇭fr_CH locales May 20, 2022
@import-brain import-brain requested a review from a team May 20, 2022 10:31
@import-brain import-brain added c: feature Request for new feature p: 1-normal Nothing urgent c: locale Permutes locale definitions labels May 20, 2022
@import-brain import-brain added this to the v7 - Current Major milestone May 20, 2022
@codecov
Copy link

codecov bot commented May 20, 2022 •
edited

Codecov Report

Merging #973 (4234458) into main (bee6054) will increase coverage by 0.02%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main     #973      +/-   ##
==========================================
+ Coverage   99.64%   99.67%   +0.02%     
==========================================
  Files        2007     2110     +103     
  Lines      212073   225693   +13620     
  Branches      971      972       +1     
==========================================
+ Hits       211330   224953   +13623     
+ Misses        723      720       -3     
  Partials       20       20
Impacted Files Coverage Δ
src/locales/fr/address/country.ts 100.00% <100.00%> (ø)
src/locales/fr/address/direction.ts 100.00% <100.00%> (ø)
src/locales/fr/address/index.ts 100.00% <100.00%> (ø)
src/locales/fr/animal/bear.ts 100.00% <100.00%> (ø)
src/locales/fr/animal/bird.ts 100.00% <100.00%> (ø)
src/locales/fr/animal/cat.ts 100.00% <100.00%> (ø)
src/locales/fr/animal/cetacean.ts 100.00% <100.00%> (ø)
src/locales/fr/animal/cow.ts 100.00% <100.00%> (ø)
src/locales/fr/animal/crocodilia.ts 100.00% <100.00%> (ø)
src/locales/fr/animal/dog.ts 100.00% <100.00%> (ø)
... and 105 more

ST-DDT
ST-DDT requested changes May 20, 2022
View reviewed changes
Copy link
Member

@ST-DDT ST-DDT left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you very much for your contribution. This is quite a lot to review. It will probably take a few days to review it in more detail.

src/locales/fr/animal/cow.ts Outdated Show resolved Hide resolved
src/locales/fr/animal/lion.ts Outdated Show resolved Hide resolved
src/locales/fr/word/interjection.ts Outdated Show resolved Hide resolved
src/locales/fr/word/interjection.ts Outdated Show resolved Hide resolved
src/locales/fr_CH/animal/lion.ts Outdated Show resolved Hide resolved
src/locales/fr_CH/company/adjective.ts Outdated Show resolved Hide resolved
src/locales/fr_CH/company/descriptor.ts Outdated Show resolved Hide resolved
src/locales/fr_CH/company/noun.ts Outdated Show resolved Hide resolved
src/locales/fr_CH/word/interjection.ts Outdated Show resolved Hide resolved
src/locales/fr_CH/word/interjection.ts Outdated Show resolved Hide resolved
@Yago
Copy link
Contributor Author

Yago commented May 21, 2022

@ST-DDT Thank you for your feedbacks, I fixed everything.

@Yago Yago requested a review from ST-DDT May 21, 2022 07:06
@ST-DDT ST-DDT added the s: accepted Accepted feature / Confirmed bug label May 21, 2022
ST-DDT
ST-DDT previously approved these changes May 21, 2022
View reviewed changes
Copy link
Member

@ST-DDT ST-DDT left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked the translations using Google Translate.
Looks good to me.

@ST-DDT ST-DDT requested a review from a team May 21, 2022 07:41
@ST-DDT
Copy link
Member

ST-DDT commented May 21, 2022 •
edited

Please rebase/merge main:

git merge main -m "chore: merge main" && pnpm run generate:locales && git add . && git merge --continue (or similar)

@ST-DDT ST-DDT added the needs rebase There is a merge conflict label May 21, 2022
@Yago
Copy link
Contributor Author

Yago commented May 22, 2022

@ST-DDT I clean the merge commit from the branch and redid it properly 😉

@Yago Yago requested a review from ST-DDT May 22, 2022 07:06
ST-DDT
ST-DDT requested changes May 22, 2022
View reviewed changes
src/locales/fr_CH/address/street_name.ts Outdated Show resolved Hide resolved
@ST-DDT ST-DDT removed the needs rebase There is a merge conflict label May 22, 2022
@Yago Yago requested a review from ST-DDT May 22, 2022 07:32
@Shinigami92 Shinigami92 requested a review from a team May 22, 2022 11:26
@ST-DDT ST-DDT requested review from a team May 22, 2022 13:18
@Shinigami92 Shinigami92 enabled auto-merge (squash) May 22, 2022 19:15
@Shinigami92 Shinigami92 merged commit 6f39b7c into faker-js:main May 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pkuczynski pkuczynski pkuczynski approved these changes

@ST-DDT ST-DDT ST-DDT approved these changes

@Shinigami92 Shinigami92 Shinigami92 approved these changes

@import-brain import-brain import-brain approved these changes

Assignees

@Yago Yago

Labels
c: feature Request for new feature c: locale Permutes locale definitions p: 1-normal Nothing urgent s: accepted Accepted feature / Confirmed bug
Projects
No open projects
Faker Roadmap
Status: Done
Milestone
v7 - Current Major
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Yago @ST-DDT @pkuczynski @Shinigami92 @import-brain