mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-27 03:25:58 +00:00
Code Issues 30 Releases Wiki Activity
13,749 Commits 28 Branches 426 Tags 668 MiB
08dc90bccf
Commit Graph

139 Commits

Author SHA1 Message Date
Aymeric Augustin
ace9d4efc3 Made ungettext_lazy usable for messages that do not contain the count. 
Fixed #19160 (again). Thanks Alexey Boriskin.
 2013-02-02 10:58:31 +01:00
Aymeric Augustin
3f1a0c0040 Fixed #19160 -- Made lazy plural translations usable. 
Many thanks to Alexey Boriskin, Claude Paroz and Julien Phalip.
 2013-01-30 20:28:16 +01:00
Ramiro Morales
47ddd6a408 Fixed #19552 -- Enhanced makemessages handling of `{# #}`-style template comments. 
They are simply ignored now. This allows for a more correct behavior when
they are placed before translatable constructs on the same line.

Previously, the latter were wrongly ignored because the former were
preserved when converting template code to the internal Python-syntax
form later fed to xgettext but Python has no ``/* ... */``-style
comments.

Also, special comments directed to translators are now only taken in
account when they are located at the end of a line. e.g.::

  {# Translators: ignored #}{% trans "Literal A" %}{# Translators: valid, associated with "Literal B" below #}
  {% trans "Literal B" %}

Behavior of ``{% comment %}...{% endcomment %}``tags remains unchanged.

Thanks juneih at redpill-linpro dot com for the report and Claude for
his work on the issue.
 2013-01-29 19:13:23 -03:00
Aymeric Augustin
55416e235d Fixed #19589 -- assertRegexpMatches is deprecated in Python 3.3. 2013-01-26 13:47:11 +01:00
Ramiro Morales
ce27fb198d Revert "Patch by Claude for #16084." 
This reverts commit 2babab0bb3.
 2013-01-25 13:58:37 -03:00
Ramiro Morales
2babab0bb3 Patch by Claude for #16084. 2013-01-25 13:23:33 -03:00
Ramiro Morales
57d439e2d4 More i18n makemessages tests tweaks. 2013-01-24 07:51:14 -03:00
Ramiro Morales
456f9b9847 Simplified a i18n test. 2013-01-21 23:22:18 -03:00
Craig Blaszczyk
6158c79dbe Made (make|compile)messages commands accept multiple locales at once. 
Thanks Craig Blaszczyk for the initial patch. Refs #17181.
 2013-01-17 00:53:17 -03:00
Ramiro Morales
295650bd01 Simplified i18n commands tests. 2013-01-17 00:35:46 -03:00
Ramiro Morales
248aee1606 Modified makemessages so it creates .pot files once per invocation. 
It creates a `locale/django.pot` file once instead of one
`locale/<locale_code>/django.pot` file for every locale involved.

Thanks Michal Čihař for the report and patch.
 2013-01-16 20:48:06 -03:00
Ramiro Morales
eee865257a Fixed #17008 -- Added makemessages option to not remove .pot files. 
Thanks airstrike for the report and initial patch, Julien for an
enhanced patch and Jannis for reviewing.
 2013-01-16 20:29:06 -03:00
Claude Paroz
bcdb4898ca Fixed #19488 -- Made i18n_patterns redirect work with non-slash-ending paths 
Thanks Daniel Gerzo for the report and the initial patch.
 2013-01-11 21:27:51 +01:00
Ian Clelland
8d35fd4c32 Use new TestCase methods for equality comparisons 2012-12-24 00:24:14 +00:00
Claude Paroz
c91667338a Fixed #19357 -- Allow non-ASCII chars in filesystem paths 
Thanks kujiu for the report and Aymeric Augustin for the review.
 2012-12-08 11:13:52 +01:00
Claude Paroz
550ddc66b4 Fixed #19272 -- Fixed gettext_lazy returned type on Python 2 
Thanks tyrion for the report.
 2012-11-14 10:50:15 +01:00
Claude Paroz
9fd2f9c5f3 Fixed #19088 -- Always escape % inside blocktrans tag 
Thanks vlinhart for the report and Łukasz Rekucki for the patch.
 2012-10-23 18:49:22 +02:00
Claude Paroz
e70170c2cb Cleaned up i18n regression tests 2012-10-22 14:45:41 +02:00
Jan Bednařík
e6b34193c5 Fixed #19142 -- Language codes can include numbers (RFC 3066). 2012-10-21 01:25:35 +02:00
Julien Phalip
b8244c654c Fixed #18881 -- Made the context option in {% trans %} and {% blocktrans %} accept literals wrapped in single quotes. Thanks to lanyjie for the report. 2012-09-27 20:34:45 -07:00
Alex Gaynor
a92b81b0e8 Fixed tests that I broke a few commits ago. 2012-09-07 14:01:46 -04:00
Alex Gaynor
292322f977 [py3k] Silence many warnings while running the tests. 2012-09-07 13:17:34 -04:00
Alexey Boriskin
10d32072af Fixed #18798 -- Renamed conflicting test methods in i18n tests 2012-08-23 11:27:56 +02:00
Aymeric Augustin
547b181046 [py3] Ported django.utils.safestring. 
Backwards compatibility aliases were created under Python 2.
 2012-08-18 16:04:06 +02:00
Aymeric Augustin
85e7a5e140 [py3] Stopped attempting to translate bytes. 
That goes actively against the goal of cleaning string handling.
 2012-08-18 11:36:09 +02:00
Claude Paroz
96a6912ec5 [py3] Fixed compilemessages tests 2012-08-08 23:40:20 +02:00
Aymeric Augustin
396357741b [py3] Used compatible imports of StringIO. 2012-08-08 14:50:01 +02:00
Aymeric Augustin
bdca5ea345 [py3] Replaced unicode/str by six.text_type/bytes. 2012-07-22 09:29:54 +02:00
Aymeric Augustin
3cb2457f46 [py3] Replaced basestring by six.string_types. 2012-07-22 09:29:54 +02:00
Aymeric Augustin
56dbe924a6 [py3] Removed longs. 2012-07-22 09:29:53 +02:00
Claude Paroz
c54905b359 Fixed #18479 -- Stopped makemessages raising error on gettext warnings 
Thanks Niels Busch for the initial patch.
 2012-07-18 20:43:35 +02:00
Claude Paroz
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
Julien Phalip
432339a72c Fixed #18393 -- Prevented blocktrans to crash when a variable name is badly formatted. 2012-05-28 11:03:34 -07:00
Claude Paroz
c3b56c7cdd Used call_command in i18n compilation tests. 
Now that call_command does not raise SystemExit any more, we can
use call_command again for testing compilemessages.
 2012-05-27 23:11:27 +02:00
Claude Paroz
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
Claude Paroz
d7dfab59ea Replaced cStringIO.StringIO by io.BytesIO. 
Also replaced StringIO.StringIO by BytesIO in some other appropriate
places. StringIO is not available in Python 3.
 2012-05-05 21:41:44 +02:00
Claude Paroz
10cf3c6427 Used catch_warnings instead of save/restore methods. Refs #17049. 2012-05-03 18:30:07 +02:00
Ramiro Morales
ea28bc2688 Removed unused file from i18n regression tests. 2012-05-03 12:00:36 -03:00
Claude Paroz
eb351ac9cb Fixed #18037 -- Changed behaviour of url and ssi template tags to the new syntax, as per official deprecation timeline. Thanks Ramiro Morales and Jannis Leidel for the review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17934 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-24 19:55:52 +00:00
Ramiro Morales
b41ebcf1b9 Fixed #18040 -- Removed so-called project-level locale trees from the list of paths the translation loading process takes in account. 
Deprecated in Django 1.3. Removed completely for Django 1.5.

Thanks Claude for the review.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17861 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-31 22:24:24 +00:00
Aymeric Augustin
eb163f37cb Use the class decorator syntax available in Python >= 2.6. Refs #17965. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-30 09:08:29 +00:00
Claude Paroz
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
Jannis Leidel
126d9e1b49 Fixed #17817 -- Modified LocalMiddleware to use full URLs when redirecting to i18n URLs. Thanks to Paul for keeping an eye on the standards. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17633 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-02 22:35:26 +00:00
Jannis Leidel
746987f916 Fixed #17734 -- Made sure to only redirect translated URLs if they can actually be resolved to prevent unwanted redirects. Many thanks to Orne Brocaar and Anssi Kääriäinen for input. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17621 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-02 11:07:36 +00:00
Jannis Leidel
7dd0ceba2e Fixed #17720 -- Stopped the LocaleMiddleware from overeagerly using the request path for language activation if it's actually not wanted. Thanks to Anssi Kääriäinen for the initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17547 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-18 13:37:30 +00:00
Jannis Leidel
c1acda6d8f Updated a few localization formats to stop the changes done in r17473 from breaking the tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17486 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-10 01:13:29 +00:00
Jannis Leidel
ef4d84d11a Fixed #17555 -- Added support for a missing trailing slash when redirecting based on the browser language. Thanks, neaf. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17443 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-04 18:43:20 +00:00
Jannis Leidel
c6065545ef Fixed #17628 -- Extended makemessages command to also ignore directories when walking, not only when looking for files. Thanks, Claude Paroz. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17441 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-04 18:27:24 +00:00
Carl Meyer
844a24bbb9 Fixed #16921 -- Added assertHTMLEqual and assertHTMLNotEqual assertions, and converted Django tests to use them where appropriate. Thanks Greg Müllegger. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-31 20:36:11 +00:00
Aymeric Augustin
91f5970bb4 Added a lower level test for numberformat when grouping is 0 and force_grouping is True. Thanks Claude Paroz. Refs #17414. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17268 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-24 11:15:26 +00:00