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

taxonomy: Adding Dutch translations for taxonomies #7268

Merged
merged 4 commits into from
Sep 6, 2022

Conversation

Annieieieie
Copy link
Contributor

@Annieieieie Annieieieie commented Aug 29, 2022

What

Added Dutch taxonomies

Screenshot

Related issue(s) and discussion

  • Fixes #[ISSUE NUMBER]

@github-actions github-actions bot added the 💥 Merge Conflicts 💥 Merge Conflicts label Aug 29, 2022
@@ -68,6 +68,7 @@ fr:Gressins artisanaux
hu:Kézzel készített termékek
it:Grissini artigianali, Grissini fatti a mano
nl:Handgemaakte broodstengels
nl_be:Handgemaakte broodstengels
Copy link
Contributor

Choose a reason for hiding this comment

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

Currently we do not support language variants, so only nl: is used, nl_be: will not have an effect (it's ok to add it though).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Currently we do not support language variants, so only nl: is used, nl_be: will not have an effect (it's ok to add it though).

Ohh, I didn't know! Thanks for letting me know!

@aleene
Copy link
Contributor

aleene commented Aug 29, 2022

I see you have issues "conflicting files". Usually this happens when other persons have been working on the same files. So it depends when you downloaded your versions. I'll have a look.
Start the title of your change with chore: to suppress one error.
For the language versions, I started to add those some x years ago in the hope it would be supported. I now only add an extra line if the flemish variant is different, and I add the flemish variant as synonym of the dutch variant (unless it is a really flemish product (waterzooi?).

@aleene aleene changed the title Taxonomies: Adding Dutch chore: Adding Dutch Aug 29, 2022
@aleene
Copy link
Contributor

aleene commented Aug 29, 2022

Only the primary files need to have translations added. So ending in .txt without something before like wip, result, etc.

@aleene
Copy link
Contributor

aleene commented Aug 29, 2022

in en:Sangria you added a dutch variant. As sangria is the same in many languages, a line xx:Sangria is added to indicate this. So if nl: is not found the linexx:is used. Very useful to limit lines that are the same.

@aleene
Copy link
Contributor

aleene commented Aug 29, 2022

For category entries you noticed already an issue: plural or singular? I tend to use plural, so you can read an entry as: "Dit product behoort in het vak Spaanse likeuren". But sometimes this does not work well. In any case I also add the singular form as synonym.

@aleene
Copy link
Contributor

aleene commented Aug 29, 2022

To check the conflicts do update from main (under Branch). Github will show you the files with issues.

In the file you will find something like:

nl:Vruchtensappen, Fruitsappen
<<<<<<< HEAD
nl_be:Vruchtensappen, Fruitsappen
=======
>>>>>>> main
pl:Soki owocowe

Under HEAD is your change and above main what is now the file. In this case there is real issue: so edit out the line with HEAD and everything below your change (=== and >>> main). If there is an issue you can merge the new and old versions and remove the <<<,, === and >>> lines.

@aleene
Copy link
Contributor

aleene commented Aug 29, 2022

Thanks for your work!!!

@Annieieieie
Copy link
Contributor Author

Only the primary files need to have translations added. So ending in .txt without something before like wip, result, etc.

Okay, I will remember!

@Annieieieie
Copy link
Contributor Author

Thanks for your work!!!

Thanks for the feedback, just did some taxonomies, but I didn't know how to save them!

@sonarcloud
Copy link

sonarcloud bot commented Aug 31, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@github-actions github-actions bot removed the 💥 Merge Conflicts 💥 Merge Conflicts label Sep 3, 2022
@stephanegigandet
Copy link
Contributor

@Annieieieie @aleene : I don't speak Dutch but this one looks good to me, can we merge it? Or are other changes needed?

@teolemon teolemon changed the title chore: Adding Dutch taxonomies: Adding Dutch translations for taxonomies Sep 5, 2022
@aleene
Copy link
Contributor

aleene commented Sep 5, 2022

Ok with me

@Annieieieie
Copy link
Contributor Author

@Annieieieie @aleene : I don't speak Dutch but this one looks good to me, can we merge it? Or are other changes needed?

I think it's good.

@stephanegigandet stephanegigandet changed the title taxonomies: Adding Dutch translations for taxonomies taxonomy: Adding Dutch translations for taxonomies Sep 6, 2022
Copy link
Contributor

@stephanegigandet stephanegigandet 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!

@stephanegigandet stephanegigandet merged commit 36854ad into openfoodfacts:main Sep 6, 2022
@teolemon teolemon added the Dutch label Apr 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

None yet

4 participants