Merge remote-tracking branch 'parent/main' into upstream-20240906

2024-09-09 08:47:15 +09:00 · 2024-09-09 08:47:15 +09:00 · 218cb37fe3
commit 218cb37fe3
parent e5a02ba667 82161d8ae5
176 changed files with 750 additions and 603 deletions
--- a/app/services/translate_status_service.rb
+++ b/app/services/translate_status_service.rb
@ -100,7 +100,7 @@ class TranslateStatusService < BaseService
  end

  def unwrap_emoji_shortcodes(html)
-    fragment = Nokogiri::HTML.fragment(html)
+    fragment = Nokogiri::HTML5.fragment(html)
    fragment.css('span[translate="no"]').each do |element|
      element.remove_attribute('translate')
      element.replace(element.children) if element.attributes.empty?