Skip to content

Commit

Permalink
[#138] Remove translation tags from funding info
Browse files Browse the repository at this point in the history
The funding amounts are wrapped in blocktrans but the content to be
translated is just the currency and the value. Remove the blocktrans
that only caused trouble.

(Localization of how money is represented should be implemented using
local flavor (django.contrib.localflavor) I believe, if at all.)
  • Loading branch information
zzgvh committed Feb 26, 2013
1 parent 4be7a24 commit 805b3f7
Showing 1 changed file with 8 additions and 12 deletions.
20 changes: 8 additions & 12 deletions akvo/templates/inclusion_tags/funding_box.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@
<div class="fundingbox-funded">
<div class="fullyfunded-text">
<p>
{% comment %}Translators: This sum is for the project funds box{% endcomment %}
{% blocktrans with currency=project.get_currency_display|safe funds=project.funds|round|intcomma %}
{% with currency=project.get_currency_display|safe funds=project.funds|round|intcomma %}
{{currency}}: {{funds}}
{% endblocktrans %}
{% endwith %}
</p>
</div>
<p class="grey fullyfunded-text">{% trans 'This project is' %}<br />
Expand All @@ -24,19 +23,17 @@
<tr class="green">
<th style="text-align:left;">{% trans 'Raised' %}:</th>
<td>
{% comment %}Translators: This sum is for the project funds box{% endcomment %}
{% blocktrans with currency=project.get_currency_display|safe funds=project.funds|round|intcomma %}
{% with currency=project.get_currency_display|safe funds=project.funds|round|intcomma %}
{{currency}}: {{funds}}
{% endblocktrans %}
{% endwith %}
</td>
</tr>
<tr class="red">
<th style="text-align:left;">{% trans 'Still needed' %}:</th>
<td>
{% comment %}Translators: This sum is for the project funds box{% endcomment %}
{% blocktrans with currency=project.get_currency_display|safe funds=project.funds_needed|round|intcomma %}
{% with currency=project.get_currency_display|safe funds=project.funds_needed|round|intcomma %}
{{currency}}: {{funds}}
{% endblocktrans %}
{% endwith %}
</td>
</tr>
</table>
Expand All @@ -49,10 +46,9 @@
<tr>
<th style="text-align:left;">{% trans 'Total budget' %}:</th>
<td>
{% comment %}Translators: This sum is for the project funds box{% endcomment %}
{% blocktrans with currency=project.get_currency_display|safe funds=project.budget|round|intcomma %}
{% with currency=project.get_currency_display|safe funds=project.budget|round|intcomma %}
{{currency}}: {{funds}}
{% endblocktrans %}
{% endwith %}
</td>
</tr>
</table>
Expand Down

0 comments on commit 805b3f7

Please sign in to comment.