mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-26 11:06:07 +00:00
Code Issues 27 Releases Wiki Activity
11,212 Commits 28 Branches 426 Tags 667 MiB
f2e99ecfda
Commit Graph

59 Commits

Author SHA1 Message Date
Ramiro Morales
ff7556c4ec Fixed #11240 -- Made makemessages i18n command escape % symbols in literals passed to the trans tag. 
This avoids problems with unintended automatic detection, marking and
validation of Python string formatting specifiers performed by
xgettext(1)/msgfmt(1) that stem from the fact that under the hood makemessages
converts templates to Python code before passing them to xgettext.

This also makes it consistent with its behavior on literals passed to the
blocktrans tag.

Thanks Jannis and claude for reviewing and feedback.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17190 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-11 00:07:06 +00:00
Ramiro Morales
5e2f5d1466 Fixed a couple of typos. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17166 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-03 17:34:52 +00:00
Julien Phalip
c3df840c20 Fixed #16903 -- Added --no-location option to the makemessages command to not write '#: filename:line' comment lines in language files. Thanks to alpar for the suggestion and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17081 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-11 13:07:14 +00:00
Julien Phalip
1452cecd15 Fixed 16938 -- Ensured that the active locale's formats take precedence over the default settings even if they would be interpreted as False in a conditional test (e.g. 0 or empty string). Thanks to pikerr for the report and initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17017 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-20 12:14:06 +00:00
Julien Phalip
26698bc851 Fixed #14806 -- Added support for contextual translations to the trans and blocktrans template tags. Thanks to jtiai for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17015 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-19 04:59:47 +00:00
Aymeric Augustin
2bc77be12e Fixed #17054 -- Ensured the test suite runs when gettext isn't available, after r16981. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17013 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-18 20:35:42 +00:00
Alex Gaynor
8c0eefd066 Convert the remainder of the relative imports in the tests to be absolute imports. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16981 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 21:34:56 +00:00
Jannis Leidel
66dc22c2d9 Fixed #16909 -- Pass language to get_format_modules when calling it from get_format to make sure the correct module is returned. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16884 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-22 15:04:27 +00:00
Carl Meyer
f9dad46d36 Fixed #16803 -- Use model verbose_name directly as ContentType unicode representation so it can be translated. Thanks to bronger for the report and Ivan Sagalaev for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16839 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-16 11:57:03 +00:00
Jannis Leidel
387e192f25 Fixed #16721 -- Made sure that blocktrans correctly handles percents (%), even in the plural block. Thanks for the initial patch, Claude Paroz. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16730 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-08 13:25:41 +00:00
Jannis Leidel
16bb9c594c Fixed #16516 -- Relaxed the blocktrans rendering a little by falling back to the default language if resolving one of the arguments fails, raising a KeyError. Thanks, Claude Paroz and Aymeric Augustin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16723 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-08 13:24:41 +00:00
Jannis Leidel
352b7ffaf0 Fixed #16322 -- Fixed Accept-Language parsing to allow spaces around semicolons. Thanks, Max Arnold. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16457 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-26 16:51:54 +00:00
Jannis Leidel
896e3c69c7 Fixed #11585 -- Added ability to translate and prefix URL patterns with a language code as an alternative method for language discovery. Many thanks to Orne Brocaar for his initial work and Carl Meyer for feedback. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16405 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-15 17:29:10 +00:00
Jannis Leidel
0322f2b653 Fixed #15263 -- Added support for format localization to the now template tag. Thanks to danielr and dmclain. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16172 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-07 16:58:45 +00:00
Jannis Leidel
b0d274dbd5 Added missing future imports missed in r16167. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16169 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-06 19:49:06 +00:00
Jannis Leidel
7dd72360a2 Make use of new translation and settings context manager in the tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16167 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-06 13:29:44 +00:00
Jannis Leidel
71ec87fed8 Added django.utils.translation.override context manager to easily activate and deactivate a language for a code block. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16166 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-06 13:29:32 +00:00
Jannis Leidel
01d0bf011e Fixed #13810 -- Truncate numbers correctly when given number of decimal positions is zero. Thanks, milosu and Łukasz Rekucki. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16074 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-22 12:03:10 +00:00
Adrian Holovaty
0fdabe885b Made a bunch of simplifications now that we don't support Python 2.4 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15933 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-28 02:27:43 +00:00
Russell Keith-Magee
afd040d4d3 Updated test assertions that have been deprecated by the move to unittest2. In summary, this means: 
assert_ -> assertTrue
 assertEquals -> assertEqual
 failUnless -> assertTrue

For full details, see http://www.voidspace.org.uk/python/articles/unittest2.shtml#deprecations

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-03 15:04:39 +00:00
Jannis Leidel
179fefcf7c Fixed #15286 -- Don't show deprecation warning if project locale dir is included in LOCALE_PATHS. Thanks to Claude and Ramiro. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15508 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-12 19:12:36 +00:00
Ramiro Morales
f6e38f3800 Fixed #5494, #10765, #14924 -- Modified the order in which translations are read when composing the final translation to offer at runtime. 
This is slightly backward-incompatible (could result in changed final translations for literals appearing multiple times in different .po files but with different translations).

Translations are now read in the following order (from lower to higher priority):

For the 'django' gettext domain:

 * Django translations
 * INSTALLED_APPS apps translations (with the ones listed first having higher priority)
 * settings/project path translations (deprecated, see below)
 * LOCALE_PATHS translations (with the ones listed first having higher priority)

For the 'djangojs' gettext domain:

 * Python modules whose names are passed to the javascript_catalog view
 * LOCALE_PATHS translations (with the ones listed first having higher priority, previously they weren't included)

Also, automatic loading of translations from the 'locale' subdir of the settings/project path is now deprecated.

Thanks to vanschelven, vbmendes and an anonymous user for reporting issues, to vanschelven, Claude Paroz and an anonymous contributor for their initial work on fixes and to Jannis  Leidel and Claude for review and discussion.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15441 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-07 18:48:40 +00:00
Ramiro Morales
1a2f9ff9f9 Modified a few tests methods to make sure no leaks of activated locale or USE_I10N setting value happen between tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15411 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-04 15:45:52 +00:00
Ramiro Morales
987fd51176 Fixed stability of data input/output L10N format modules priority order. Thanks tonnzor for the report and fix. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15402 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-03 15:43:50 +00:00
Ramiro Morales
193f14d862 Fixed #15157 -- Modified evaluation of literals surrounded by _(' and ')' in templates to be evaluated at render time instead of at compile time by using ugettext_lazy. Thanks Jonathan S for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15327 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-26 15:12:18 +00:00
Jannis Leidel
5f4bc1ff23 Fixed a few translation related tests: 
* Extended the admin i18n view to also take the admin translation catalogues into account.
  * Use a translation string from the core translations to test LOCALE_PATHS.
  * Fixed Russian translation of singular forms.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15273 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-21 19:36:26 +00:00
Alex Gaynor
fcbf881d82 Refactor all uses of thread locals to be more consistant and sane. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15232 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-17 09:52:47 +00:00
Ramiro Morales
fd12e3b218 Fixed #15024 -- Ensure that choice of L10N format module used is stable given a stable setup of format modules in ll/ and ll_CC/ dirs. Thanks David Reynolds for the report and suggestions leading to the solution. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15183 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-13 03:02:32 +00:00
Jannis Leidel
f0cd656ee0 Fixed #14933 -- Added ability to SelectDateWidget to cope with new alternative month names added in [14900]. Thanks, alek and Claude Peroz. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15017 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-22 00:44:54 +00:00
Jannis Leidel
9ab85e05e2 Fixed #4030 -- Added ability to translate language names. Thanks to Antti Kaihola and Ramiro Morales for the initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14894 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 23:02:45 +00:00
Russell Keith-Magee
ac91d5ef08 Fixed #14807 -- Ensure that boolean values aren't localized as T.rue and Fa.lse because of the thousand separator. Thanks to vanschelven for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14804 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-04 07:44:00 +00:00
Jannis Leidel
83aeb3c768 Fixed #9988 -- Added support for translation contexts. Thanks, Claude Paroz. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14450 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-04 10:48:27 +00:00
Russell Keith-Magee
ccc49029b8 Fixed #14181 -- Added a template tag and filters to allow localization to be disabled in a template. Thanks to Benjamin Wohlwend for the work on the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14395 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-29 16:48:58 +00:00
Ramiro Morales
b79daef867 Consolidated i18n commands test with the rest of the i18n tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14133 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 22:19:01 +00:00
Jannis Leidel
d80d2e8103 Fixed #14053 -- Also localize long integers. Thanks, David Danier. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13920 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-27 16:21:16 +00:00
Jannis Leidel
534792d055 Fixed #14290 -- Made format localization faster by caching the format modules. Thanks, Teemu Kurppa and Anssi Kääriäinen for the report and initial patches. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13898 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-27 15:25:08 +00:00
Russell Keith-Magee
521be8cd9c Migrated i18n and field_defaults doctests. Thanks to Alex Gaynor. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13779 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-12 20:03:39 +00:00
Jannis Leidel
7bb6abed12 Fixed #13702 -- Made sure to actually fall back to the l10n format strings provided in the settings, when disabled. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13770 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-12 19:40:44 +00:00
Russell Keith-Magee
ebfe9383bf Fixed #13370 -- Corrected the handling of pickling for lazy() proxy objects. Thanks to Alex Gaynor for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13000 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-19 12:40:46 +00:00
Jannis Leidel
ca4c6f65ea Fixed #13032 - Added localize parameter to form fields to be able to selectively enable localization. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12867 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-27 16:43:27 +00:00
Russell Keith-Magee
ad5afd6ed2 Fixed #12769, #12924 -- Corrected the pickling of curried and lazy objects, which was preventing queries with translated or related fields from being pickled. And lo, Alex Gaynor didst slayeth the dragon. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12866 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-27 15:54:31 +00:00
Jannis Leidel
10d4094b86 Fixed #13054 - Only apply grouping to integer part of numbers if explicitly wanted. Thanks, Ramiro Morales. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12816 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-20 15:26:41 +00:00
Jannis Leidel
0d2a24fd42 Fixed #12779 - Sanitize numeric form field input according to decimal and thousand separator settings. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12625 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-01 10:19:24 +00:00
Jannis Leidel
12d40a9fd6 Fixed #11384 - Make sure translations in the project directory really override translations in apps as specified in the docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12447 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-16 12:17:17 +00:00
Jannis Leidel
71da5f62da Fixed #7720 - Fallback to the base language if the sub language given in the language cookie doesn't exist. Thanks, djoume and Ramiro Morales. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12442 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-16 12:13:48 +00:00
Jannis Leidel
a28bd76bb6 Fixed #12777 - Localize decimal fields correctly. Thanks, Florian Apolloner 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12382 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-05 00:44:35 +00:00
Karen Tracey
e0c3cd4d29 Changed an i18n test to use a number that converts consistely from string to float on Pythons up to 2.7. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12144 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-09 20:57:32 +00:00
Jannis Leidel
ac371ccac8 Fixed #12435 - Handle Unicode characters in format strings correctly. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12057 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-01 21:38:58 +00:00
Jannis Leidel
855e805b4c Fixed #12230 - Updated utils.translation.to_locale to support the special sr_Latn locale. Thanks to Janos Guljas. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12056 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-01 21:38:34 +00:00
Jannis Leidel
6642060a0e Fixed #12478 - Allows the i18n related test of the SelectDateWidget to run without using a timemachine. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12051 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-01 21:36:55 +00:00