c5ef65bcf3
[py3] Ported django.utils.encoding.
...
* Renamed smart_unicode to smart_text (but kept the old name under
Python 2 for backwards compatibility).
* Renamed smart_str to smart_bytes.
* Re-introduced smart_str as an alias for smart_text under Python 3
and smart_bytes under Python 2 (which is backwards compatible).
Thus smart_str always returns a str objects.
* Used the new smart_str in a few places where both Python 2 and 3
want a str.
2012-08-07 12:00:22 +02:00
5d560dcb98
Fixed #18504 -- Computed |naturalday in local time.
2012-07-19 23:02:22 +02:00
123362dd37
Fixed #18608 -- Reduced monkey-patching in tests.
...
Thanks Claude Paroz for the patch.
2012-07-19 20:02:20 +02:00
4a103086d5
Fixed #18269 -- Applied unicode_literals for Python 3 compatibility.
...
Thanks Vinay Sajip for the support of his django3 branch and
Jannis Leidel for the review.
2012-06-07 18:08:47 +02:00
38408f8007
Marked bytestrings with b prefix. Refs #18269
...
This is a preparation for unicode literals general usage in
Django (Python 3 compatibility).
2012-05-19 17:43:34 +02:00
9383a2761c
Removed with_statement imports, useless in Python >= 2.6. Refs #17965 . Thanks jonash for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17828 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-30 08:02:08 +00:00
6017c9fd2d
Pulled humanize translations updates from Transifex. Refs #17822 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17789 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-23 03:09:42 +00:00
9d1d1f06db
Added Tatar translation. Refs #17822 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17732 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-14 09:15:31 +00:00
e540f27475
Added Swahili translation. Refs #17822 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17731 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-14 09:14:48 +00:00
830900c24a
Added Nepali translation. Refs #17822 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17730 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-14 09:14:07 +00:00
661139a29e
Added Kazakh translation. Refs #17822 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17729 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-14 09:13:24 +00:00
e47b92dad7
Added Esperanto to the list of languages. Refs #17822 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-14 09:12:43 +00:00
8256abc181
Pulled the humanize translations updates from Transifex. Refs #17822 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17722 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-14 09:05:08 +00:00
ddb2a9eb9e
Fixed #17414 -- Prevented numberformat from trying to group digits when the number of digits per group is zero.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17267 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-24 11:01:57 +00:00
4c376852fe
Updated English base translation files in preparation of the alpha release so Transifex can pick them up.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17250 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-22 23:02:28 +00:00
e71f33625c
Fixed the humanize tests to work properly with a pure-python datetime module (platforms such as PyPy)
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17144 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-22 09:20:58 +00:00
9b1cb755a2
Added support for time zones. Thanks Luke Plant for the review. Fixed #2626 .
...
For more information on this project, see this thread:
http://groups.google.com/group/django-developers/browse_thread/thread/cf0423bbb85b1bbf
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17106 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-18 13:01:06 +00:00
d17bc72880
Fixed #17135 -- Made it possible to use decorators (like stringfilter) on template filter functions in combination with auto-escaping. Refs #16726 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17056 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-30 07:32:21 +00:00
52c66a21e1
Used the decorator syntax consistently to register template filters.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17052 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-29 14:51:43 +00:00
5a16b64ed2
Avoid spurious failures in naturaltime tests.
...
Previous fix didn't cover timesince module, which naturaltime delegates to
under certain conditions. Extended mock of datetime to timesince module, and
switched to a fixed datetime rather than now() for testing, for more
reproducible tests (failures in mock will fail fast, rather than sporadically).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17038 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-26 15:17:43 +00:00
6df91d9539
Fixed #17086 -- Removed pollution of global template-builtins from markup and humanize tests.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17031 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-24 21:30:55 +00:00
36a44ae75f
Mocked datetime in the naturaltime tests to avoid sporadic test failure.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17023 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-22 06:06:44 +00:00
ce9e3b4e97
Fixed a regression introduced in r16897. Thanks to Julien for the eagle eyes and Florian Apolloner for the review.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16900 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-24 13:32:57 +00:00
6cae2a550d
Fixed #16878 -- Improved intword filter to support numbers up to decillion and googol. Thanks to crodjer for the initial patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16897 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-23 16:45:40 +00:00
699688dc2c
Switch to using explicit new-style division behavior, rather than relying on teh classic behavior.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16745 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-09 21:45:58 +00:00
944ef3bb60
Fixed #16404 -- Fixed a regression in the localization changes in the humanize app made in r16168. Thanks, grepsd@gmail.com.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16726 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-08 13:25:11 +00:00
578a31fea3
Fixed #15921 -- Refined naturaltime filter added in r16071 to use timesince and timeuntil filters as fallbacks instead of date filter.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16233 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-17 10:16:12 +00:00
688abe3b8d
Fixed #15981 -- Use ungettext instead of manually checking for plurals. Thanks, gasperzejn.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16181 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-07 19:55:51 +00:00
8f3e1c1c63
Fixed #6392 -- Made django.contrib.humanize template tags locale aware. Thanks, Dave McLain.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16168 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-06 13:29:58 +00:00
0b1a061881
Replaced old-style with new-style decorator syntax.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-01 16:46:02 +00:00
e744fec8f9
Fixed #11321 -- Handle timezones correctly in conjunction with naturalday filter. Thanks, aarond10 and seocam.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16072 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-22 12:02:55 +00:00
ea248f0107
Fixed #12771 -- Added naturaltime filter to humanize contrib app. Thanks, phinpho, djansoft and xtrqt.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16071 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-22 12:02:47 +00:00
d60ae0b721
Removed deprecated 'no' translation
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15988 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:43:43 +00:00
ada8e2a6fa
Pulled translation updates from Transifex again.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15886 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-20 22:16:14 +00:00
5347bbd514
Fixed plural forms formula for the Croatian (hr) localization by manually overriding the header of affected .po files and re-generating .mo files, this seems to be a quirck in Transifex export to PO functionality. Thanks bmihelac fot the report. Refs #15634 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15875 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 22:56:10 +00:00
f193c17979
Pulled humanize translation updates from Transifex.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15832 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:10:24 +00:00
90564a156c
Fixed Hungarian, Russian, Serbian and Ukranian plural forms introduced in r15680.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15752 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-04 01:07:11 +00:00
c11140d04b
Fixed plural forms of Irish translation introduced in r15680.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15751 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-04 01:05:10 +00:00
53b2a25396
Fixed plural forms of Welsh translation introduced in r15680.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15750 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-04 01:04:31 +00:00
bef353873e
Fixed plural forms of Bosnian translation introduced in r15680.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15749 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-04 01:03:14 +00:00
c06ed72759
Updated humanize translations from transifex.net. Refs #15300 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15690 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 09:06:04 +00:00
7536f63b32
Fixed #14768 -- Added an es_MX locale and initial translation. Thanks to Alonso Bautista Villalobos and the rest of the Mexican translation team.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15433 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-06 06:06:29 +00:00
7ff65caa7b
Added new translation files to humanize contrib app.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15266 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-21 18:46:59 +00:00
3cf8502d35
Fixed #4976 -- Stopped humanize template tags to raise a TypeError if passed a value of ``None``. Thanks, Simon G. and Adam Vandenberg.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15000 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 15:07:43 +00:00
8b9cf79ff6
Fixed #11783 -- ordinal template tag now catches TypeError. Thanks, realpolitik and punteney
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12199 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 21:37:20 +00:00
f1a24be01c
Fixed #6481 -- Fixed a bunch of import problems (and some whitespace cleanups).
...
Found by Bastian Kleineidam with help from pyflakes. Thanks.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7131 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-02-19 00:08:08 +00:00
356662cf74
Implemented auto-escaping of variable output in templates. Fully controllable by template authors and it's possible to write filters and templates that simulataneously work in both auto-escaped and non-auto-escaped environments if you need to. Fixed #2359
...
See documentation in templates.txt and templates_python.txt for how everything
works.
Backwards incompatible if you're inserting raw HTML output via template variables.
Based on an original design from Simon Willison and with debugging help from Michael Radziej.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-14 12:58:53 +00:00
14b5e074ba
Fixed #3311 -- Added naturalday filter to contrib.humanize. Thanks, Jyrki Pulliainen.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-08-20 08:50:08 +00:00
953badbea5
Merged Unicode branch into trunk (r4952:5608). This should be fully
...
backwards compatible for all practical purposes.
Fixed #2391 , #2489 , #2996 , #3322 , #3344 , #3370 , #3406 , #3432 , #3454 , #3492 , #3582 , #3690 , #3878 , #3891 , #3937 , #4039 , #4141 , #4227 , #4286 , #4291 , #4300 , #4452 , #4702
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-07-04 12:11:04 +00:00
587abaa95c
Removed stray tab in django.contrib.humanize template tag
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4856 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-03-29 22:28:13 +00:00
Aymeric Augustin
Claude Paroz
Jannis Leidel
Alex Gaynor
Carl Meyer
Russell Keith-Magee
Ramiro Morales
Adrian Holovaty
Malcolm Tredinnick