Skip to content

Commit f4724ab

Browse files
authored
DEV: Move providers into their own module (#279)
* Rename base method * Base is base provider * Scope providers * Lint
1 parent f2c8f7a commit f4724ab

28 files changed

+1211
-1181
lines changed

app/controllers/discourse_translator/translator_controller.rb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,19 @@ def translate
4141
begin
4242
title_json = {}
4343
detected_lang, translation =
44-
"DiscourseTranslator::#{SiteSetting.translator_provider}".constantize.translate(post)
44+
"DiscourseTranslator::Provider::#{SiteSetting.translator_provider}".constantize.translate(
45+
post,
46+
)
4547
if post.is_first_post?
4648
_, title_translation =
47-
"DiscourseTranslator::#{SiteSetting.translator_provider}".constantize.translate(
49+
"DiscourseTranslator::Provider::#{SiteSetting.translator_provider}".constantize.translate(
4850
post.topic,
4951
)
5052
title_json = { title_translation: title_translation }
5153
end
5254
render json: { translation: translation, detected_lang: detected_lang }.merge(title_json),
5355
status: 200
54-
rescue ::DiscourseTranslator::TranslatorError => e
56+
rescue ::DiscourseTranslator::Provider::TranslatorError => e
5557
render_json_error e.message, status: 422
5658
end
5759
end

app/jobs/regular/detect_translatable_language.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ def execute(args)
1111
translatable = args[:type].constantize.find_by(id: args[:translatable_id])
1212
return if translatable.blank?
1313
begin
14-
translator = "DiscourseTranslator::#{SiteSetting.translator_provider}".constantize
14+
translator = "DiscourseTranslator::Provider::#{SiteSetting.translator_provider}".constantize
1515
translator.detect(translatable)
16-
rescue ::DiscourseTranslator::ProblemCheckedTranslationError
16+
rescue ::DiscourseTranslator::Provider::ProblemCheckedTranslationError
1717
# problem-checked translation errors gracefully
1818
end
1919
end

app/jobs/regular/translate_translatable.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def execute(args)
1111

1212
target_locales = SiteSetting.automatic_translation_target_languages.split("|")
1313
target_locales.each do |target_locale|
14-
"DiscourseTranslator::#{SiteSetting.translator_provider}".constantize.translate(
14+
"DiscourseTranslator::Provider::#{SiteSetting.translator_provider}".constantize.translate(
1515
translatable,
1616
target_locale.to_sym,
1717
)

app/jobs/scheduled/automatic_translation_backfill.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ def backfill_locales
6767
end
6868

6969
def translator
70-
@translator_klass ||= "DiscourseTranslator::#{SiteSetting.translator_provider}".constantize
70+
@translator_klass ||=
71+
"DiscourseTranslator::Provider::#{SiteSetting.translator_provider}".constantize
7172
end
7273

7374
def translate_records(type, record_ids, target_locale)

app/services/discourse_translator/amazon.rb

Lines changed: 0 additions & 164 deletions
This file was deleted.

app/services/discourse_translator/base.rb

Lines changed: 0 additions & 152 deletions
This file was deleted.

0 commit comments

Comments
 (0)