mirrors
/
hometown
mirror of https://github.com/hometown-fork/hometown.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix forgot merge marker in libre_translate

This commit is contained in:
nachtjasmin 2023-11-18 17:03:18 +01:00
parent cc42aa5c08
commit 57477c9f65
No known key found for this signature in database
1 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/lib/translation_service/libre_translate.rb
View File

@ -48,35 +48,6 @@ class TranslationService::LibreTranslate < TranslationService
data = Oj.load(json, mode: :strict) data = Oj.load(json, mode: :strict)
raise UnexpectedResponseError unless data.is_a?(Hash) raise UnexpectedResponseError unless data.is_a?(Hash)
<<<<<<< HEAD
def request(text, source_language, target_language)
body = Oj.dump(q: text, source: source_language.presence || 'auto', target: target_language, format: 'html', api_key: @api_key)
req = Request.new(:post, "#{@base_url}/translate", body: body, allow_local: true)
req.add_headers('Content-Type': 'application/json')
req
end
def transform_response(str, source_language)
json = Oj.load(str, mode: :strict)
raise UnexpectedResponseError unless json.is_a?(Hash)
Translation.new(text: Sanitize.fragment(json['translatedText'], Sanitize::Config::MASTODON_STRICT), detected_source_language: source_language, provider: 'LibreTranslate')
||||||| 61c5dfb92
def request(text, source_language, target_language)
body = Oj.dump(q: text, source: source_language.presence || 'auto', target: target_language, format: 'html', api_key: @api_key)
req = Request.new(:post, "#{@base_url}/translate", body: body, allow_local: true)
req.add_headers('Content-Type': 'application/json')
req
end
def transform_response(str, source_language)
json = Oj.load(str, mode: :strict)
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| data['translatedText'].map.with_index do |text, index|
Translation.new( Translation.new(
text: text, text: text,
@ -84,7 +55,6 @@ class TranslationService::LibreTranslate < TranslationService
provider: 'LibreTranslate' provider: 'LibreTranslate'
) )
end end
>>>>>>> v4.2.0-beta1
rescue Oj::ParseError rescue Oj::ParseError
raise UnexpectedResponseError raise UnexpectedResponseError
end end