Merge pull request #4926 from yakky/merge/3.1.5.pre3

Forwardport 3.1.x code
django-cms · Jan 19, 2016 · fcb405b · fcb405b
2 parents ad51df7 + 6bc7a90
commit fcb405b
Show file tree

Hide file tree

Showing 314 changed files with 3,037 additions and 884 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -20,7 +20,7 @@ Current and previous core designers:
 * Christian Bertschy
 
 
-Contributors (based on gitlog) (482):
+Contributors (based on gitlog) (515):
 
 * A. Bram Neijt
 * aaloy

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -68,7 +68,7 @@
 - Fixed an issue where ``allow_children`` and ``disable_child_plugins`` didn't work on dragitems
 
 
-=== 3.1.4 ===
+=== 3.1.4 (2015-11-24) ===
 
 - Fixed a problem in ``0010_migrate_use_structure.py`` that broke some migration paths to Django 1.8
 - Fixed ``fix_tree`` command
@@ -173,7 +173,7 @@
 - Add "Structure mode" permission
 
 
-=== 3.0.16 ===
+=== 3.0.16 (2015-11-24) ===
 
 - Fixed JavaScript error when using ``PageSelectWidget``
 - Fixed whitespace markup issues in draft mode

diff --git a/cms/__init__.py b/cms/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '3.2.1.dev1'
+__version__ = '3.2.1.dev2'
 
 default_app_config = 'cms.apps.CMSConfig'
diff --git a/cms/admin/pageadmin.py b/cms/admin/pageadmin.py
@@ -1406,7 +1406,7 @@ def resolve(self, request):
                     except:
                         obj = None
         if obj:
-            if not request.toolbar or not request.toolbar.edit_mode:
+            if not getattr(request, 'toolbar', False) or not getattr(request.toolbar, 'edit_mode', False):
                 if isinstance(obj, Page):
                     if obj.get_public_object():
                         url = obj.get_public_object().get_absolute_url()

diff --git a/cms/extensions/toolbar.py b/cms/extensions/toolbar.py
@@ -2,7 +2,7 @@
 from cms.utils.urlutils import admin_reverse
 from cms.api import get_page_draft
 from cms.toolbar_base import CMSToolbar
-from cms.utils import get_cms_setting
+from cms.utils import get_cms_setting, get_language_list
 from cms.utils.permissions import has_page_change_permission
 from django.core.urlresolvers import NoReverseMatch
 
@@ -126,7 +126,7 @@ def get_title_extension_admin(self, language=None):
         if language:
             titles = page.get_title_obj(language),
         else:
-            titles = page.title_set.all()
+            titles = page.title_set.filter(language__in=get_language_list(page.site_id))
         # Titles
         for title in titles:
             try:

diff --git a/cms/locale/af/LC_MESSAGES/django.mo b/cms/locale/af/LC_MESSAGES/django.mo
diff --git a/cms/locale/af/LC_MESSAGES/django.po b/cms/locale/af/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2015-11-11 18:31+0100\n"
 "PO-Revision-Date: 2015-11-11 17:31+0000\n"
 "Last-Translator: yakky <i.spalletti@nephila.it>\n"
-"Language-Team: Afrikaans (http://www.transifex.com/digi604/django-cms/language/af/)\n"
+"Language-Team: Afrikaans (http://www.transifex.com/divio/django-cms/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/cms/locale/af/LC_MESSAGES/djangojs.mo b/cms/locale/af/LC_MESSAGES/djangojs.mo
diff --git a/cms/locale/af/LC_MESSAGES/djangojs.po b/cms/locale/af/LC_MESSAGES/djangojs.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2015-11-05 10:16-0500\n"
 "PO-Revision-Date: 2015-10-31 12:28+0000\n"
 "Last-Translator: yakky <i.spalletti@nephila.it>\n"
-"Language-Team: Afrikaans (http://www.transifex.com/digi604/django-cms/language/af/)\n"
+"Language-Team: Afrikaans (http://www.transifex.com/divio/django-cms/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/cms/locale/ar/LC_MESSAGES/django.mo b/cms/locale/ar/LC_MESSAGES/django.mo
diff --git a/cms/locale/ar/LC_MESSAGES/django.po b/cms/locale/ar/LC_MESSAGES/django.po
@@ -17,7 +17,7 @@ msgstr ""
 "POT-Creation-Date: 2015-11-11 18:31+0100\n"
 "PO-Revision-Date: 2015-11-11 17:31+0000\n"
 "Last-Translator: yakky <i.spalletti@nephila.it>\n"
-"Language-Team: Arabic (http://www.transifex.com/digi604/django-cms/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/divio/django-cms/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/cms/locale/ar/LC_MESSAGES/djangojs.mo b/cms/locale/ar/LC_MESSAGES/djangojs.mo
diff --git a/cms/locale/ar/LC_MESSAGES/djangojs.po b/cms/locale/ar/LC_MESSAGES/djangojs.po
@@ -12,7 +12,7 @@ msgstr ""
 "POT-Creation-Date: 2015-11-05 10:16-0500\n"
 "PO-Revision-Date: 2015-10-31 12:28+0000\n"
 "Last-Translator: yakky <i.spalletti@nephila.it>\n"
-"Language-Team: Arabic (http://www.transifex.com/digi604/django-cms/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/divio/django-cms/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/cms/locale/be/LC_MESSAGES/django.mo b/cms/locale/be/LC_MESSAGES/django.mo
diff --git a/cms/locale/be/LC_MESSAGES/django.po b/cms/locale/be/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2015-11-11 18:31+0100\n"
 "PO-Revision-Date: 2015-11-11 17:31+0000\n"
 "Last-Translator: yakky <i.spalletti@nephila.it>\n"
-"Language-Team: Belarusian (http://www.transifex.com/digi604/django-cms/language/be/)\n"
+"Language-Team: Belarusian (http://www.transifex.com/divio/django-cms/language/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/cms/locale/be/LC_MESSAGES/djangojs.mo b/cms/locale/be/LC_MESSAGES/djangojs.mo
diff --git a/cms/locale/be/LC_MESSAGES/djangojs.po b/cms/locale/be/LC_MESSAGES/djangojs.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2015-11-05 10:16-0500\n"
 "PO-Revision-Date: 2015-10-31 12:28+0000\n"
 "Last-Translator: yakky <i.spalletti@nephila.it>\n"
-"Language-Team: Belarusian (http://www.transifex.com/digi604/django-cms/language/be/)\n"
+"Language-Team: Belarusian (http://www.transifex.com/divio/django-cms/language/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/cms/locale/bg/LC_MESSAGES/django.mo b/cms/locale/bg/LC_MESSAGES/django.mo
diff --git a/cms/locale/bg/LC_MESSAGES/django.po b/cms/locale/bg/LC_MESSAGES/django.po
@@ -15,7 +15,7 @@ msgstr ""
 "POT-Creation-Date: 2015-11-11 18:31+0100\n"
 "PO-Revision-Date: 2015-11-11 17:31+0000\n"
 "Last-Translator: yakky <i.spalletti@nephila.it>\n"
-"Language-Team: Bulgarian (http://www.transifex.com/digi604/django-cms/language/bg/)\n"
+"Language-Team: Bulgarian (http://www.transifex.com/divio/django-cms/language/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/cms/locale/bg/LC_MESSAGES/djangojs.mo b/cms/locale/bg/LC_MESSAGES/djangojs.mo
diff --git a/cms/locale/bg/LC_MESSAGES/djangojs.po b/cms/locale/bg/LC_MESSAGES/djangojs.po
@@ -13,7 +13,7 @@ msgstr ""
 "POT-Creation-Date: 2015-11-05 10:16-0500\n"
 "PO-Revision-Date: 2015-10-31 12:28+0000\n"
 "Last-Translator: yakky <i.spalletti@nephila.it>\n"
-"Language-Team: Bulgarian (http://www.transifex.com/digi604/django-cms/language/bg/)\n"
+"Language-Team: Bulgarian (http://www.transifex.com/divio/django-cms/language/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/cms/locale/bn/LC_MESSAGES/django.mo b/cms/locale/bn/LC_MESSAGES/django.mo
diff --git a/cms/locale/bn/LC_MESSAGES/django.po b/cms/locale/bn/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgstr ""
 "POT-Creation-Date: 2015-11-11 18:31+0100\n"
 "PO-Revision-Date: 2015-11-11 17:31+0000\n"
 "Last-Translator: yakky <i.spalletti@nephila.it>\n"
-"Language-Team: Bengali (http://www.transifex.com/digi604/django-cms/language/bn/)\n"
+"Language-Team: Bengali (http://www.transifex.com/divio/django-cms/language/bn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/cms/locale/bn/LC_MESSAGES/djangojs.mo b/cms/locale/bn/LC_MESSAGES/djangojs.mo
diff --git a/cms/locale/bn/LC_MESSAGES/djangojs.po b/cms/locale/bn/LC_MESSAGES/djangojs.po
@@ -11,7 +11,7 @@ msgstr ""
 "POT-Creation-Date: 2015-11-05 10:16-0500\n"
 "PO-Revision-Date: 2015-10-31 12:28+0000\n"
 "Last-Translator: yakky <i.spalletti@nephila.it>\n"
-"Language-Team: Bengali (http://www.transifex.com/digi604/django-cms/language/bn/)\n"
+"Language-Team: Bengali (http://www.transifex.com/divio/django-cms/language/bn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/cms/locale/ca/LC_MESSAGES/django.mo b/cms/locale/ca/LC_MESSAGES/django.mo
diff --git a/cms/locale/ca/LC_MESSAGES/django.po b/cms/locale/ca/LC_MESSAGES/django.po
@@ -13,7 +13,7 @@ msgstr ""
 "POT-Creation-Date: 2015-11-11 18:31+0100\n"
 "PO-Revision-Date: 2015-11-12 09:24+0000\n"
 "Last-Translator: Roger Pons <rogerpons@gmail.com>\n"
-"Language-Team: Catalan (http://www.transifex.com/digi604/django-cms/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/divio/django-cms/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/cms/locale/ca/LC_MESSAGES/djangojs.mo b/cms/locale/ca/LC_MESSAGES/djangojs.mo
diff --git a/cms/locale/ca/LC_MESSAGES/djangojs.po b/cms/locale/ca/LC_MESSAGES/djangojs.po
@@ -11,7 +11,7 @@ msgstr ""
 "POT-Creation-Date: 2015-11-05 10:16-0500\n"
 "PO-Revision-Date: 2015-10-31 12:28+0000\n"
 "Last-Translator: yakky <i.spalletti@nephila.it>\n"
-"Language-Team: Catalan (http://www.transifex.com/digi604/django-cms/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/divio/django-cms/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/cms/locale/cs/LC_MESSAGES/django.mo b/cms/locale/cs/LC_MESSAGES/django.mo
diff --git a/cms/locale/cs/LC_MESSAGES/django.po b/cms/locale/cs/LC_MESSAGES/django.po
@@ -19,7 +19,7 @@ msgstr ""
 "POT-Creation-Date: 2015-11-11 18:31+0100\n"
 "PO-Revision-Date: 2015-11-11 17:31+0000\n"
 "Last-Translator: yakky <i.spalletti@nephila.it>\n"
-"Language-Team: Czech (http://www.transifex.com/digi604/django-cms/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/divio/django-cms/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/cms/locale/cs/LC_MESSAGES/djangojs.mo b/cms/locale/cs/LC_MESSAGES/djangojs.mo
diff --git a/cms/locale/cs/LC_MESSAGES/djangojs.po b/cms/locale/cs/LC_MESSAGES/djangojs.po
@@ -12,7 +12,7 @@ msgstr ""
 "POT-Creation-Date: 2015-11-05 10:16-0500\n"
 "PO-Revision-Date: 2015-10-31 12:28+0000\n"
 "Last-Translator: yakky <i.spalletti@nephila.it>\n"
-"Language-Team: Czech (http://www.transifex.com/digi604/django-cms/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/divio/django-cms/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/cms/locale/cy/LC_MESSAGES/django.mo b/cms/locale/cy/LC_MESSAGES/django.mo
diff --git a/cms/locale/cy/LC_MESSAGES/django.po b/cms/locale/cy/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2015-11-11 18:31+0100\n"
 "PO-Revision-Date: 2015-11-11 17:31+0000\n"
 "Last-Translator: yakky <i.spalletti@nephila.it>\n"
-"Language-Team: Welsh (http://www.transifex.com/digi604/django-cms/language/cy/)\n"
+"Language-Team: Welsh (http://www.transifex.com/divio/django-cms/language/cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/cms/locale/cy/LC_MESSAGES/djangojs.mo b/cms/locale/cy/LC_MESSAGES/djangojs.mo
diff --git a/cms/locale/cy/LC_MESSAGES/djangojs.po b/cms/locale/cy/LC_MESSAGES/djangojs.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2015-11-05 10:16-0500\n"
 "PO-Revision-Date: 2015-10-31 12:28+0000\n"
 "Last-Translator: yakky <i.spalletti@nephila.it>\n"
-"Language-Team: Welsh (http://www.transifex.com/digi604/django-cms/language/cy/)\n"
+"Language-Team: Welsh (http://www.transifex.com/divio/django-cms/language/cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/cms/locale/da/LC_MESSAGES/django.mo b/cms/locale/da/LC_MESSAGES/django.mo
diff --git a/cms/locale/da/LC_MESSAGES/django.po b/cms/locale/da/LC_MESSAGES/django.po
@@ -16,7 +16,7 @@ msgstr ""
 "POT-Creation-Date: 2015-11-11 18:31+0100\n"
 "PO-Revision-Date: 2015-11-11 17:31+0000\n"
 "Last-Translator: yakky <i.spalletti@nephila.it>\n"
-"Language-Team: Danish (http://www.transifex.com/digi604/django-cms/language/da/)\n"
+"Language-Team: Danish (http://www.transifex.com/divio/django-cms/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/cms/locale/da/LC_MESSAGES/djangojs.mo b/cms/locale/da/LC_MESSAGES/djangojs.mo
diff --git a/cms/locale/da/LC_MESSAGES/djangojs.po b/cms/locale/da/LC_MESSAGES/djangojs.po
@@ -12,7 +12,7 @@ msgstr ""
 "POT-Creation-Date: 2015-11-05 10:16-0500\n"
 "PO-Revision-Date: 2015-10-31 12:28+0000\n"
 "Last-Translator: yakky <i.spalletti@nephila.it>\n"
-"Language-Team: Danish (http://www.transifex.com/digi604/django-cms/language/da/)\n"
+"Language-Team: Danish (http://www.transifex.com/divio/django-cms/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/cms/locale/de/LC_MESSAGES/django.mo b/cms/locale/de/LC_MESSAGES/django.mo
diff --git a/cms/locale/de/LC_MESSAGES/django.po b/cms/locale/de/LC_MESSAGES/django.po
@@ -27,9 +27,9 @@ msgstr ""
 "Project-Id-Version: django-cms\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-11 18:31+0100\n"
-"PO-Revision-Date: 2015-11-11 17:31+0000\n"
-"Last-Translator: yakky <i.spalletti@nephila.it>\n"
-"Language-Team: German (http://www.transifex.com/digi604/django-cms/language/de/)\n"
+"PO-Revision-Date: 2015-12-03 12:14+0000\n"
+"Last-Translator: Diana Dünki <diana.duenki@divio.ch>\n"
+"Language-Team: German (http://www.transifex.com/divio/django-cms/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1353,11 +1353,11 @@ msgstr[1] ""
 #: templates/admin/cms/page/tree/base.html:108
 #, python-format
 msgid "%(full_result_count)s total"
-msgstr ""
+msgstr "%(full_result_count)s Total"
 
 #: templates/admin/cms/page/tree/base.html:108
 msgid "Show all"
-msgstr ""
+msgstr "Alle anzeigen"
 
 #: templates/admin/cms/page/tree/base.html:123
 msgid "Filter:"
@@ -1377,7 +1377,7 @@ msgstr "Filter"
 
 #: templates/admin/cms/page/tree/base_header.html:8
 msgid "View"
-msgstr ""
+msgstr "Ansehen"
 
 #: templates/admin/cms/page/tree/base_header.html:12
 msgid "Menu"
@@ -1570,7 +1570,7 @@ msgstr "Editieren"
 
 #: templates/cms/toolbar/dragitem.html:22
 msgid "This plugin cannot be moved or edited outside of its parent"
-msgstr ""
+msgstr "Dieses Plugin kann nicht ausserhalb des Parents-Plugins verschoben oder editiert werden"
 
 #: templates/cms/toolbar/dragitem.html:33
 msgid "Clipboard is empty."

diff --git a/cms/locale/de/LC_MESSAGES/djangojs.mo b/cms/locale/de/LC_MESSAGES/djangojs.mo
diff --git a/cms/locale/de/LC_MESSAGES/djangojs.po b/cms/locale/de/LC_MESSAGES/djangojs.po
@@ -13,7 +13,7 @@ msgstr ""
 "POT-Creation-Date: 2015-11-05 10:16-0500\n"
 "PO-Revision-Date: 2015-10-31 12:28+0000\n"
 "Last-Translator: yakky <i.spalletti@nephila.it>\n"
-"Language-Team: German (http://www.transifex.com/digi604/django-cms/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/divio/django-cms/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/cms/locale/el/LC_MESSAGES/django.mo b/cms/locale/el/LC_MESSAGES/django.mo
diff --git a/cms/locale/el/LC_MESSAGES/django.po b/cms/locale/el/LC_MESSAGES/django.po
@@ -16,7 +16,7 @@ msgstr ""
 "POT-Creation-Date: 2015-11-11 18:31+0100\n"
 "PO-Revision-Date: 2015-11-11 17:31+0000\n"
 "Last-Translator: yakky <i.spalletti@nephila.it>\n"
-"Language-Team: Greek (http://www.transifex.com/digi604/django-cms/language/el/)\n"
+"Language-Team: Greek (http://www.transifex.com/divio/django-cms/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/cms/locale/el/LC_MESSAGES/djangojs.mo b/cms/locale/el/LC_MESSAGES/djangojs.mo
diff --git a/cms/locale/el/LC_MESSAGES/djangojs.po b/cms/locale/el/LC_MESSAGES/djangojs.po
@@ -11,7 +11,7 @@ msgstr ""
 "POT-Creation-Date: 2015-11-05 10:16-0500\n"
 "PO-Revision-Date: 2015-10-31 12:28+0000\n"
 "Last-Translator: yakky <i.spalletti@nephila.it>\n"
-"Language-Team: Greek (http://www.transifex.com/digi604/django-cms/language/el/)\n"
+"Language-Team: Greek (http://www.transifex.com/divio/django-cms/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/cms/locale/en/LC_MESSAGES/django.mo b/cms/locale/en/LC_MESSAGES/django.mo