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

CRM-16355 - reminders in multilingual sites fix #8476

Merged
merged 4 commits into from
Oct 6, 2016

Conversation

samuelsov
Copy link
Contributor

@samuelsov samuelsov commented May 31, 2016

@eileenmcnaughton
Copy link
Contributor

test this please

@eileenmcnaughton
Copy link
Contributor

@xurizaemon can you look at this!!!

@JoeMurray
Copy link
Contributor

JoeMurray commented Jun 13, 2016

Samuel, comme Release Manager ce mois-ci, je suis en train de recruter des gens pour aider à parer l'arriéré de près de 100 PRs, dont certaines remontent à l'été dernier. Je me demande si vous seriez en mesure d'aider AQ autres PRs si je trouve quelqu'un d'AQ ce PR et / ou vos autres # 8538 # 7276?

@samuelsov
Copy link
Contributor Author

@JoeMurray : yes !

@eileenmcnaughton
Copy link
Contributor

Oui?

@JoeMurray
Copy link
Contributor

Samuel agreed to help QA others' PRs if I get someone to help QA his.

@JoeMurray
Copy link
Contributor

@mpnordland willing to try to QA this PR?

$i18n = CRM_Core_I18n::singleton();

// FIXME: convert to getLocale when https://issues.civicrm.org/jira/browse/CRM-18362 is fixed
global $tsLocale;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pretty sure I saw a PR merged recently which does this getLocale bit here

@MegaphoneJon
Copy link
Contributor

@samuelsov @JoeMurray I have an affected site in production, I'll QA this!

@MegaphoneJon
Copy link
Contributor

OK, I just ran this through its paces.
First - I confirm that this fixes the issue with sending scheduled reminders on multilingual sites.

Reading through the code, everything makes sense, but two things caught my eye:

  • There's a FIXME that says to revisit when CRM-18362 is fixed - which it is.
  • I don't understand why there's a fallback to pre-4.5 mode. Is this necessary? Or is this because the code was backported to a pre-4.5 client and this got left in the PR?

@samuelsov
Copy link
Contributor Author

  • about the FIXME, you are right, it's now in Core, i will remove this part
  • not sure either, i suppose it's a failsafe attitude... people have the choice of putting their mo files either with or without LC_MESSAGES but the civicrm_l10n files are shipped with the new structure so i guess we don't have to support it for ever... If we remove it there, we should remove it from the constructor to be consistent.

@samuelsov
Copy link
Contributor Author

@PalanteJon : Ok, the patch is ready to be validated again.
I have not fixed the fallback to pre-4.5 mode but i have created two helper function so that at least, there is no duplication of code (setNativeGettextLocale and setPhpGettextLocale) - they are used in the constructor and in the setLocale function. It will be easier to remove the fallback (but it's not quite the goal of this issue).

@samuelsov
Copy link
Contributor Author

The failed tests seems to be unrelated to the patch ("Incomplete Test").

@colemanw
Copy link
Member

@civicrm-builder retest this please

@monishdeb monishdeb merged commit 114f45d into civicrm:master Oct 6, 2016
@monishdeb
Copy link
Member

Merged on pass :)

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.

7 participants