Skip to content

Commit 95a5cfe

Browse files
authored
DEV: Cleanup terms (#232)
Doing some cleanup - `experimental_topic_translation` becomes `experimental_inline_translation` - `translator` becomes `translator_provider` - DualText translation is now Parallel Translation (the feature where translation is appended to the post, rather than shown inline) - Unused `translate_posts_to_languages` removed
1 parent 6df6266 commit 95a5cfe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+116
-89
lines changed

app/controllers/discourse_translator/translator_controller.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,12 @@ def translate
4141
begin
4242
title_json = {}
4343
detected_lang, translation =
44-
"DiscourseTranslator::#{SiteSetting.translator}".constantize.translate(post)
44+
"DiscourseTranslator::#{SiteSetting.translator_provider}".constantize.translate(post)
4545
if post.is_first_post?
4646
_, title_translation =
47-
"DiscourseTranslator::#{SiteSetting.translator}".constantize.translate(post.topic)
47+
"DiscourseTranslator::#{SiteSetting.translator_provider}".constantize.translate(
48+
post.topic,
49+
)
4850
title_json = { title_translation: title_translation }
4951
end
5052
render json: { translation: translation, detected_lang: detected_lang }.merge(title_json),

app/jobs/regular/detect_translatable_language.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ 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}".constantize
14+
translator = "DiscourseTranslator::#{SiteSetting.translator_provider}".constantize
1515
translator.detect(translatable)
1616
rescue ::DiscourseTranslator::ProblemCheckedTranslationError
1717
# problem-checked translation errors gracefully

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}".constantize.translate(
14+
"DiscourseTranslator::#{SiteSetting.translator_provider}".constantize.translate(
1515
translatable,
1616
target_locale.to_sym,
1717
)

app/jobs/scheduled/automatic_translation_backfill.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def backfill_locales
7777
end
7878

7979
def translator
80-
@translator_klass ||= "DiscourseTranslator::#{SiteSetting.translator}".constantize
80+
@translator_klass ||= "DiscourseTranslator::#{SiteSetting.translator_provider}".constantize
8181
end
8282

8383
def translate_records(type, record_ids)

app/services/discourse_translator/discourse_ai.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def self.translate!(translatable, target_locale_sym = I18n.locale)
3232
private
3333

3434
def self.required_settings_enabled
35-
SiteSetting.translator_enabled && SiteSetting.translator == "DiscourseAi" &&
35+
SiteSetting.translator_enabled && SiteSetting.translator_provider == "DiscourseAi" &&
3636
SiteSetting.discourse_ai_enabled && SiteSetting.ai_helper_enabled
3737
end
3838
end

app/services/problem_check/missing_translator_api_key.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ def call
1616

1717
def translation_data
1818
{
19-
provider: SiteSetting.translator,
19+
provider: SiteSetting.translator_provider,
2020
key: I18n.t("site_settings.#{api_key_site_setting_name}"),
2121
key_name: api_key_site_setting_name,
2222
}
2323
end
2424

2525
def api_key_site_setting_name
26-
case SiteSetting.translator
26+
case SiteSetting.translator_provider
2727
when "Google"
2828
"translator_google_api_key"
2929
when "Microsoft"

assets/javascripts/discourse/components/translated-post.gjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export default class TranslatedPost extends Component {
3232
}
3333

3434
get showTranslation() {
35-
return !this.siteSettings.experimental_topic_translation;
35+
return !this.siteSettings.experimental_inline_translation;
3636
}
3737

3838
<template>
@@ -53,7 +53,7 @@ export default class TranslatedPost extends Component {
5353
{{i18n
5454
"translator.translated_from"
5555
language=this.post.detectedLang
56-
translator=this.siteSettings.translator
56+
translator=this.siteSettings.translator_provider
5757
}}
5858
</div>
5959
<div class="cooked">

assets/javascripts/discourse/initializers/extend-for-translate-button.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ function initializeTranslation(api) {
2525
}
2626

2727
if (
28-
siteSettings.experimental_topic_translation &&
28+
siteSettings.experimental_inline_translation &&
2929
(currentUser || siteSettings.experimental_anon_language_switcher)
3030
) {
3131
api.renderInOutlet("topic-navigation", ShowOriginalContent);
@@ -83,7 +83,7 @@ function customizeWidgetPostMenu(api) {
8383
}
8484

8585
const language = dec.attrs.detected_lang;
86-
const translator = siteSettings.translator;
86+
const translator = siteSettings.translator_provider;
8787

8888
let titleElements = [];
8989

assets/javascripts/discourse/services/translator.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export default class TranslatorService extends Service {
1515
post.detectedLang = response.detected_lang;
1616
post.translatedText = response.translation;
1717
post.translatedTitle = response.title_translation;
18-
if (this.siteSettings.experimental_topic_translation) {
18+
if (this.siteSettings.experimental_inline_translation) {
1919
if (post.post_number === 1) {
2020
post.topic.set("fancy_title", response.title_translation);
2121
this.appEvents.trigger("header:update-topic", post.topic);

config/locales/server.ar.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
ar:
88
site_settings:
99
translator_enabled: "السماح بالترجمة المضمَّنة للمنشورات."
10-
translator: "مقدِّم خدمة الترجمة."
10+
translator_provider: "مقدِّم خدمة الترجمة."
1111
translator_azure_subscription_key: "مفتاح اشتراك Azure"
1212
translator_azure_region: "منطقة Azure"
1313
translator_google_api_key: "مفتاح واجهة برمجة تطبيقات Google"

0 commit comments

Comments
 (0)