Changeset 768

Timestamp:

10/03/05 05:15:11 (3 years ago)

Author:

hugo

Message:

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.

Files:

• django/branches/i18n/django/conf/global_settings.py (modified) (1 diff)
• django/branches/i18n/django/conf/locale/sr (added)
• django/branches/i18n/django/conf/locale/sr/LC_MESSAGES (added)
• django/branches/i18n/django/conf/locale/sr/LC_MESSAGES/django.mo (added)
• django/branches/i18n/django/conf/locale/sr/LC_MESSAGES/django.po (added)
• django/branches/i18n/django/core/extensions.py (modified) (1 diff)
• django/branches/i18n/django/utils/translation.py (modified) (3 diffs)

django/branches/i18n/django/conf/global_settings.py

@@ -28 +28 @@
-# http://blogs.law.harvard.edu/tech/stories/storyReader$15
-LANGUAGE_CODE = 'en-us'
+
+# Languages we provide translations for out of the base. The
+# language name should be the utf-8 encoded local name for the
+# language.
+LANGUAGES = (
+    ('en-us', 'English'),
+    ('de', 'Deutsch'),
+    ('it', 'Italiano'),
+    ('sr', 'Srpski'),
+)
-
-# Not-necessarily-technical managers of the site. They get broken link

django/branches/i18n/django/core/extensions.py

@@ -35 +35 @@
-        self['messages'] = request.user.get_and_delete_messages()
-        self['perms'] = PermWrapper(request.user)
+        from django.conf import settings
+        self['LANGUAGES'] = settings.LANGUAGES
+        if hasattr(request, 'LANGUAGE_CODE'):
+            self['LANGUAGE_CODE'] = request.LANGUAGE_CODE
+        else:
+            self['LANGUAGE_CODE'] = settings.LANGUAGE_CODE
-        if DEBUG and request.META.get('REMOTE_ADDR') in INTERNAL_IPS:
-            self['debug'] = True

django/branches/i18n/django/utils/translation.py

@@ -47 +47 @@
-        self.__app = app
-        self.__language = language
+
+    def language(self):
+        return self.__language
-    
-    def __repr__(self):
@@ -121 +124 @@
-    del _active[currentThread()]
-
+def get_language():
+    """
+    This function returns the currently selected language.
+    """
+    t = _active.get(currentThread(), None)
+    if t is not None:
+        return t.language()
+    else:
+        from django.conf.settings import LANGUAGE_CODE
+        return LANGUAGE_CODE
+
-def gettext(message):
-    """
@@ -172 +186 @@
-    global _accepted
-
+    if request.GET:
+        lang = request.GET.get('django_language', None)
+        if lang is not None:
+            if hasattr(request, 'session'):
+                request.session['django_language'] = lang
+            else:
+                request.set_cookie('django_language', lang)
+            return lang
+
-    if hasattr(request, 'session'):
-getattr(request.session, 
+request.session.get(
-        if lang is not None:
-            return lang