toolbar language changes

Author: digi604

cms/cms_toolbar.py

@@ -1,6 +1,11 @@
 # -*- coding: utf-8 -*-
 import urllib
+from cms.utils.i18n import get_language_objects, get_language_object
 from cms.toolbar.items import Item, List, Break, Switch
+from django.contrib.sites.models import Site
+from cms.utils import get_language_from_request
+
+from django.contrib.auth.forms import AuthenticationForm
 from cms.toolbar_base import CMSToolbar
 from cms.toolbar_pool import toolbar_pool
 from cms.utils.permissions import has_page_change_permission
@@ -35,8 +40,22 @@ def insert_items(self, items, toolbar, request, is_app):
                         items.append(self.get_publish_menu(self.request.current_page))
                     if toolbar.edit_mode:
                         items.append(self.get_mode_switchers())
+            items.append(self.get_language_menu())
         return items
 
+    def get_language_menu(self):
+        site = Site.objects.get_current()
+        current_lang = get_language_object(get_language_from_request(self.request), site.pk)
+        menu_items = List("#", current_lang['name'], right=True)
+        for lang in get_language_objects(site.pk):
+            if hasattr(self.request, "_language_changer"):
+                url = self.request._language_changer(lang['code'])
+            else:
+                url = DefaultLanguageChanger(self.request)(lang['code'])
+            menu_items.items.append(
+                Item(url, lang['name'], active=lang['code'] == current_lang['code']))
+        return menu_items
+
     def get_template_menu(self):
         menu_items = List("#", _("Template"))
         url = reverse('admin:cms_page_change_template', args=(self.request.current_page.pk,))
@@ -144,4 +163,4 @@ def _get_approve_url(toolbar):
 
 
 def _get_publish_url(toolbar):
-    return reverse('admin:cms_page_publish_page', args=(toolbar.request.current_page.pk,))
+    return reverse('admin:cms_page_publish_page', args=(toolbar.request.current_page.pk,))

cms/models/settingsmodels.py

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+from django.contrib.auth.models import User
+from django.db import models
+
+
+class UserLanguage(models.Model):
+    user = models.ForeignKey(User)
+    language = models.CharField(max_length=10)

menus/templatetags/menu_tags.py

@@ -7,11 +7,9 @@
 from classytags.helpers import InclusionTag
 from cms.utils.i18n import force_language, get_language_objects
 from django import template
-from django.conf import settings
 from django.contrib.sites.models import Site
-from django.core.cache import cache
-from django.core.urlresolvers import reverse, resolve
-from django.utils.translation import activate, get_language, ugettext
+from django.core.urlresolvers import reverse
+from django.utils.translation import get_language, ugettext
 from menus.menu_pool import menu_pool
 from menus.utils import DefaultLanguageChanger
 
@@ -216,7 +214,7 @@ def get_context(self, context, levels, root_level, nephews, template):
                 if node.selected:
                     # if no root_level specified, set it to the selected nodes level
                     root_level = node.level
-                # is this the ancestor of current selected node at the root level?
+                    # is this the ancestor of current selected node at the root level?
             is_root_ancestor = (node.ancestor and node.level == root_level)
             # is a node selected on the root_level specified
             root_selected = (node.selected and node.level == root_level)
@@ -227,8 +225,8 @@ def get_context(self, context, levels, root_level, nephews, template):
                     child.parent = None
                     if child.sibling:
                         cut_after(child, nephews, [])
-                    # if root_level was 0 we need to give the menu the entire tree
-                # not just the children
+                        # if root_level was 0 we need to give the menu the entire tree
+                    # not just the children
                 if include_root:
                     children = menu_pool.apply_modifiers([node], request, post_cut=True)
                 else:
@@ -363,10 +361,9 @@ def get_context(self, context, template, i18n_mode):
         marker = MARKERS[i18n_mode]
         current_lang = get_language()
         site = Site.objects.get_current()
-        user_is_staff = context['request'].user.is_staff
         languages = []
         for lang in get_language_objects(site.pk):
-            if user_is_staff or lang.get('public', True):
+            if lang.get('public', True):
                 languages.append((lang['code'], marker(lang['name'], lang['code'])))
         context.update({
             'languages': languages,