Release 2.1.3rc1 (divio#104)

* General cleanups

* Dropped djangoCMS < 3.2 support and added 3.4 support

* Updated CHANGELOG

* Added update translations helper

* Updated po files

* Updated mo files

* Bumped version to 2.1.3rc1

CHANGELOG.rst

@@ -4,6 +4,9 @@ Changelog
 2.1.3 (Unreleased)
 ------------------
 * Added missing `control-label`` classes in bootstrap templates
+* Fixed related_name inconsistency with django CMS 3.3.1
+* Dropped support for djangoCMS < 3.2
+* Introduced support for djangoCMS 3.4.0
 
 2.1.2 (2016-06-17)
 ------------------

aldryn_forms/__init__.py

@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-__version__ = '2.1.2'
+__version__ = '2.1.3rc1'

aldryn_forms/cms_plugins.py

@@ -84,9 +84,6 @@ class FormPlugin(FieldContainer):
     )
 
     def render(self, context, instance, placeholder):
-        # remove once cms 3.0.6 is released
-        self.render_template = self.get_render_template(context, instance, placeholder)
-
         context = super(FormPlugin, self).render(context, instance, placeholder)
         request = context['request']
 
@@ -353,8 +350,6 @@ def get_form_field_widget_kwargs(self, instance):
         return {}
 
     def render(self, context, instance, placeholder):
-        templates = self.get_template_names(instance)
-        self.render_template = select_template(templates)
         context = super(Field, self).render(context, instance, placeholder)
 
         form = context.get('form')
@@ -365,6 +360,10 @@ def render(self, context, instance, placeholder):
             context['field'] = form[field_name]
         return context
 
+    def get_render_template(self, context, instance, placeholder):
+        templates = self.get_template_names(instance)
+        return select_template(templates)
+
     def get_fieldsets(self, request, obj=None):
         if self.fieldsets or self.fields:
             # Allows overriding using fieldsets or fields. If you do that none