Skip to content

[Backport to 3.1.x][FIXES #7126] multi word iso category strings will not get translate…#7250

Merged
afabiani merged 1 commit into3.1.xfrom
backport_ISSUE_7126_3.1.x
Apr 7, 2021
Merged

[Backport to 3.1.x][FIXES #7126] multi word iso category strings will not get translate…#7250
afabiani merged 1 commit into3.1.xfrom
backport_ISSUE_7126_3.1.x

Conversation

@afabiani
Copy link
Member

@afabiani afabiani commented Apr 7, 2021

…d (#7130)

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

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.

#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
@cla-bot cla-bot bot added the cla-signed CLA Bot: community license agreement signed label Apr 7, 2021
@afabiani afabiani merged commit 6b4c4ba into 3.1.x Apr 7, 2021
@afabiani afabiani deleted the backport_ISSUE_7126_3.1.x branch April 7, 2021 13:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed CLA Bot: community license agreement signed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants