From c9939c3b7d04b7abda1a74495c91469c4369f345 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Gaya?= <sebastien.gaya@gmail.com>
Date: Fri, 20 Jan 2023 15:54:43 +0100
Subject: [PATCH] page translation pushed at the right place
---
app/models/communication/website/page/with_path.rb | 3 +--
app/models/concerns/with_git.rb | 5 +++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/models/communication/website/page/with_path.rb b/app/models/communication/website/page/with_path.rb
index 99b4692e3..5caa467aa 100644
--- a/app/models/communication/website/page/with_path.rb
+++ b/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(/\/+/, '/')
diff --git a/app/models/concerns/with_git.rb b/app/models/concerns/with_git.rb
index 6fec8601b..618f08e34 100644
--- a/app/models/concerns/with_git.rb
+++ b/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
--
GitLab