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

Fix capitalisation for 'Republic of' countries (Iran, Macedonia) #12802

Merged
merged 1 commit into from
Sep 12, 2018

Conversation

mlutfy
Copy link
Member

@mlutfy mlutfy commented Sep 11, 2018

Overview

Some time ago, in early 4.7, country names were converted to uppercase. This change was later reverted. However, some names were incorrectly normalized, such as:

  • Iran, Republic of (was 'Republic Of')
  • Macedonia, Republic of (same).

This commit reverts that change.

Caught this while updating Transifex strings. I want to avoid sending incorrect strings to translators.

Comments

Includes changes for the initial install, as well as for sites to upgrade (country names are saved in the database, and then later send through gettext at runtime).

@mlutfy
Copy link
Member Author

mlutfy commented Sep 12, 2018

jenkins, test this please

@eileenmcnaughton
Copy link
Contributor

test fails unrelated

@eileenmcnaughton eileenmcnaughton merged commit 1fd9966 into civicrm:master Sep 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants