Added language to Page translation operations

cms/admin/forms.py

@@ -300,6 +300,7 @@ def save(self, *args, **kwargs):
         operation_token = send_pre_page_operation(
             request=self._request,
             operation=ADD_PAGE_TRANSLATION,
+            language=self._language,
         )
 
         if page:
@@ -345,6 +346,7 @@ def save(self, *args, **kwargs):
             operation=ADD_PAGE_TRANSLATION,
             token=operation_token,
             obj=new_page,
+            language=self._language,
         )
         return translation
 
@@ -552,6 +554,7 @@ def save(self, commit=True):
         operation_token = send_pre_page_operation(
             request=self._request,
             operation=CHANGE_PAGE_TRANSLATION,
+            language=self._language,
         )
 
         data = self.cleaned_data.copy()
@@ -582,6 +585,7 @@ def save(self, commit=True):
             operation=CHANGE_PAGE_TRANSLATION,
             token=operation_token,
             obj=page,
+            language=self._language,
         )
         return page_content
 

cms/admin/pageadmin.py

@@ -872,6 +872,18 @@ def log_change(self, request, object, message):
         # Block the admin log for change. A signal takes care of this!
         return
 
+    def get_object(self, request, object_id, from_field=None):
+        """
+        Return an instance matching the field and value provided, the primary
+        key is used if no field is provided. Return ``None`` if no match is
+        found or the object_id fails validation.
+        """
+        obj = super(PageContentAdmin, self).get_object(request, object_id, from_field)
+
+        if obj:
+            obj.page.title_cache[obj.language] = obj
+        return obj
+
     def get_admin_url(self, action, *args):
         url_name = "{}_{}_{}".format(
             self.opts.app_label,