Open dpshelio opened 5 years ago
Is it because the update.sh
command deletes them? I've tested to create new paragraphs as if they would have changed in the original lesson and the update insert them properly on the pot
file as well as in the lang.po
ones.
I've read the great readme file (Thanks a lot for it!!) and I don't understand the reasoning behind those files and the git merge
step.
There might be a better way to do this but this is what I've been doing to keep the "ancestor" file needed to do a merge. This is considering the case that the English lessons have been updated. You have an old version of the lesson that has been copied (or moved) to the lesson.lang.po
. You've updated the submodule for the original English lesson and generated a new "POT" file. Now you need to merge these so that you only need to translate the updated sections. git merge
requires a common "ancestor" file. I've kept them as hidden files in case they're needed in the future for merging updates. I've added more detail to the README for the Japanese repo so that people with less experience with Git can make contributions.
There might be a better way to do this. I'm not an expert with Git.
What I think - but I've not tested many possibilities - is that we don't need to do any git merge
. The update script will find what's new (e.g., a new paragraph), what has changed (e.g., a typo fixed) and update the lesson.lang.po
accordingly. Marking the new sections as new
and the inner changes as fuzzy
(or to check) keeping the translation from the original text. Again, I might have not tested all the possibilities, but I did a few and it worked as expected in all of them. Please, if you find a case that's not true, then I'm happy to look into the po4gitbook to find out what needs to be updated.
Sorry, I wasn't aware that this script would handle existing translations. That approach sounds way better than getting messy with git. I've only tested generating new PO files for a new translation of a lesson. I haven't tested updates yet but it's sounds you've got them covered. If that's the case, then we can remove these files.
Here's a quick update. Some of the content in the README is still specific to the Japanese repo but any pointers on how to improve it are welcome.
Great!! I'll try to set up some docs with sphinx... let's see how that goes.
Thanks, that would really help. The main challenge for the Japanese team at the moment is getting new contributors on board (especially since some aren’t confident with git).
We’re looking at migrating a lot of the guides to the wiki page. I think that’ll mean we can merge without dragging details specific to Japanese translations: if you’ve got any pointers on our extended version of the README, let us know. It’s still a work in progress. @rikutakei has done a great job whipping up a “QuickStart” guide. We’re looking to split up sections of the README into separate files as well (since it’s information overload at the moment).
Most of this to be moved to i18n-handbook. carpentries-i18n/i18n-handbook#4 Rest to be included as translations to the repos.
@dpshelio Just to let you know, we're close to having a full Japanese translation of the R gapminder lessons. It's a bit out of date at this point but we will discuss maintaining/updating it after it's completed. We have a demo here: https://swcarpentry-ja.github.io/r-novice-gapminder/ja/_episodes/01-rstudio-intro/index.html
Are you still interesting in merging them? Seems the Spanish R course has been archived but I may be looking at the wrong repo. https://github.com/Carpentries-ES/r-novice-gapminder
Certainly, I want to merge them! (the ja and es). That repo was translated independently of this tool. Ideally, I would like to convert it into a po file, but when I tried with a different lesson random spaces were making it not to match. I may spend a copy&paste afternoon and bring it to this organisation.
Hi @dpshelio, great to hear you're still interested in this! Let us know if you get it ready to try merging into a tri-lingual course.
We're going through the last PR to complete the R course in Japanese now. We're on track to have it done quite soon I think.
Just full disclosure, our Japanese lesson as a translation is a little out of date now. I think the Spanish repo is too. We are planning to discuss maintain/updating it but at the moment it's not the same as the version on SWC website. Will different versions be a problem for merging them?
I'm planning to merge this. But before that, could anyone explain what are the hidden
.<lessonName>.po.ancestor
files?