Gdpr updates with language split #46
Conversation
saved per country - now per language
|
I am comparing now to the one from @vborghe (#43 (comment)) and would like to bring both histories together so both contributions are in the history/acknowleded. |
* gh-vborghe/master: (25 commits) Create ultimate.pl.rst Update ultimate.rst Create ultimate.it.rst Create ultimate.es.rst Create ultimate.zh.rst Create ultimate.fr.rst Create ultimate.de.rst Update ultimate_gdpr.rst Create ultimate_gdpr.bs.rst Create ultimate_gdpr.fr.rst Create ultimate_gdpr.cs.rst Create ultimate_gdpr.it.rst Create ultimate_gdpr.no.rst Create ultimate_gdpr.es.rst typo Create ultimate_gdpr.tr.rst Rename docs/source/gdpr/greek.rst to docs/source/gdpr/i18n/ultimate_gdpr.el.rst Rename docs/source/gdpr/german.rst to docs/source/gdpr/i18n/ultimate_gdpr.de.rst language codes Rename el.rst to greek.rst ... Conflicts: docs/source/gdpr/i18n/ultimate_gdpr.bs.rst docs/source/gdpr/i18n/ultimate_gdpr.cs.rst docs/source/gdpr/i18n/ultimate_gdpr.de.rst docs/source/gdpr/i18n/ultimate_gdpr.el.rst docs/source/gdpr/i18n/ultimate_gdpr.es.rst docs/source/gdpr/i18n/ultimate_gdpr.fr.rst docs/source/gdpr/i18n/ultimate_gdpr.it.rst docs/source/gdpr/i18n/ultimate_gdpr.no.rst docs/source/gdpr/i18n/ultimate_gdpr.tr.rst docs/source/gdpr/ultimate_gdpr.rst docs/source/i18n/ultimate.de.rst docs/source/i18n/ultimate.es.rst docs/source/i18n/ultimate.fr.rst docs/source/i18n/ultimate.it.rst docs/source/i18n/ultimate.pl.rst docs/source/ultimate.rst Overall strategy for conflicts resolution was to adopt section titles with the language names from vborghe's version, and also place "courtesy" statements into (). I have removed -Hans suffix from .zh version since not sure what it was. And I have adopted @vborghe's approach to list translations in their section on the corresponding page. I sorted lines, so the iso language abbreviation determined the order (would make things easier in future to add new ones in a standardized order)
…lude i18n/data_user_agreement.de.rst into TOC
…nsistent appearance TOC is still to be worked on -- ATM we would display all translations for ultimate but not for GDPR since they are too deep down etc
Note: might not work on windows since requires annex with libmagic build
=== Do not change lines below ===
{
"chain": [],
"cmd": "sed -i -e 's,\\(translation.*\\),(\\1),g' docs/source/gdpr/i18n/data_user_agreement.bs.rst docs/source/gdpr/i18n/data_user_agreement.cs.rst docs/source/gdpr/i18n/data_user_agreement.de.rst docs/source/gdpr/i18n/data_user_agreement.el.rst docs/source/gdpr/i18n/data_user_agreement.es.rst docs/source/gdpr/i18n/data_user_agreement.fr.rst docs/source/gdpr/i18n/data_user_agreement.it.rst docs/source/gdpr/i18n/data_user_agreement.nl.rst docs/source/gdpr/i18n/data_user_agreement.no.rst docs/source/gdpr/i18n/data_user_agreement.tr.rst",
"exit": 0,
"extra_inputs": [],
"inputs": [],
"outputs": [],
"pwd": "."
}
^^^ Do not change lines above ^^^
|
Thanks again @CPernet @vborghe ! I have pushed my merge of @vborghe 's work, which in that merge commit cf69bd6 describes how I resolved conflicts (what took from that branch). Then I pushed more of various changes. Please review final form -- you could get to it by expanding "Show all checks" and clicking on "Details" for RTD (ATM the url is https://open-brain-consent--46.org.readthedocs.build/en/46/ which probably would stay like that even if more pushed to this branch/PR). When looks all good, we would be able to merge and then I could embed versions to each one of those following #42 (didn't want to pollute this already large PR) |
|
Sorry, I am impatient, let's just merge and then fixup what needs to be fixed up if anything ;) |
|
zh-Hans is Chinese simplified (as indicated in the translation) --> that's the ISO you recommended following |
|
He he. So it is defined on that page https://www.w3schools.com/tags/ref_language_codes.asp which I originally pointed out. I went to https://en.m.wikipedia.org/wiki/List_of_ISO_639-1_codes where I didn't find it, thus started to ask. I think we should be safe with just two letters abbreviation in this case. |
language split and index updates
@con/vanessasaurus duplicate?
Closes: #43
Closes: #29 (chrome auto translates ultimate)