page translation pushed at the right place

app/models/communication/website/page/with_path.rb

@@ -8,9 +8,8 @@ module Communication::Website::Page::WithPath
 
   def path
     path = ''
-    # TODO i18n remplacer le choix de la langue
     if website.languages.many?
-      path += "/#{website.default_language.iso_code}"
+      path += "/#{language.iso_code}"
     end
     path += "/#{slug_with_ancestors}/"
     path.gsub(/\/+/, '/')

app/models/concerns/with_git.rb

@@ -14,10 +14,11 @@ module WithGit
 
   def git_path_content_prefix(website)
     # Handle legacy language-less websites
-    # TODO I18n: Right now, we use the language of the website. It HAS TO get the language from the object including this concern.
+    # TODO I18n: Right now, we use the language of the object, fallbacking on the language of the website. In the end, we'll only use the language of the object
     path = "content/"
     if website.languages.any?
-      path += "#{website.default_language.iso_code}/"
+      path_language = respond_to?(:language_id) && language_id.present? ? language : website.default_language
+      path += "#{path_language.iso_code}/"
     end
     path
   end