Merge branch 'release-2.3.4' into develop

Conflicts:
	CHANGELOG.txt
	cms/locale/it/LC_MESSAGES/django.po
	cms/locale/nb/LC_MESSAGES/django.po
	cms/locale/nb/LC_MESSAGES/djangojs.po
	cms/utils/timezone.py
	docs/index.rst
	test_requirements/django-1.3.txt
	test_requirements/django-1.4.txt

AUTHORS

@@ -33,10 +33,12 @@ Contributors (in alphabetical order):
 * Andrew Cassidy
 * Andrew Schoen
 * angular_circle
+* Anton Parkhomenko
 * Antoni Aloy López
 * Arne Gellhaus
 * Artem Skoretskiy
 * Arthur Debert
+* Aymeric Augustin
 * Batiste Bieler
 * behrooz
 * Behrooz Nobakht
@@ -68,6 +70,7 @@ Contributors (in alphabetical order):
 * eged
 * Egor V. Nazarkin
 * Ekrem Seren
+* Erlend Dalen
 * Eric Eldredge
 * Erik Allik
 * Eugen MechanisM
@@ -170,6 +173,7 @@ Contributors (in alphabetical order):
 * Rebecca Breu
 * Remco Wendt
 * Restless Being
+* Richard Barran
 * Robert Buchholz
 * Robert Clark
 * Robert Pogorzelski
@@ -204,6 +208,7 @@ Contributors (in alphabetical order):
 * tiret
 * Ulrich Petri
 * Vasil Vangelovski
+* Viliam Segeda
 * wangJunjie
 * Wayne Moore
 * wid

CHANGELOG.txt

@@ -110,6 +110,14 @@
 
  - fixed an incompatibility with Python 2.5
 
+==== 2.3.4 (2012-11-09) ====
+
+- Fixed WymEditor
+- Fixed Norwegian translations
+- Fixed a bug that could lead to slug clashes
+- Fixed page change form (jQuery and permissions)
+- Fixed placeholder field permission checks
+
 ==== 2.4.0 ===-
 
 - CMS_LANGUAGE setting has changed
@@ -122,7 +130,3 @@
 - CMS_FLAT_URLS has been removed
 
 
-
-
-
-

cms/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = '2.3.3.post0'
+__version__ = '2.3.4'
 
 # patch settings 
 try:

cms/locale/it/LC_MESSAGES/django.po

@@ -6,16 +6,17 @@
 # babu <[email protected]>, 2011.
 # Denis Darii <[email protected]>, 2011.
 # Iacopo Spalletti <[email protected]>, 2011.
+#   <[email protected]>, 2012.
 # karim79 <[email protected]>, 2011.
 # Marco Barberis <[email protected]>, 2011.
 #   <[email protected]>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: django-cms\n"
 "Report-Msgid-Bugs-To: https://github.com/divio/django-cms/issues\n"
-"POT-Creation-Date: 2012-09-19 14:44+0200\n"
-"PO-Revision-Date: 2012-09-19 14:44+0000\n"
-"Last-Translator: Patrick Lauber <[email protected]>\n"
+"POT-Creation-Date: 2012-09-21 14:52+0200\n"
+"PO-Revision-Date: 2012-11-09 15:24+0000\n"
+"Last-Translator: yakky <[email protected]>\n"
 "Language-Team: divio.ch <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -287,7 +288,7 @@ msgstr "Errore del database"
 #: admin/pageadmin.py:779
 msgid ""
 "Error! You don't have permissions to move this page. Please reload the page"
-msgstr ""
+msgstr "Errore! Non hai il permesso di spostare questa pagina. Ricarica la pagina"
 
 #: admin/pageadmin.py:880
 msgid "Page was successfully approved."
@@ -922,15 +923,15 @@ msgstr "Google Map"
 
 #: plugins/googlemap/cms_plugins.py:19
 msgid "Advanced"
-msgstr ""
+msgstr "Avanzato"
 
 #: plugins/googlemap/forms.py:23
 msgid "Must be a positive integer followed by “px” or “%”."
-msgstr ""
+msgstr "Deve essere un intero seguito da “px” o \"%\""
 
 #: plugins/googlemap/forms.py:26
 msgid "Must be a positive integer followed by “px”."
-msgstr ""
+msgstr "Deve essere un intero seguito da “px”."
 
 #: plugins/googlemap/models.py:10
 msgid "map title"
@@ -954,7 +955,7 @@ msgstr "contenuti aggiuntivi"
 
 #: plugins/googlemap/models.py:19
 msgid "Displayed under address in the bubble."
-msgstr ""
+msgstr "Mostrato sotto l'indirizzo nel fumetto."
 
 #: plugins/googlemap/models.py:21
 msgid "zoom level"
@@ -986,11 +987,11 @@ msgstr "route planer"
 
 #: plugins/googlemap/models.py:37
 msgid "Plugin width (in pixels or percent)."
-msgstr ""
+msgstr "Larghezza del plugin (in pixel o percentuale)."
 
 #: plugins/googlemap/models.py:39
 msgid "Plugin height (in pixels)."
-msgstr ""
+msgstr "Altezza del plugin (in pixel)."
 
 #: plugins/googlemap/models.py:47
 msgid "Map"
@@ -1053,23 +1054,23 @@ msgstr "Un indirizzo email ha priorità rispetto a un link testuale."
 
 #: plugins/link/models.py:14
 msgid "target"
-msgstr ""
+msgstr "target"
 
 #: plugins/link/models.py:15
 msgid "same window"
-msgstr ""
+msgstr "stessa finestra"
 
 #: plugins/link/models.py:16
 msgid "new window"
-msgstr ""
+msgstr "nuova finestra"
 
 #: plugins/link/models.py:17
 msgid "parent window"
-msgstr ""
+msgstr "finestra superiore"
 
 #: plugins/link/models.py:18
 msgid "topmost frame"
-msgstr ""
+msgstr "finestra principale"
 
 #: plugins/picture/cms_plugins.py:9
 msgid "Picture"
@@ -1730,7 +1731,7 @@ msgstr "Una versione precedente di un plugin non può essere salvata!"
 
 #: templates/admin/cms/page/plugin_forms_ok.html:26
 msgid "Your changes to this plugin have not been saved."
-msgstr ""
+msgstr "Le tue modifiche al plugin non sono state salvate."
 
 #: templates/admin/cms/page/plugin_forms_ok.html:26
 msgid "Plugin saved successfully."
@@ -1906,11 +1907,11 @@ msgstr "colonna a destra"
 
 #: test_utils/project/placeholderapp/cms_plugins.py:7
 msgid "Test Plugin"
-msgstr ""
+msgstr "Plugin Test"
 
 #: test_utils/project/pluginapp/plugins/extra_context/cms_plugins.py:9
 msgid "Extra Context"
-msgstr ""
+msgstr "Context aggiuntivo"
 
 #: test_utils/project/pluginapp/plugins/manytomany_rel/cms_plugins.py:13
 msgid "Articles"
@@ -1976,8 +1977,8 @@ msgid ""
 msgid_plural ""
 "Pages %(pages)s have the same url '%(url)s' as current page "
 "\"%(instance)s\"."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "La pagina %(pages)s ha lo stesso url '%(url)s' della pagina corrente \"%(instance)s\"."
+msgstr[1] "Le pagine %(pages)s hanno lo stesso url '%(url)s' della pagina corrente \"%(instance)s\"."
 
 #~ msgid "move"
 #~ msgstr "move request"

cms/locale/no/LC_MESSAGES/django.po → cms/locale/nb/LC_MESSAGES/django.po

@@ -13,10 +13,10 @@ msgstr ""
 "PO-Revision-Date: 2012-09-19 14:44+0000\n"
 "Last-Translator: Patrick Lauber <[email protected]>\n"
 "Language-Team: divio.ch <[email protected]>\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: no\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Country: SWITZERLAND\n"
 "X-Poedit-Language: English\n"

cms/locale/no/LC_MESSAGES/djangojs.po → cms/locale/nb/LC_MESSAGES/djangojs.po

@@ -15,7 +15,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: no\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: static/cms/js/change_form.js:31

cms/utils/timezone.py

@@ -40,7 +40,7 @@ def now():
     """
     Returns an aware or naive datetime.datetime, depending on settings.USE_TZ.
     """
-    if settings.USE_TZ:
+    if getattr(settings, 'USE_TZ', False):
         # timeit shows that datetime.now(tz=utc) is 24% slower
         return datetime.utcnow().replace(tzinfo=utc)
     else:

docs/index.rst

@@ -25,6 +25,7 @@ Install
 
     getting_started/installation
     upgrade/2.4
+    upgrade/2.3.4
     upgrade/2.3.3
     upgrade/2.3.2
     upgrade/2.3

docs/upgrade/2.3.4.rst

@@ -0,0 +1,53 @@
+###################
+2.3.4 release notes
+###################
+
+*******************
+What's new in 2.3.4
+*******************
+
+WymEditor fixed
+===============
+
+2.3.4 fixes a critical issue with WymEditor that prevented it from load it's
+JavaScript assets correctly.
+
+Moved Norwegian translations
+============================
+
+The Norwegian translations are now available as ``nb``, which is the new
+(since 2003) official language code for Norwegian, replacing the older and
+deprecated ``no`` code.
+
+If your site runs in Norwegian, you need to change your ``LANGUAGES`` settings!
+
+Added support for timezones
+===========================
+
+On Django 1.4, and with ``USE_TZ=True`` the django CMS now uses timezone aware
+date and time objects.
+
+Fixed slug clashing
+===================
+
+In earlier versions, publishing a page that has the same slug (URL) as another
+(published) page could lead to errors. Now, when a page which would have the
+same URL as another (published) page is published, the user is shown an error
+and they're prompted to change the slug for the page.
+
+Prevent unnamed related names for PlaceholderField
+==================================================
+
+:class:`cms.models.fields.PlaceholderField` no longer allows the related name
+to be suppressed. Trying to do so will lead to a :exc:`ValueError`. This change
+was done to allow the django CMS to properly check permissions on Placeholder
+Fields.
+
+Two fixes to page change form
+=============================
+
+The change form for pages would throw errors if the user editing the page does
+not have the permission to publish this page. This issue was resolved.
+
+Further the page change form would not correctly pre-popluate the slug field if
+``DEBUG`` was set to ``False``. Again, this issue is now resolved.

test_requirements/django-1.3.txt

@@ -1,4 +1,4 @@
 -r requirements_base.txt
-Django==1.3.2
 -e git://github.com/digi604/django-i18nurls.git#egg=django-i18nurls
+Django>=1.3,<1.4
 django-reversion==1.5.3

test_requirements/django-1.4.txt

@@ -1,3 +1,3 @@
 -r requirements_base.txt
-Django==1.4.1
-django-reversion==1.6.2
+Django>=1.4,<1.5
+django-reversion==1.6

test_requirements/django-trunk.txt

@@ -1,2 +1,4 @@
 -r requirements_base.txt
-https://github.com/django/django/tarball/master/django-cms.tar.gz'
+https://github.com/django/django/tarball/master/django.tar.gz#egg=django
+django-reversion==1.6.2
+

test_requirements/requirements_base.txt

@@ -7,4 +7,4 @@ South>=0.7.2
 html5lib
 django-mptt==0.5.1
 django-sekizai>=0.6.1
-argparse
+argparse