Translate CW, poll options and media descriptions (#24175)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
parent
44cd88adc4
commit
69057467cb
25 changed files with 603 additions and 100 deletions
|
@ -12,6 +12,7 @@ class EmojiFormatter
|
|||
# @param [Hash] options
|
||||
# @option options [Boolean] :animate
|
||||
# @option options [String] :style
|
||||
# @option options [String] :raw_shortcode
|
||||
def initialize(html, custom_emojis, options = {})
|
||||
raise ArgumentError unless html.html_safe?
|
||||
|
||||
|
@ -43,7 +44,7 @@ class EmojiFormatter
|
|||
next unless (char_after.nil? || !DISALLOWED_BOUNDING_REGEX.match?(char_after)) && (emoji = emoji_map[shortcode])
|
||||
|
||||
result << Nokogiri::XML::Text.new(text[last_index..shortname_start_index - 1], tree.document) if shortname_start_index.positive?
|
||||
result << Nokogiri::HTML.fragment(image_for_emoji(shortcode, emoji))
|
||||
result << Nokogiri::HTML.fragment(tag_for_emoji(shortcode, emoji))
|
||||
|
||||
last_index = i + 1
|
||||
elsif text[i] == ':' && (i.zero? || !DISALLOWED_BOUNDING_REGEX.match?(text[i - 1]))
|
||||
|
@ -75,7 +76,9 @@ class EmojiFormatter
|
|||
end
|
||||
end
|
||||
|
||||
def image_for_emoji(shortcode, emoji)
|
||||
def tag_for_emoji(shortcode, emoji)
|
||||
return content_tag(:span, ":#{shortcode}:", translate: 'no') if raw_shortcode?
|
||||
|
||||
original_url, static_url = emoji
|
||||
|
||||
image_tag(
|
||||
|
@ -103,4 +106,8 @@ class EmojiFormatter
|
|||
def animate?
|
||||
@options[:animate] || @options.key?(:style)
|
||||
end
|
||||
|
||||
def raw_shortcode?
|
||||
@options[:raw_shortcode]
|
||||
end
|
||||
end
|
||||
|
|
|
@ -10,8 +10,8 @@ class TranslationService::DeepL < TranslationService
|
|||
@api_key = api_key
|
||||
end
|
||||
|
||||
def translate(text, source_language, target_language)
|
||||
form = { text: text, source_lang: source_language&.upcase, target_lang: target_language, tag_handling: 'html' }
|
||||
def translate(texts, source_language, target_language)
|
||||
form = { text: texts, source_lang: source_language&.upcase, target_lang: target_language, tag_handling: 'html' }
|
||||
request(:post, '/v2/translate', form: form) do |res|
|
||||
transform_response(res.body_with_limit)
|
||||
end
|
||||
|
@ -67,12 +67,17 @@ class TranslationService::DeepL < TranslationService
|
|||
end
|
||||
end
|
||||
|
||||
def transform_response(str)
|
||||
json = Oj.load(str, mode: :strict)
|
||||
def transform_response(json)
|
||||
data = Oj.load(json, mode: :strict)
|
||||
raise UnexpectedResponseError unless data.is_a?(Hash)
|
||||
|
||||
raise UnexpectedResponseError unless json.is_a?(Hash)
|
||||
|
||||
Translation.new(text: json.dig('translations', 0, 'text'), detected_source_language: json.dig('translations', 0, 'detected_source_language')&.downcase, provider: 'DeepL.com')
|
||||
data['translations'].map do |translation|
|
||||
Translation.new(
|
||||
text: translation['text'],
|
||||
detected_source_language: translation['detected_source_language']&.downcase,
|
||||
provider: 'DeepL.com'
|
||||
)
|
||||
end
|
||||
rescue Oj::ParseError
|
||||
raise UnexpectedResponseError
|
||||
end
|
||||
|
|
|
@ -8,8 +8,8 @@ class TranslationService::LibreTranslate < TranslationService
|
|||
@api_key = api_key
|
||||
end
|
||||
|
||||
def translate(text, source_language, target_language)
|
||||
body = Oj.dump(q: text, source: source_language.presence || 'auto', target: target_language, format: 'html', api_key: @api_key)
|
||||
def translate(texts, source_language, target_language)
|
||||
body = Oj.dump(q: texts, source: source_language.presence || 'auto', target: target_language, format: 'html', api_key: @api_key)
|
||||
request(:post, '/translate', body: body) do |res|
|
||||
transform_response(res.body_with_limit, source_language)
|
||||
end
|
||||
|
@ -44,12 +44,17 @@ class TranslationService::LibreTranslate < TranslationService
|
|||
end
|
||||
end
|
||||
|
||||
def transform_response(str, source_language)
|
||||
json = Oj.load(str, mode: :strict)
|
||||
def transform_response(json, source_language)
|
||||
data = Oj.load(json, mode: :strict)
|
||||
raise UnexpectedResponseError unless data.is_a?(Hash)
|
||||
|
||||
raise UnexpectedResponseError unless json.is_a?(Hash)
|
||||
|
||||
Translation.new(text: json['translatedText'], detected_source_language: source_language, provider: 'LibreTranslate')
|
||||
data['translatedText'].map.with_index do |text, index|
|
||||
Translation.new(
|
||||
text: text,
|
||||
detected_source_language: data.dig('detectedLanguage', index, 'language') || source_language,
|
||||
provider: 'LibreTranslate'
|
||||
)
|
||||
end
|
||||
rescue Oj::ParseError
|
||||
raise UnexpectedResponseError
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue