Merge pull request #3444 from alphagov/translate-correctly-welsh-publ…

…ished-date Translate correctly Welsh published date
alphagov · Dec 2, 2024 · d7eeea1 · d7eeea1
2 parents 915ce5d + 74979b8
commit d7eeea1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/app/presenters/content_item_presenter.rb b/app/presenters/content_item_presenter.rb
@@ -126,7 +126,7 @@ def voting_is_open?
   end
 
   def display_date(timestamp, format = "%-d %B %Y")
-    I18n.l(Time.zone.parse(timestamp), format:, locale: "en") if timestamp
+    I18n.l(Time.zone.parse(timestamp), format:, locale:) if timestamp
   end
 
   def sorted_locales(translations)

diff --git a/test/integration/publication_test.rb b/test/integration/publication_test.rb
@@ -294,4 +294,18 @@ class PublicationTest < ActionDispatch::IntegrationTest
     setup_and_visit_content_item("publication-with-featured-attachments", overrides)
     assert page.has_css?('meta[name="robots"][content="noindex"]', visible: false)
   end
+
+  test "translates Welsh published date correctly" do
+    setup_and_visit_content_item("publication", { "locale" => "cy" })
+
+    assert_has_metadata({
+      published: "3 Mai 2016",
+      from: {
+        "Environment Agency": "/government/organisations/environment-agency",
+        "The Rt Hon Sir Eric Pickles MP": "/government/people/eric-pickles",
+      },
+    })
+
+    assert_footer_has_published_dates("Cyhoeddwyd ar 3 Mai 2016")
+  end
 end