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

[FIXES #7126] multi word iso category strings will not get translated #7130

Merged
merged 7 commits into from
Apr 7, 2021

Conversation

gannebamm
Copy link
Contributor

@gannebamm gannebamm commented Mar 22, 2021

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

Reviewing is a process done by project maintainers, mostly on a volunteer basis. We try to keep the overhead as small as possible and appreciate if you help us to do so by completing the following items. Feel free to ask in a comment if you have troubles with any of them.

For all pull requests:

  • Confirm you have read the contribution guidelines
  • You have sent a Contribution Licence Agreement (CLA) as necessary (not required for small changes, e.g., fixing typos in the documentation)
  • Make sure the first PR targets the master branch, eventual backports will be managed later. This can be ignored if the PR is fixing an issue that only happens in a specific branch, but not in newer ones.

The following are required only for core and extension modules (they are welcomed, but not required, for contrib modules):

  • There is a ticket in https://github.com/GeoNode/geonode/issues describing the issue/improvement/feature (a notable exemption is, changes not visible to end-users)
  • The issue connected to the PR must have Labels and Milestone assigned
  • PR for bug fixes and small new features are presented as a single commit
  • Commit message must be in the form "[Fixes #<issue_number>] Title of the Issue"
  • New unit tests have been added covering the changes, unless there is an explanation on why the tests are not necessary/implemented
  • This PR passes all existing unit tests (test results will be reported by travis-ci after opening this PR)
  • This PR passes the QA checks: flake8 geonode
  • Commits changing the settings, UI, existing user workflows, or adding new functionality, need to include documentation updates
  • Commits adding new texts do use gettext and have updated .po / .mo files (without location infos)

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.

@cla-bot cla-bot bot added the cla-signed CLA Bot: community license agreement signed label Mar 22, 2021
@gannebamm gannebamm added backport 3.3.x PR should be backported to target version backport 3.2.x PR should be backported to target version translations Issues about GeoNodes language support labels Mar 22, 2021
@afabiani afabiani added this to the 3.2 milestone Mar 22, 2021
@gannebamm
Copy link
Contributor Author

gannebamm commented Mar 22, 2021

@afabiani @t-book maybe we shall get the major languages covered in this PR? Like Italian, Spanish and French? I am not proficient in any of those, sorry.

And (to pad myself on the back): Look how nice and clean the .po diffs will be displayed since #7019 is merged 😄

@afabiani
Copy link
Member

@gannebamm I agree... I can help only with Italian though :(

@t-book
Copy link
Contributor

t-book commented Mar 22, 2021

@gannebamm agree! Learning Spanish is on my Todo List. for a long time. Unfortunately, until now I can only help with german.

@dpadron
Copy link

dpadron commented Mar 22, 2021

I could collaborate with the Spanish translation. Can you tell me the steps to follow?

@gannebamm
Copy link
Contributor Author

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.
Please use this file of this pull requests (not Master branch)
geonode/locale/es/LC_MESSAGES/django.po

@codecov
Copy link

codecov bot commented Mar 23, 2021

Codecov Report

Merging #7130 (a57528b) into master (c1007fc) will increase coverage by 0.01%.
The diff coverage is 100.00%.

❗ Current head a57528b differs from pull request most recent head e51fd3e. Consider uploading reports for the commit e51fd3e to get more accurate results

@@            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 gannebamm linked an issue Mar 24, 2021 that may be closed by this pull request
@afabiani
Copy link
Member

@gannebamm I guess you will need to push also the *.mo files in order to see the translations on GeoNode.

@audetrobergem
Copy link

@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!
geonode_french_translation.zip

@afabiani afabiani merged commit b5c81a4 into master Apr 7, 2021
@afabiani afabiani deleted the ISSUE_7126 branch April 7, 2021 11:47
@github-actions
Copy link
Contributor

github-actions bot commented Apr 7, 2021

The backport to 3.1.x failed:

The process 'git' failed with exit code 1

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 base branch is 3.1.x and the compare/head branch is backport-7130-to-3.1.x.

@github-actions
Copy link
Contributor

github-actions bot commented Apr 7, 2021

The backport to 3.2.x failed:

The process 'git' failed with exit code 1

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 base branch is 3.2.x and the compare/head branch is backport-7130-to-3.2.x.

afabiani pushed a commit that referenced this pull request Apr 7, 2021
#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
afabiani pushed a commit that referenced this pull request Apr 7, 2021
#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
afabiani pushed a commit that referenced this pull request Apr 7, 2021
#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>
afabiani pushed a commit that referenced this pull request Apr 7, 2021
* [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>
@gannebamm
Copy link
Contributor Author

@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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 3.2.x PR should be backported to target version backport 3.3.x PR should be backported to target version cla-signed CLA Bot: community license agreement signed translations Issues about GeoNodes language support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

multi word iso category strings will not get translated
5 participants