Merge remote-tracking branch 'upstream/pull/3936'

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8996b111410d87a0123e5c3354820cec74d9abdd..fc01c22ae50c343d5c2213c3ef20a9c6d11d998b 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -976,7 +976,7 @@ en:
           fitness_station: "Fitness Station"
           garden: "Garden"
           golf_course: "Golf Course"
-          horse_riding: "Horse Riding"
+          horse_riding: "Horse Riding Centre"
           ice_rink: "Ice Rink"
           marina: "Marina"
           miniature_golf: "Miniature Golf"

diff --git a/test/lib/rich_text_test.rb b/test/lib/rich_text_test.rb
index aa99e2a4dc6ff9e80de7985ec8a96897a17dd3e1..033a221d4e5ccca7c1e898cfa3f47c7b9eecc8ea 100644 (file)
--- a/test/lib/rich_text_test.rb
+++ b/test/lib/rich_text_test.rb
@@ -195,6 +195,22 @@ class RichTextTest < ActiveSupport::TestCase
     end
   end
 
+  def test_markdown_table_alignment
+    # Ensure that kramdown table alignment styles are converted to bootstrap classes
+    markdown_table = <<~MARKDOWN
+      | foo  | bar |
+      |:----:|----:|
+      |center|right|
+    MARKDOWN
+    r = RichText.new("markdown", markdown_table)
+    assert_html r do
+      assert_select "td[style='text-align:center']", false
+      assert_select "td[class='text-center']", true
+      assert_select "td[style='text-align:right']", false
+      assert_select "td[class='text-end']", true
+    end
+  end
+
   def test_markdown_to_text
     r = RichText.new("markdown", "foo [bar](http://example.com/) baz")
     assert_equal "foo [bar](http://example.com/) baz", r.to_text