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.

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

Updating French #2870

Merged
merged 7 commits into from
Nov 30, 2020
Merged

Updating French #2870

merged 7 commits into from
Nov 30, 2020

Conversation

ebeauchamps
Copy link
Contributor

No description provided.

@piljac1
Copy link
Contributor

piljac1 commented Nov 19, 2020

Shouldn't "Collapse" remain "Réduire"? Because it doesn't also mean "Développer". In fact, it's the opposite. Also, I'm not sure where "Step" is used, but in general, it seems like "Étape" suits better than "Incrément". An other thing I noted is "Jeu". Shouldn't it be something like "Ensemble" or "Section". Because in my opinion, "Jeu" is more a fr_FR way to call a "Set" and not an international french way.

@ebeauchamps
Copy link
Contributor Author

ebeauchamps commented Nov 19, 2020

Hello and thanks for your comments.

  1. Réduire is indeed a direct translation for Collapse, but in the context of the Replicator Fieldtype where this word is in use, this setting is more of chosing between 3 options (Collapse all by Default, Expand all by Default and Expand only one). So Collapse is a title for a setting in which you are going to choose if you want to Expand (Développer) or Collapse (Réduire). That's why I changed it a few minutes ago. Thoughts? (remark: I only changed Collapse, but I did not change the verb Collapse when in use in other strings) Perhaps the problem is here with Collapse as a title in the English version...

  2. Here again, I first translated Step by Etape. But Step is in use for the Range fieldtype, so it definitely not Etape but Incrément (the steps between each value in the range)

  3. Jeu has been the original translation for Set since 2.x. Ensemble is another possibility, you are right, I remember hesitating. Section is a nice idea too, and is a short word. I could change from Jeu to Section (but I will have to check for the grammar). Which one do you think is the best?

@jasonvarga Would you mind waiting before merging this commit? Thanks

@ebeauchamps ebeauchamps marked this pull request as draft November 19, 2020 16:15
@jasonvarga
Copy link
Member

Sure, mark it as ready when you're ready 😄

Major change: I have changed the translation of "Set" from "Jeu" to "Ensemble" when in use in the context of the Bard and Replicator Fieldtypes.

I have kept "Jeu" for Fieldset ("jeu de champs") and Globals ("jeu de globales") though another possibility could be to use "Groupe de".

I have also changed the translation of "Maximum" and "Minimum" from "Mximum/Minimum" to "Maximal/Minimal"
@ebeauchamps ebeauchamps marked this pull request as ready for review November 25, 2020 21:17
@ebeauchamps
Copy link
Contributor Author

I guess you could merge this PR. One could create a fr-CA language file if he/she doesn't find this one to reflect proper practices in Québec.

@piljac1
Copy link
Contributor

piljac1 commented Nov 27, 2020

I guess you could merge this PR. One could create a fr-CA language file if he/she doesn't find this one to reflect proper practices in Québec.

Looks good to me!

@jasonvarga jasonvarga merged commit 05932df into statamic:master Nov 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants