fallback to settings.LANGUAGES if lang missing in settings.CMS_LANGUA…

…GES for language tabs in admin (related to Issue #367)
django-cms · Mar 22, 2010 · 5085060 · 5085060
1 parent 925e4b6
commit 5085060
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/cms/admin/pageadmin.py b/cms/admin/pageadmin.py
@@ -538,7 +538,8 @@ def update_language_tab_context(self, request, obj, context=None):
         languages = []
         if site_id and site_id in settings.CMS_SITE_LANGUAGES:
             for lang in settings.CMS_SITE_LANGUAGES[site_id]:
-                languages.append((lang, dict(settings.CMS_LANGUAGES)[lang]))
+                lang_label = dict(settings.CMS_LANGUAGES).get(lang, dict(settings.LANGUAGES).get(lang, lang))
+                languages.append((lang, lang_label))
         else:
             languages = settings.CMS_LANGUAGES
         context.update({