changeset 287:5ddd176280ae

Don't make language names for translation
author Sylvain Beucler <beuc@beuc.net>
date Sat, 14 Aug 2010 14:38:05 +0200
parents d4941ecf1333
children 4388bfc8f3a0
files settings_default.py
diffstat 1 files changed, 14 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/settings_default.py
+++ b/settings_default.py
@@ -33,18 +33,21 @@
 LANGUAGE_CODE = 'en-us'
 
 # http://docs.djangoproject.com/en/dev/topics/i18n/deployment/#how-django-discovers-language-preference
-ugettext = lambda s: s
+# Don't translate the languages: they are already translated in
+# Django, and anyway, we'll only show them in English, because showing
+# it in the current locale (say, Japanese) makes it difficult to
+# revert from a bad locale
 LANGUAGES = (
-    ('ca',    ugettext('Catalan')),
-    ('de',    ugettext('German')),
-    ('en',    ugettext('English')),
-    ('es',    ugettext('Spanish')),
-    ('fr',    ugettext('French')),
-    ('it',    ugettext('Italian')),
-    ('ja',    ugettext('Japanese')),
-    ('pt_BR', ugettext('Portuguese (Brazil)')),
-    ('ru',    ugettext('Russian')),
-    ('sv',    ugettext('Swedish')),
+    ('ca',    'Catalan'),
+    ('de',    'German'),
+    ('en',    'English'),
+    ('es',    'Spanish'),
+    ('fr',    'French'),
+    ('it',    'Italian'),
+    ('ja',    'Japanese'),
+    ('pt_BR', 'Brazilian Portuguese'),
+    ('ru',    'Russian'),
+    ('sv',    'Swedish'),
 )
 
 SITE_ID = 1