1
0
mirror of https://github.com/django/django.git synced 2025-07-04 01:39:20 +00:00

704 Commits

Author SHA1 Message Date
Georg Bauer
b34e844c2f i18n: fixed language code reporting - now the actually used language code is reported, not the requested language code (as before). Additionally explicit language codes requested in GET, P OST or otherwise are checked against availability, too.
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@851 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-12 15:33:22 +00:00
Georg Bauer
18d0c31d51 i18n: LANGUAGE_CODE in DjangoContext is now language-SUBLANGUAGE instead of language_SUBLANGUAGE (was introduced by [848])
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@850 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-12 14:55:03 +00:00
Georg Bauer
176c4545f6 changed layout of language stuff to be oriented after locale names, not language names (from accept-language header)
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@848 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-12 11:48:27 +00:00
Georg Bauer
d442731eb2 i18n: merged r815:r843 from trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@844 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-11 20:24:45 +00:00
Georg Bauer
d79cfec906 added new brazilian language settings
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@843 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-11 20:04:05 +00:00
Georg Bauer
7ed4073335 i18n: corrected sublanguage handling (de-de now mapps to de, if de-de isn't present) in django.utils.translation
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@841 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-11 18:26:32 +00:00
Georg Bauer
ef9207b661 i18n: added documentation on LOCALE_PATHS
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@840 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-11 14:22:28 +00:00
Georg Bauer
d606cf7e38 i18n: added a way to merge in some more locale paths via settings
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@839 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-11 14:19:28 +00:00
Georg Bauer
9e1640c55f i18n: fixed projectpath discovery. Now the DJANGO_SETTINGS_MODULE environment variable is used to find the project base
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@838 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-11 13:44:51 +00:00
Georg Bauer
6f88c4f9ec i18n: fixed translation resolving - now project translations are pulled in allways (if they exist)
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@837 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-11 13:38:24 +00:00
Georg Bauer
50f348a92f i18n: added two additional unit tests for i18n (filter related)
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@836 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-11 13:23:01 +00:00
Georg Bauer
0b0c323708 i18n: added the translation step to the filter parser (the arg is now translated if it is _("..."))
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@835 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-11 12:24:16 +00:00
Georg Bauer
0cd2968973 i18n: enhanced the filter-argument-parser to parse _("") strings, too
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-11 12:20:37 +00:00
Georg Bauer
f882f3eea9 i18n: clarified some points about app-specific translations
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@833 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-11 12:12:13 +00:00
Georg Bauer
22a8771572 i18n: added gettext_noop support to the xgettext call in make-messages.py
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@832 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-11 09:59:14 +00:00
Georg Bauer
51a691c9c0 i18n: fixed an import error (I really shouldn't make last-minute-changes)
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@831 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-11 09:23:53 +00:00
Georg Bauer
c0eb10e4fb i18n: fixed syntax error
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@830 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-11 09:21:13 +00:00
Georg Bauer
588b2cb161 i18n: made DjangoTranslations compatible with Python 2.3
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-11 09:20:31 +00:00
Georg Bauer
3f5bb5fa53 i18n: I18NMiddleware now patches the Vary response header
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@816 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-09 10:57:05 +00:00
Georg Bauer
eb7ebb777c i18n: merged r787:r814 from trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@815 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-09 10:47:06 +00:00
Georg Bauer
4fc6d40d00 i18n: again cleaned up make-messages.py - now the line numbers for templates will be correct.
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-08 00:01:25 +00:00
Georg Bauer
2442ceaa3f i18n: make-messages.py now correctly handles creation of new languages
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@799 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-07 23:20:24 +00:00
Georg Bauer
9fb343a443 i18n: made the make-messages.py script work much better by using msgmerge and msguniq
and fixed the german translation file (mostly the header)


git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@798 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-07 23:18:29 +00:00
Georg Bauer
b70beda043 i18n: added support for the new DEFAULT_CHARSET setting in translators
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@788 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-06 10:07:45 +00:00
Georg Bauer
cb09e10eb2 i18n: merged r776:r786 from trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@787 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-06 10:04:07 +00:00
Georg Bauer
04a66b6e55 i18n: added russian translation and added patch for sr translation. thx dimas and petar.
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@779 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-05 13:38:56 +00:00
Georg Bauer
05f9ed4588 i18n: added sr-translation patch from #65
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@778 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-05 12:14:02 +00:00
Georg Bauer
a3899f2226 i18n: make-messages now supports directory names with blanks in them
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@777 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-05 10:34:54 +00:00
Georg Bauer
ce1e5ca769 i18n: added first take at spanish translation (thanks heimy!)
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@776 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-04 20:10:36 +00:00
Georg Bauer
6e2b74d65e i18n: merged r722:774 from trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@775 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-04 19:34:43 +00:00
Georg Bauer
8c2b8aaee6 i18n: updated the documentation for the new features
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@770 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-03 12:33:50 +00:00
Georg Bauer
5e24a67952 take django_language either from GET or POST (GET has preference if both
are given)


git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@769 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-03 12:20:18 +00:00
Georg Bauer
4196ff0b17 i18n: added GET-support to language selection, added serbian translation file and added some convenience
stuff to the DjangoContext - all from a patch by nesh on the list. Thanks nesh! References #65.


git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@768 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-03 10:15:11 +00:00
Georg Bauer
ed3f73674b i18n: added preliminary .it translations. thanks C8N.
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@767 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-02 18:35:32 +00:00
Georg Bauer
6dec479396 i18n: fixed a bug in one admin template and updated the german translations for the admin
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@764 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-01 17:33:40 +00:00
Georg Bauer
0649365f43 i18n: changed all admin templates to use the new shorter {{ _(..) }} syntax for i18n strings.
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@763 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-01 16:47:15 +00:00
Georg Bauer
bd9cb4c9f4 i18n: fixed a rather stupid bug in language discovery (sort descending by preference value instead ascending)
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@762 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-01 16:45:16 +00:00
Georg Bauer
009694db63 i18n: i18n string resolution now does string interpolation against the context, too
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@761 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-01 16:35:20 +00:00
Georg Bauer
ae3c26df62 i18n: changed resolve_variable and resolve_variable_with_filters to allways
accept string constants and to accept i18n string constants with _(), too.
That way the i18n tag isn't needed in simple cases.


git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@760 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-01 16:24:21 +00:00
Georg Bauer
280747f757 i18n: language en is now successfully recognized on accept-header parsing
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@759 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-01 15:45:07 +00:00
Georg Bauer
59052e48db i18n: switched ngettext to make use of the standard ngettext instead simulating via gettext
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@758 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-01 13:28:59 +00:00
Georg Bauer
2c6e366f0a i18n: the i18n tag now supports gettext_noop. unittests updated.
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@757 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-01 13:05:57 +00:00
Georg Bauer
26bc142f87 i18n: updated the documentation to list ngettext
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@756 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-01 12:56:12 +00:00
Georg Bauer
4eb73a3584 i18n now has support for ngettext and has unittests
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@755 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-01 12:47:22 +00:00
Georg Bauer
3049adf485 i18n: added a note on request.LANGUAGE_CODE to the i18n documentation
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@751 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-30 20:13:41 +00:00
Georg Bauer
64a6eaeb63 i18n: added a first shot at a documentation that tells about how to
do translations with django.


git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@750 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-30 20:10:38 +00:00
Georg Bauer
96e37129ba the i18n middleware now stores the chosen language in the request
so that view code can know what language is chosen (for example
to select the right content field from the model if your model
supports multiple languages)


git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@744 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-30 15:53:36 +00:00
Georg Bauer
80e450ee2d i18n template tag now accepts varibles with filters or strings.
Variables with filters won't be pulled out for translation, of course, but
will just run the result of the filter through the translation engine.


git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@739 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-30 08:53:35 +00:00
Georg Bauer
f913e4d8c9 added a gettext_noop function to django.utils.translation
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@738 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-30 08:49:11 +00:00
Georg Bauer
828ca2572d fixed a missing i18n command in the password changing form
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@733 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-29 22:39:15 +00:00