Merge pull request django-cms#1310 from tremmert/develop

Fixes wrong language prefix handling for form actions and admin preview (issue django-cms#1304)

Author: digi604

cms/middleware/multilingual.py

@@ -70,7 +70,7 @@ def patch_response(content, pages_root, language):
     ))
 
     content = HREF_URL_FIX_RE.sub(ur'<a\1href=\2/%s%s\5\6\7>' % (language, pages_root), content)
-    content = FORM_URL_FIX_RE.sub(ur'<form\1action=\2%s%s/\5\6\7>' % (pages_root, language), content).encode("utf8")
+    content = FORM_URL_FIX_RE.sub(ur'<form\1action=\2/%s%s\5\6\7>' % (language, pages_root), content).encode("utf8")
     return content
 
 

cms/templatetags/cms_admin.py

@@ -167,7 +167,7 @@ def preview_link(page, language):
         try:
             # attempt to retrieve the localized path/slug and return
             root = reverse('pages-root')
-            return root + language + "/" + page.get_absolute_url(language, fallback=False)[len(root):]
+            return "/" + language + root + page.get_absolute_url(language, fallback=False)[len(root):]
         except:
             # no localized path/slug. therefore nothing to preview. stay on the same page.
             # perhaps the user should be somehow notified for this.