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-20650 Translate strings #10432

Merged
merged 6 commits into from
Jun 20, 2017
Merged

CRM-20650 Translate strings #10432

merged 6 commits into from
Jun 20, 2017

Conversation

francescbassas
Copy link
Contributor

@francescbassas francescbassas changed the title CRM-20650 Translate strings from membership dashboard CRM-20650 Translate strings Jun 14, 2017
@@ -30,9 +30,9 @@
<tr class="columnheader-dark">
<th scope="col" rowspan="2">{ts}Members by Type{/ts}</th>
{if $preMonth}
<th scope="col" colspan="3">{$premonth} &ndash; {ts}(Last Month){/ts}</th>
<th scope="col" colspan="3">{ts}{$premonth}{/ts} &ndash; {ts}(Last Month){/ts}</th>
Copy link
Member

Choose a reason for hiding this comment

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

You cannot send a variable in "ts", since gettext won't be able to extract the source string.

You might be able to fix upstream by replacing: CRM/Member/Page/DashBoard.php
$this->assign('premonth', date('F', strtotime($preMonth)));

with:
$this->assign('premonth', CRM_Utils_Date::customFormat($preMonth, '%B'));

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changes applied.

{/if}
<th scope="col" colspan="3">{$month}{if $isCurrent}{ts} (MTD){/ts}{/if}</th>
<th scope="col" colspan="3">{ts}{$month}{/ts}{if $isCurrent}{ts} (MTD){/ts}{/if}</th>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@mlutfy I need to do the same with this?

Copy link
Member

Choose a reason for hiding this comment

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

@francescbassas good catch. Yes, please.

@@ -430,7 +430,7 @@ public function preProcess() {
$this->assign('totalCount', $totalCount);
$this->assign('month', date('F', $monthStartTs));
Copy link
Member

Choose a reason for hiding this comment

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

line to fix ^ (same as for premonth)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done!

@mlutfy mlutfy merged commit 7f27f35 into civicrm:master Jun 20, 2017
@mlutfy
Copy link
Member

mlutfy commented Jun 20, 2017

@francescbassas Thank you!

@francescbassas
Copy link
Contributor Author

Thanks to you @mlutfy and congratulations for your new role as a CiviCRM Core Team 😉

@francescbassas francescbassas deleted the patch-11 branch June 20, 2017 07:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants