-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
[FIXES #7126] multi word iso category strings will not get translated #7130
Conversation
@gannebamm I agree... I can help only with Italian though :( |
@gannebamm agree! Learning Spanish is on my Todo List. for a long time. Unfortunately, until now I can only help with german. |
I could collaborate with the Spanish translation. Can you tell me the steps to follow? |
You can download the django.po file for spanisch localisation and upload it again somewhere. I will cover the rest. |
Codecov Report
@@ Coverage Diff @@
## master #7130 +/- ##
==========================================
+ Coverage 59.07% 59.08% +0.01%
==========================================
Files 565 565
Lines 39827 39840 +13
Branches 5282 5282
==========================================
+ Hits 23527 23540 +13
Misses 14935 14935
Partials 1365 1365 |
@gannebamm I guess you will need to push also the *.mo files in order to see the translations on GeoNode. |
@gannebamm Here are the French translation files. I corrected some mistakes and added translations where there were none. I also corrected the isotopic categories. Let me know if there is anything that is not working. Cheers! |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-3.1.x 3.1.x
# Navigate to the new working tree
cd .worktrees/backport-3.1.x
# Create a new branch
git switch --create backport-7130-to-3.1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick b5c81a49b1ac8b4264c0e5b553c00f4d9a3061c3
# Push it to GitHub
git push --set-upstream origin backport-7130-to-3.1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-3.1.x Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-3.2.x 3.2.x
# Navigate to the new working tree
cd .worktrees/backport-3.2.x
# Create a new branch
git switch --create backport-7130-to-3.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick b5c81a49b1ac8b4264c0e5b553c00f4d9a3061c3
# Push it to GitHub
git push --set-upstream origin backport-7130-to-3.2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-3.2.x Then, create a pull request where the |
#7130) * [FIXES #7126]multi word iso category strings will not get translated * [FIXES #7126]multi word iso category strings will not get translated * [FIXES #7126] multi word iso category strings will not get translated * - Italian translations * French Translations * Italian Translations Co-authored-by: afabiani <alessio.fabiani@gmail.com> (cherry picked from commit b5c81a4) # Conflicts: # geonode/locale/it/LC_MESSAGES/django.mo # geonode/locale/it/LC_MESSAGES/django.po
#7130) * [FIXES #7126]multi word iso category strings will not get translated * [FIXES #7126]multi word iso category strings will not get translated * [FIXES #7126] multi word iso category strings will not get translated * - Italian translations * French Translations * Italian Translations Co-authored-by: afabiani <alessio.fabiani@gmail.com> (cherry picked from commit b5c81a4) # Conflicts: # geonode/custom_translations.py # geonode/locale/af/LC_MESSAGES/django.po # geonode/locale/al/LC_MESSAGES/django.po # geonode/locale/am/LC_MESSAGES/django.po # geonode/locale/ar/LC_MESSAGES/django.po # geonode/locale/bg_BG/LC_MESSAGES/django.po # geonode/locale/bn/LC_MESSAGES/django.po # geonode/locale/de/LC_MESSAGES/django.mo # geonode/locale/de/LC_MESSAGES/django.po # geonode/locale/el/LC_MESSAGES/django.po # geonode/locale/en/LC_MESSAGES/django.po # geonode/locale/es/LC_MESSAGES/django.po # geonode/locale/fa/LC_MESSAGES/django.po # geonode/locale/fa_IR/LC_MESSAGES/django.po # geonode/locale/fi/LC_MESSAGES/django.po # geonode/locale/fil/LC_MESSAGES/django.po # geonode/locale/fr/LC_MESSAGES/django.mo # geonode/locale/fr/LC_MESSAGES/django.po # geonode/locale/hu/LC_MESSAGES/django.po # geonode/locale/id/LC_MESSAGES/django.po # geonode/locale/it/LC_MESSAGES/django.mo # geonode/locale/it/LC_MESSAGES/django.po # geonode/locale/ja/LC_MESSAGES/django.po # geonode/locale/ka/LC_MESSAGES/django.po # geonode/locale/km/LC_MESSAGES/django.po # geonode/locale/ko/LC_MESSAGES/django.po # geonode/locale/lt/LC_MESSAGES/django.po # geonode/locale/ne/LC_MESSAGES/django.po # geonode/locale/nl_NL/LC_MESSAGES/django.po # geonode/locale/no/LC_MESSAGES/django.po # geonode/locale/pl/LC_MESSAGES/django.po # geonode/locale/pt/LC_MESSAGES/django.po # geonode/locale/pt_BR/LC_MESSAGES/django.po # geonode/locale/ro/LC_MESSAGES/django.po # geonode/locale/ru/LC_MESSAGES/django.po # geonode/locale/si/LC_MESSAGES/django.po # geonode/locale/sk/LC_MESSAGES/django.po # geonode/locale/sq/LC_MESSAGES/django.po # geonode/locale/sv/LC_MESSAGES/django.po # geonode/locale/sw/LC_MESSAGES/django.po # geonode/locale/ta/LC_MESSAGES/django.po # geonode/locale/th/LC_MESSAGES/django.po # geonode/locale/tl/LC_MESSAGES/django.po # geonode/locale/uk/LC_MESSAGES/django.po # geonode/locale/vi/LC_MESSAGES/django.po # geonode/locale/zh/LC_MESSAGES/django.po
#7130) (#7250) * [FIXES #7126]multi word iso category strings will not get translated * [FIXES #7126]multi word iso category strings will not get translated * [FIXES #7126] multi word iso category strings will not get translated * - Italian translations * French Translations * Italian Translations Co-authored-by: afabiani <alessio.fabiani@gmail.com> (cherry picked from commit b5c81a4) # Conflicts: # geonode/custom_translations.py # geonode/locale/af/LC_MESSAGES/django.po # geonode/locale/al/LC_MESSAGES/django.po # geonode/locale/am/LC_MESSAGES/django.po # geonode/locale/ar/LC_MESSAGES/django.po # geonode/locale/bg_BG/LC_MESSAGES/django.po # geonode/locale/bn/LC_MESSAGES/django.po # geonode/locale/de/LC_MESSAGES/django.mo # geonode/locale/de/LC_MESSAGES/django.po # geonode/locale/el/LC_MESSAGES/django.po # geonode/locale/en/LC_MESSAGES/django.po # geonode/locale/es/LC_MESSAGES/django.po # geonode/locale/fa/LC_MESSAGES/django.po # geonode/locale/fa_IR/LC_MESSAGES/django.po # geonode/locale/fi/LC_MESSAGES/django.po # geonode/locale/fil/LC_MESSAGES/django.po # geonode/locale/fr/LC_MESSAGES/django.mo # geonode/locale/fr/LC_MESSAGES/django.po # geonode/locale/hu/LC_MESSAGES/django.po # geonode/locale/id/LC_MESSAGES/django.po # geonode/locale/it/LC_MESSAGES/django.mo # geonode/locale/it/LC_MESSAGES/django.po # geonode/locale/ja/LC_MESSAGES/django.po # geonode/locale/ka/LC_MESSAGES/django.po # geonode/locale/km/LC_MESSAGES/django.po # geonode/locale/ko/LC_MESSAGES/django.po # geonode/locale/lt/LC_MESSAGES/django.po # geonode/locale/ne/LC_MESSAGES/django.po # geonode/locale/nl_NL/LC_MESSAGES/django.po # geonode/locale/no/LC_MESSAGES/django.po # geonode/locale/pl/LC_MESSAGES/django.po # geonode/locale/pt/LC_MESSAGES/django.po # geonode/locale/pt_BR/LC_MESSAGES/django.po # geonode/locale/ro/LC_MESSAGES/django.po # geonode/locale/ru/LC_MESSAGES/django.po # geonode/locale/si/LC_MESSAGES/django.po # geonode/locale/sk/LC_MESSAGES/django.po # geonode/locale/sq/LC_MESSAGES/django.po # geonode/locale/sv/LC_MESSAGES/django.po # geonode/locale/sw/LC_MESSAGES/django.po # geonode/locale/ta/LC_MESSAGES/django.po # geonode/locale/th/LC_MESSAGES/django.po # geonode/locale/tl/LC_MESSAGES/django.po # geonode/locale/uk/LC_MESSAGES/django.po # geonode/locale/vi/LC_MESSAGES/django.po # geonode/locale/zh/LC_MESSAGES/django.po Co-authored-by: Florian Hoedt <gannebamm@gmail.com>
* [FIXES #7126] multi word iso category strings will not get translated (#7130) * [FIXES #7126]multi word iso category strings will not get translated * [FIXES #7126]multi word iso category strings will not get translated * [FIXES #7126] multi word iso category strings will not get translated * - Italian translations * French Translations * Italian Translations Co-authored-by: afabiani <alessio.fabiani@gmail.com> (cherry picked from commit b5c81a4) # Conflicts: # geonode/locale/it/LC_MESSAGES/django.mo # geonode/locale/it/LC_MESSAGES/django.po * - Updating translations * - Updating translations Co-authored-by: Florian Hoedt <gannebamm@gmail.com>
@afabiani Thanks, for taking care of this! Sorry that I 'staled' this PR. I was on vacation and lost track of some of my open work here. |
fixed custom_translation.py errors and rebuild the translation files. Only the german .po file was compiled to .mo. The new translation strings must be translated by the respective native speakers.
Checklist
For all pull requests:
The following are required only for core and extension modules (they are welcomed, but not required, for contrib modules):
Submitting the PR does not require you to check all items, but by the time it gets merged, they should be either satisfied or inapplicable.