mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #24257 -- Corrected i18n handling of percent signs.

Browse Source 
Refactored tests to use a sample project.

Updated extraction:
* Removed special handling of single percent signs.
* When extracting messages from template text, doubled all percent signs
  so they are not interpreted by gettext as string format flags. All
  strings extracted by gettext, if containing a percent sign, will now
  be labeled "#, python-format".

Updated translation:
* Used "%%" for "%" in template text before calling gettext.
* Updated {% trans %} rendering to restore "%" from "%%".
This commit is contained in:
Doug Beck
2015-04-15 17:01:11 -04:00
committed by Tim Graham
parent d772d812cf
commit b7508896fb
20 changed files with 340 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/i18n/sampleproject/templates/percents.html Normal file
View File

@@ -0,0 +1,12 @@
{% load i18n %}
{% trans "Literal with a percent symbol at the end %" %}
{% trans "Literal with a percent % symbol in the middle" %}
{% trans "It is 100%" %}
{% trans "It is 100%" context "female" %}
{% trans "Looks like a str fmt spec %s but should not be interpreted as such" %}
{% trans "Looks like a str fmt spec % o but should not be interpreted as such" %}
{% trans "1 percent sign %, 2 percent signs %%, 3 percent signs %%%" %}
{% blocktrans with name="Simon" %}{{name}} says: 1 percent sign %, 2 percent signs %%{% endblocktrans %}