From c2f7a6878baadaa012b83e58b29b01f12b639dc0 Mon Sep 17 00:00:00 2001
From: Nat <natalie.tay@discourse.org>
Date: Thu, 27 Feb 2025 16:31:45 +0800
Subject: [PATCH 1/2] DEV: Cleanup terms

---
 .../translator_controller.rb                  |  6 +++--
 .../regular/detect_translatable_language.rb   |  2 +-
 app/jobs/regular/translate_translatable.rb    |  2 +-
 .../automatic_translation_backfill.rb         |  2 +-
 .../discourse_translator/discourse_ai.rb      |  2 +-
 .../missing_translator_api_key.rb             |  4 +--
 .../discourse/components/translated-post.gjs  |  4 +--
 .../extend-for-translate-button.js            |  4 +--
 .../discourse/services/translator.js          |  2 +-
 config/locales/server.ar.yml                  |  2 +-
 config/locales/server.cs.yml                  |  2 +-
 config/locales/server.de.yml                  |  2 +-
 config/locales/server.el.yml                  |  2 +-
 config/locales/server.en.yml                  |  6 ++---
 config/locales/server.es.yml                  |  2 +-
 config/locales/server.fa_IR.yml               |  2 +-
 config/locales/server.fi.yml                  |  2 +-
 config/locales/server.fr.yml                  |  2 +-
 config/locales/server.he.yml                  |  5 ++--
 config/locales/server.hu.yml                  |  2 +-
 config/locales/server.it.yml                  |  2 +-
 config/locales/server.ja.yml                  |  2 +-
 config/locales/server.nl.yml                  |  2 +-
 config/locales/server.pl_PL.yml               |  2 +-
 config/locales/server.pt_BR.yml               |  2 +-
 config/locales/server.ro.yml                  |  5 ++--
 config/locales/server.ru.yml                  |  2 +-
 config/locales/server.sv.yml                  |  2 +-
 config/locales/server.tr_TR.yml               |  2 +-
 config/locales/server.zh_CN.yml               |  2 +-
 config/settings.yml                           | 24 ++++++++---------
 ...7074505_rename_translator_site_settings.rb | 27 +++++++++++++++++++
 .../guardian_extension.rb                     |  2 +-
 .../inline_translation.rb                     |  6 ++---
 ...lation.rb => parallel_text_translation.rb} |  4 +--
 plugin.rb                                     |  2 +-
 .../automatic_translation_backfill_spec.rb    |  2 +-
 .../jobs/detect_translatable_language_spec.rb |  2 +-
 spec/jobs/translate_translatable_spec.rb      |  2 +-
 spec/lib/guardian_extension_spec.rb           | 16 +++++------
 spec/requests/translator_controller_spec.rb   |  2 +-
 .../basic_topic_serializer_spec.rb            |  8 +++---
 spec/serializers/post_serializer_spec.rb      |  6 ++---
 .../serializers/topic_view_serializer_spec.rb |  6 ++---
 spec/services/discourse_ai_spec.rb            |  2 +-
 .../missing_translator_api_key_spec.rb        |  2 +-
 spec/system/full_page_translation_spec.rb     |  2 +-
 .../integration/translated-post-test.js       |  6 ++---
 test/javascripts/service/translator-test.js   |  2 +-
 49 files changed, 115 insertions(+), 88 deletions(-)
 create mode 100644 db/migrate/20250227074505_rename_translator_site_settings.rb
 rename lib/discourse_translator/{dual_text_translation.rb => parallel_text_translation.rb} (92%)

diff --git a/app/controllers/discourse_translator/translator_controller.rb b/app/controllers/discourse_translator/translator_controller.rb
index e6e9d89c..92178af8 100644
--- a/app/controllers/discourse_translator/translator_controller.rb
+++ b/app/controllers/discourse_translator/translator_controller.rb
@@ -41,10 +41,12 @@ def translate
       begin
         title_json = {}
         detected_lang, translation =
-          "DiscourseTranslator::#{SiteSetting.translator}".constantize.translate(post)
+          "DiscourseTranslator::#{SiteSetting.translator_provider}".constantize.translate(post)
         if post.is_first_post?
           _, title_translation =
-            "DiscourseTranslator::#{SiteSetting.translator}".constantize.translate(post.topic)
+            "DiscourseTranslator::#{SiteSetting.translator_provider}".constantize.translate(
+              post.topic,
+            )
           title_json = { title_translation: title_translation }
         end
         render json: { translation: translation, detected_lang: detected_lang }.merge(title_json),
diff --git a/app/jobs/regular/detect_translatable_language.rb b/app/jobs/regular/detect_translatable_language.rb
index b96a5cef..daf8a8bb 100644
--- a/app/jobs/regular/detect_translatable_language.rb
+++ b/app/jobs/regular/detect_translatable_language.rb
@@ -11,7 +11,7 @@ def execute(args)
       translatable = args[:type].constantize.find_by(id: args[:translatable_id])
       return if translatable.blank?
       begin
-        translator = "DiscourseTranslator::#{SiteSetting.translator}".constantize
+        translator = "DiscourseTranslator::#{SiteSetting.translator_provider}".constantize
         translator.detect(translatable)
       rescue ::DiscourseTranslator::ProblemCheckedTranslationError
         # problem-checked translation errors gracefully
diff --git a/app/jobs/regular/translate_translatable.rb b/app/jobs/regular/translate_translatable.rb
index aaaf1a26..a5d44617 100644
--- a/app/jobs/regular/translate_translatable.rb
+++ b/app/jobs/regular/translate_translatable.rb
@@ -11,7 +11,7 @@ def execute(args)
 
       target_locales = SiteSetting.automatic_translation_target_languages.split("|")
       target_locales.each do |target_locale|
-        "DiscourseTranslator::#{SiteSetting.translator}".constantize.translate(
+        "DiscourseTranslator::#{SiteSetting.translator_provider}".constantize.translate(
           translatable,
           target_locale.to_sym,
         )
diff --git a/app/jobs/scheduled/automatic_translation_backfill.rb b/app/jobs/scheduled/automatic_translation_backfill.rb
index 2b8a2f06..de783847 100644
--- a/app/jobs/scheduled/automatic_translation_backfill.rb
+++ b/app/jobs/scheduled/automatic_translation_backfill.rb
@@ -77,7 +77,7 @@ def backfill_locales
     end
 
     def translator
-      @translator_klass ||= "DiscourseTranslator::#{SiteSetting.translator}".constantize
+      @translator_klass ||= "DiscourseTranslator::#{SiteSetting.translator_provider}".constantize
     end
 
     def translate_records(type, record_ids)
diff --git a/app/services/discourse_translator/discourse_ai.rb b/app/services/discourse_translator/discourse_ai.rb
index fc7de8bb..f99015a6 100644
--- a/app/services/discourse_translator/discourse_ai.rb
+++ b/app/services/discourse_translator/discourse_ai.rb
@@ -32,7 +32,7 @@ def self.translate!(translatable, target_locale_sym = I18n.locale)
     private
 
     def self.required_settings_enabled
-      SiteSetting.translator_enabled && SiteSetting.translator == "DiscourseAi" &&
+      SiteSetting.translator_enabled && SiteSetting.translator_provider == "DiscourseAi" &&
         SiteSetting.discourse_ai_enabled && SiteSetting.ai_helper_enabled
     end
   end
diff --git a/app/services/problem_check/missing_translator_api_key.rb b/app/services/problem_check/missing_translator_api_key.rb
index 787c970c..391add23 100644
--- a/app/services/problem_check/missing_translator_api_key.rb
+++ b/app/services/problem_check/missing_translator_api_key.rb
@@ -16,14 +16,14 @@ def call
 
   def translation_data
     {
-      provider: SiteSetting.translator,
+      provider: SiteSetting.translator_provider,
       key: I18n.t("site_settings.#{api_key_site_setting_name}"),
       key_name: api_key_site_setting_name,
     }
   end
 
   def api_key_site_setting_name
-    case SiteSetting.translator
+    case SiteSetting.translator_provider
     when "Google"
       "translator_google_api_key"
     when "Microsoft"
diff --git a/assets/javascripts/discourse/components/translated-post.gjs b/assets/javascripts/discourse/components/translated-post.gjs
index 75e23c8e..d5ea3148 100644
--- a/assets/javascripts/discourse/components/translated-post.gjs
+++ b/assets/javascripts/discourse/components/translated-post.gjs
@@ -32,7 +32,7 @@ export default class TranslatedPost extends Component {
   }
 
   get showTranslation() {
-    return !this.siteSettings.experimental_topic_translation;
+    return !this.siteSettings.experimental_inline_translation;
   }
 
   <template>
@@ -53,7 +53,7 @@ export default class TranslatedPost extends Component {
             {{i18n
               "translator.translated_from"
               language=this.post.detectedLang
-              translator=this.siteSettings.translator
+              translator=this.siteSettings.translator_provider
             }}
           </div>
           <div class="cooked">
diff --git a/assets/javascripts/discourse/initializers/extend-for-translate-button.js b/assets/javascripts/discourse/initializers/extend-for-translate-button.js
index c8208a1f..1ee5a5f7 100644
--- a/assets/javascripts/discourse/initializers/extend-for-translate-button.js
+++ b/assets/javascripts/discourse/initializers/extend-for-translate-button.js
@@ -25,7 +25,7 @@ function initializeTranslation(api) {
   }
 
   if (
-    siteSettings.experimental_topic_translation &&
+    siteSettings.experimental_inline_translation &&
     (currentUser || siteSettings.experimental_anon_language_switcher)
   ) {
     api.renderInOutlet("topic-navigation", ShowOriginalContent);
@@ -83,7 +83,7 @@ function customizeWidgetPostMenu(api) {
     }
 
     const language = dec.attrs.detected_lang;
-    const translator = siteSettings.translator;
+    const translator = siteSettings.translator_provider;
 
     let titleElements = [];
 
diff --git a/assets/javascripts/discourse/services/translator.js b/assets/javascripts/discourse/services/translator.js
index 238db2ae..1a29bafb 100644
--- a/assets/javascripts/discourse/services/translator.js
+++ b/assets/javascripts/discourse/services/translator.js
@@ -15,7 +15,7 @@ export default class TranslatorService extends Service {
     post.detectedLang = response.detected_lang;
     post.translatedText = response.translation;
     post.translatedTitle = response.title_translation;
-    if (this.siteSettings.experimental_topic_translation) {
+    if (this.siteSettings.experimental_inline_translation) {
       if (post.post_number === 1) {
         post.topic.set("fancy_title", response.title_translation);
         this.appEvents.trigger("header:update-topic", post.topic);
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index 0090afdc..606a308b 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -7,7 +7,7 @@
 ar:
   site_settings:
     translator_enabled: "السماح بالترجمة المضمَّنة للمنشورات."
-    translator: "مقدِّم خدمة الترجمة."
+    translator_provider: "مقدِّم خدمة الترجمة."
     translator_azure_subscription_key: "مفتاح اشتراك Azure"
     translator_azure_region: "منطقة Azure"
     translator_google_api_key: "مفتاح واجهة برمجة تطبيقات Google"
diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml
index 8ce1eac3..dabff6bd 100644
--- a/config/locales/server.cs.yml
+++ b/config/locales/server.cs.yml
@@ -7,7 +7,7 @@
 cs:
   site_settings:
     translator_enabled: "Povolit vložený překlad příspěvků."
-    translator: "Poskytovatel překladatelské služby."
+    translator_provider: "Poskytovatel překladatelské služby."
     translator_azure_subscription_key: "Klíč předplatného Azure"
     translator_azure_region: "Azure Region"
     translator_google_api_key: "Klíč Google API"
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index ac2c10ac..0b4ddfe8 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -7,7 +7,7 @@
 de:
   site_settings:
     translator_enabled: "Inline-Übersetzung von Beiträgen erlauben."
-    translator: "Der Anbieter des Übersetzungsdienstes."
+    translator_provider: "Der Anbieter des Übersetzungsdienstes."
     translator_azure_subscription_key: "Azure-Abonnementschlüssel"
     translator_azure_region: "Azure-Region"
     translator_google_api_key: "Google-API-Schlüssel"
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index 069f2d0d..69f9ce35 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -7,7 +7,7 @@
 el:
   site_settings:
     translator_enabled: "Αποδοχή ενσωματωμένης μετάφρασης των αναρτήσεων."
-    translator: "Ο πάροχος της μεταφραστικής υπηρεσίας."
+    translator_provider: "Ο πάροχος της μεταφραστικής υπηρεσίας."
     translator_azure_subscription_key: "Κλειδί Συνδρομής Azure"
     translator_azure_region: "Περιοχή Azure"
     translator_google_api_key: "Κλειδί API Google"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index d381e354..e57131a4 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1,7 +1,7 @@
 en:
   site_settings:
     translator_enabled: "Allow inline translation of posts."
-    translator: "The provider of the translation service."
+    translator_provider: "The provider of the translation service."
     translator_azure_subscription_key: "Azure Subscription Key"
     translator_azure_region: "Azure Region"
     translator_google_api_key: "Google API Key"
@@ -18,10 +18,10 @@ en:
     restrict_translation_by_group: "Only allowed groups can translate"
     restrict_translation_by_poster_group: "Only allow translation of posts made by users in allowed groups. If empty, allow translations of posts from all users."
     experimental_anon_language_switcher: "Enable experimental language switcher for anonymous users. This will allow anonymous users to switch between translated versions of Discourse and user-contributed content in topics."
-    translate_posts_to_languages: "Translate posts to languages"
     errors:
       set_locale_cookie_requirements: "The experimental language switcher for anonymous users requires the `set locale from cookie` site setting to be enabled."
-    experimental_topic_translation: "Enable experimental topic translation feature. This replaces existing post in-line translation with a button that allows users to translate the entire topic."
+    experimental_inline_translation: "Enable experimental inline translation feature. This replaces existing parallel translation, allowing site visitors with a non-default locale to view content in their language."
+    automatic_translation_target_languages: "The languages to automatically translate user content (posts, topics) to. If empty, no languages will be automatically translated."
   translator:
     failed: "The translator is unable to translate this content (%{source_locale}) to the default language of this site (%{target_locale})."
     not_supported: "This language is not supported by the translator."
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index b4d5eb59..ea6c8a05 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -7,7 +7,7 @@
 es:
   site_settings:
     translator_enabled: "Permitir la traducción en línea de las publicaciones."
-    translator: "El proveedor del servicio de traducción."
+    translator_provider: "El proveedor del servicio de traducción."
     translator_azure_subscription_key: "Clave de suscripción de Azure"
     translator_azure_region: "Región de Azure"
     translator_google_api_key: "Clave API de Google"
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index 469e32b1..97819d0d 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -7,7 +7,7 @@
 fa_IR:
   site_settings:
     translator_enabled: "اجازه ترجمه درون خطی نوشته‌ها را بدهید."
-    translator: "ارائه دهنده خدمات ترجمه"
+    translator_provider: "ارائه دهنده خدمات ترجمه"
     translator_azure_subscription_key: "کلید اشتراک Azure"
     translator_azure_region: "منطقه Azure"
     translator_google_api_key: "کلید API گوگل"
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index c361c153..22c66391 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -7,7 +7,7 @@
 fi:
   site_settings:
     translator_enabled: "Salli viestien käännökset niiden yhteydessä."
-    translator: "Käännöspalveluntarjoaja."
+    translator_provider: "Käännöspalveluntarjoaja."
     translator_azure_subscription_key: "Azure Subscription Key -tilaustunniste"
     translator_azure_region: "Azure-alue"
     translator_google_api_key: "Googlen API-avain"
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index 14ecd046..fcfc7c64 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -7,7 +7,7 @@
 fr:
   site_settings:
     translator_enabled: "Autoriser la traduction en ligne des messages."
-    translator: "Le fournisseur du service de traduction."
+    translator_provider: "Le fournisseur du service de traduction."
     translator_azure_subscription_key: "Clé d'abonnement Azure"
     translator_azure_region: "Région Azure"
     translator_google_api_key: "Clé d'API Google"
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 3f299eb0..8422d052 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -7,7 +7,7 @@
 he:
   site_settings:
     translator_enabled: "לאפשר תרגום מוטבע של פוסטים."
-    translator: "ספק שירות התרגום."
+    translator_provider: "ספק שירות התרגום."
     translator_azure_subscription_key: "מפתח מינוי ל־Azure"
     translator_azure_region: "אזור ב־Azure"
     translator_google_api_key: "מפתח API של Google"
@@ -24,10 +24,9 @@ he:
     restrict_translation_by_group: "רק קבוצות מורשות יכולות לתרגם"
     restrict_translation_by_poster_group: "לאפשר תרגום של פוסטים שנוצרו על ידי משתמשים בקבוצות מורשות בלבד. אם ריק, לאפשר תרגומים של פוסטים מכל המשתמשים."
     experimental_anon_language_switcher: "הפעלת בורר שפות ניסיוני למשתמשים אלמוניים. כך יוכלו משתמשים אלמוניים להחליף בין הגרסה המתורגמת של Discourse לבין התוכן שתרמו המשתמשים לנושאים."
-    translate_posts_to_languages: "תרגום פוסטים לשפות"
     errors:
       set_locale_cookie_requirements: "בורר השפה הניסיוני למשתמשים אלמוניים דורש שהגדרת האתר `set locale from cookie` (הגדרת השפה מעוגייה) תהיה פעילה."
-    experimental_topic_translation: "הפעלת יכולת תרגום נושאים ניסיונית. היא מחליפה את התרגום הפנימי של הפוסטים בכפתור שמאפשר למשתמשים לתרגם את הנושא כולו."
+    experimental_inline_translation: "הפעלת יכולת תרגום נושאים ניסיונית. היא מחליפה את התרגום הפנימי של הפוסטים בכפתור שמאפשר למשתמשים לתרגם את הנושא כולו."
   translator:
     failed: "המתרגם לא מסוגל לתרגם את התוכן הזה (%{source_locale}) לשפת ברירת המחדל של האתר הזה (%{target_locale})."
     not_supported: "שפה זו אינה נתמכת על ידי המתרגם."
diff --git a/config/locales/server.hu.yml b/config/locales/server.hu.yml
index ec6473dd..7b087c12 100644
--- a/config/locales/server.hu.yml
+++ b/config/locales/server.hu.yml
@@ -7,7 +7,7 @@
 hu:
   site_settings:
     translator_enabled: "Bejegyzések szövegközi fordításának engedélyezése."
-    translator: "A fordítási szolgáltatás szolgáltatója."
+    translator_provider: "A fordítási szolgáltatás szolgáltatója."
     translator_azure_subscription_key: "Azure előfizetési kulcs"
     translator_azure_region: "Azure régió"
     translator_google_api_key: "Google API kulcs"
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 34f25953..8a7e61e3 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -7,7 +7,7 @@
 it:
   site_settings:
     translator_enabled: "Consenti la traduzione in linea dei messaggi."
-    translator: "Il fornitore del servizio di traduzione."
+    translator_provider: "Il fornitore del servizio di traduzione."
     translator_azure_subscription_key: "Chiave di sottoscrizione Azure"
     translator_azure_region: "Regione Azure"
     translator_google_api_key: "Chiave API Google"
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index 1f86835f..09672734 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -7,7 +7,7 @@
 ja:
   site_settings:
     translator_enabled: "投稿のインライン翻訳を許可する。"
-    translator: "翻訳サービスのプロバイダー。"
+    translator_provider: "翻訳サービスのプロバイダー。"
     translator_azure_subscription_key: "Azure サブスクリプションキー"
     translator_azure_region: "Azure リージョン"
     translator_google_api_key: "Google API キー"
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index 36aa38f9..3fc678a0 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -7,7 +7,7 @@
 nl:
   site_settings:
     translator_enabled: "Sta inline vertaling van berichten toe."
-    translator: "De aanbieder van de vertaaldienst."
+    translator_provider: "De aanbieder van de vertaaldienst."
     translator_azure_subscription_key: "Azure-abonnementssleutel"
     translator_azure_region: "Azure-regio"
     translator_google_api_key: "Google API-sleutel"
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index 54c1ea25..c59c3410 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -7,7 +7,7 @@
 pl_PL:
   site_settings:
     translator_enabled: "Zezwalaj na wbudowane tłumaczenie postów."
-    translator: "Dostawca usług tłumaczeniowych."
+    translator_provider: "Dostawca usług tłumaczeniowych."
     translator_azure_subscription_key: "Klucz subskrypcji Azure"
     translator_azure_region: "Region Azure"
     translator_google_api_key: "Klucz API Google"
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index c6fa53d7..4ef0b49a 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -7,7 +7,7 @@
 pt_BR:
   site_settings:
     translator_enabled: "Permitir tradução embutida de postagens."
-    translator: "O provedor do serviço de tradução."
+    translator_provider: "O provedor do serviço de tradução."
     translator_azure_subscription_key: "Chave de Assinatura do Azure"
     translator_azure_region: "Região do Azure"
     translator_google_api_key: "Chave de API do Google"
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index a4e4581b..89376c2d 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -7,7 +7,7 @@
 ro:
   site_settings:
     translator_enabled: "Permite traducerea în linie a articolelor."
-    translator: "Furnizorul serviciului de traducere."
+    translator_provider: "Furnizorul serviciului de traducere."
     translator_azure_subscription_key: "Cheie de abonament Azure"
     translator_azure_region: "Regiune Azure"
     translator_google_api_key: "Cheie API Google"
@@ -24,10 +24,9 @@ ro:
     restrict_translation_by_group: "Doar grupurile permise pot traduce"
     restrict_translation_by_poster_group: "Permite traducerea numai a articolelor făcute de utilizatorii din grupurile permise. Dacă este gol, permite traducerea articolelor de la toți utilizatorii."
     experimental_anon_language_switcher: "Activează comutatorul experimental de limbi pentru utilizatorii anonimi. Acest lucru va permite utilizatorilor anonimi să comute între versiunile traduse ale Discourse și conținutul la care au contribuit utilizatorii în subiecte."
-    translate_posts_to_languages: "Tradu postări în limbi"
     errors:
       set_locale_cookie_requirements: "Comutatorul experimental de limbă pentru utilizatori anonimi necesită activarea setării site-ului „Setează locală din cookie”."
-    experimental_topic_translation: "Activează funcționalitatea de traducere experimentală a subiectului. Aceasta înlocuiește traducerea curentă existentă a postării în-linie cu un buton care permite utilizatorilor să traducă întregul subiect."
+    experimental_inline_translation: "Activează funcționalitatea de traducere experimentală a subiectului. Aceasta înlocuiește traducerea curentă existentă a postării în-linie cu un buton care permite utilizatorilor să traducă întregul subiect."
   translator:
     failed: "Traducătorul nu este în măsură să traducă acest conținut (%{source_locale}) în limba implicită a acestui site (%{target_locale})."
     not_supported: "Această limbă nu este acceptată de traducător."
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index 5fa0dfc1..9d2e2902 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -7,7 +7,7 @@
 ru:
   site_settings:
     translator_enabled: "Разрешить встроенный перевод записей."
-    translator: "Поставщик услуг перевода."
+    translator_provider: "Поставщик услуг перевода."
     translator_azure_subscription_key: "Ключ подписки Azure"
     translator_azure_region: "Регион Azure"
     translator_google_api_key: "Ключ API Google"
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index de57417e..10ba37df 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -7,7 +7,7 @@
 sv:
   site_settings:
     translator_enabled: "Tillåt inbäddad översättning av inlägg."
-    translator: "Leverantören av översättningstjänsten."
+    translator_provider: "Leverantören av översättningstjänsten."
     translator_azure_subscription_key: "Azure -prenumerationsnyckel"
     translator_azure_region: "Azure-region"
     translator_google_api_key: "Google API-nyckel"
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index 5cfbfaf9..0057f7e2 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -7,7 +7,7 @@
 tr_TR:
   site_settings:
     translator_enabled: "Gönderilerin satır içi çevirisine izin verin."
-    translator: "Çeviri hizmetinin sağlayıcısı."
+    translator_provider: "Çeviri hizmetinin sağlayıcısı."
     translator_azure_subscription_key: "Azure Abonelik Anahtarı"
     translator_azure_region: "Azure Region"
     translator_google_api_key: "Google API Anahtarı"
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index c62306c9..192b8fae 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -7,7 +7,7 @@
 zh_CN:
   site_settings:
     translator_enabled: "允许帖子内嵌翻译。"
-    translator: "翻译服务提供商。"
+    translator_provider: "翻译服务提供商。"
     translator_azure_subscription_key: "Azure 订阅密钥"
     translator_azure_region: "Azure 区域"
     translator_google_api_key: "Google API 密钥"
diff --git a/config/settings.yml b/config/settings.yml
index 33abd251..7cbf4a97 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -2,7 +2,7 @@ discourse_translator:
   translator_enabled:
     default: false
     client: true
-  translator:
+  translator_provider:
     default: 'Microsoft'
     client: true
     type: enum
@@ -14,6 +14,16 @@ discourse_translator:
       - Yandex
       - LibreTranslate
     validator: "DiscourseTranslator::TranslatorSelectionValidator"
+  automatic_translation_target_languages:
+    default: ""
+    type: list
+    list_type: named
+    choices: "DiscourseTranslator::TranslatableLanguagesSetting.values"
+    allow_any: false
+  automatic_translation_backfill_maximum_translations_per_hour:
+    default: 0
+    client: false
+    hidden: true
   translator_azure_subscription_key:
     default: ''
   translator_azure_region:
@@ -106,16 +116,6 @@ discourse_translator:
     default: false
     client: true
     validator: "LanguageSwitcherSettingValidator"
-  experimental_topic_translation:
+  experimental_inline_translation:
     default: false
     client: true
-  automatic_translation_target_languages:
-    default: ""
-    type: list
-    list_type: named
-    choices: "DiscourseTranslator::TranslatableLanguagesSetting.values"
-    allow_any: false
-  automatic_translation_backfill_maximum_translations_per_hour:
-    default: 0
-    client: false
-    hidden: true
diff --git a/db/migrate/20250227074505_rename_translator_site_settings.rb b/db/migrate/20250227074505_rename_translator_site_settings.rb
new file mode 100644
index 00000000..76712978
--- /dev/null
+++ b/db/migrate/20250227074505_rename_translator_site_settings.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class RenameTranslatorSiteSettings < ActiveRecord::Migration[7.0]
+  def up
+    execute <<~SQL
+      UPDATE site_settings
+      SET name = 'translator_provider'
+      WHERE name = 'translator';
+
+      UPDATE site_settings
+      SET name = 'experimental_inline_translation'
+      WHERE name = 'experimental_topic_translation';
+    SQL
+  end
+
+  def down
+    execute <<~SQL
+      UPDATE site_settings
+      SET name = 'translator'
+      WHERE name = 'translator_provider';
+
+      UPDATE site_settings
+      SET name = 'experimental_topic_translation'
+      WHERE name = 'experimental_inline_translation';
+    SQL
+  end
+end
diff --git a/lib/discourse_translator/guardian_extension.rb b/lib/discourse_translator/guardian_extension.rb
index d3a2ca04..f300b26e 100644
--- a/lib/discourse_translator/guardian_extension.rb
+++ b/lib/discourse_translator/guardian_extension.rb
@@ -30,7 +30,7 @@ def can_translate?(post)
     # this prevents the 🌐from appearing and then disappearing if the lang is same as user's lang
     return false if post.created_at > POST_DETECTION_BUFFER.ago && post.detected_locale.blank?
 
-    if SiteSetting.experimental_topic_translation
+    if SiteSetting.experimental_inline_translation
       post.translation_for(I18n.locale).nil?
     else
       poster_group_allow_translate?(post)
diff --git a/lib/discourse_translator/inline_translation.rb b/lib/discourse_translator/inline_translation.rb
index 37b0bcc5..4eec745f 100644
--- a/lib/discourse_translator/inline_translation.rb
+++ b/lib/discourse_translator/inline_translation.rb
@@ -4,7 +4,7 @@ module DiscourseTranslator
   class InlineTranslation
     def inject(plugin)
       plugin.register_modifier(:basic_post_serializer_cooked) do |cooked, serializer|
-        if !SiteSetting.experimental_topic_translation ||
+        if !SiteSetting.experimental_inline_translation ||
              serializer.scope&.request&.params&.[]("show") == "original" ||
              serializer.object.detected_locale == I18n.locale.to_s.gsub("_", "-")
           cooked
@@ -14,7 +14,7 @@ def inject(plugin)
       end
 
       plugin.register_modifier(:topic_serializer_fancy_title) do |fancy_title, serializer|
-        if !SiteSetting.experimental_topic_translation ||
+        if !SiteSetting.experimental_inline_translation ||
              serializer.scope&.request&.params&.[]("show") == "original" ||
              serializer.object.locale_matches?(I18n.locale)
           fancy_title
@@ -24,7 +24,7 @@ def inject(plugin)
       end
 
       plugin.register_modifier(:topic_view_serializer_fancy_title) do |fancy_title, serializer|
-        if !SiteSetting.experimental_topic_translation ||
+        if !SiteSetting.experimental_inline_translation ||
              serializer.scope&.request&.params&.[]("show") == "original" ||
              serializer.object.topic.locale_matches?(I18n.locale)
           fancy_title
diff --git a/lib/discourse_translator/dual_text_translation.rb b/lib/discourse_translator/parallel_text_translation.rb
similarity index 92%
rename from lib/discourse_translator/dual_text_translation.rb
rename to lib/discourse_translator/parallel_text_translation.rb
index b99fa636..c2cc72fe 100644
--- a/lib/discourse_translator/dual_text_translation.rb
+++ b/lib/discourse_translator/parallel_text_translation.rb
@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 module DiscourseTranslator
-  class DualTextTranslation
+  class ParallelTextTranslation
     def inject(plugin)
-      # in dual-text translations,
+      # in parallel text translations,
       # we don't want to send the post for detection if automatic translation already happens,
       # as automatic translations send content for language detection as a side effect of translating
 
diff --git a/plugin.rb b/plugin.rb
index 69b97807..fd5d616f 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -36,7 +36,7 @@ module ::DiscourseTranslator
     scope.can_translate?(object)
   end
 
-  DiscourseTranslator::DualTextTranslation.new.inject(self)
+  DiscourseTranslator::ParallelTextTranslation.new.inject(self)
   DiscourseTranslator::InlineTranslation.new.inject(self)
 
   DiscourseTranslator::AutomaticTranslations.new.inject(self)
diff --git a/spec/jobs/automatic_translation_backfill_spec.rb b/spec/jobs/automatic_translation_backfill_spec.rb
index 7652eb01..7edb8847 100644
--- a/spec/jobs/automatic_translation_backfill_spec.rb
+++ b/spec/jobs/automatic_translation_backfill_spec.rb
@@ -3,7 +3,7 @@
 describe Jobs::AutomaticTranslationBackfill do
   before do
     SiteSetting.translator_enabled = true
-    SiteSetting.translator = "Google"
+    SiteSetting.translator_provider = "Google"
     SiteSetting.translator_google_api_key = "api_key"
   end
 
diff --git a/spec/jobs/detect_translatable_language_spec.rb b/spec/jobs/detect_translatable_language_spec.rb
index da5d97a8..f3b99c22 100644
--- a/spec/jobs/detect_translatable_language_spec.rb
+++ b/spec/jobs/detect_translatable_language_spec.rb
@@ -9,7 +9,7 @@
 
   before do
     SiteSetting.translator_enabled = true
-    SiteSetting.translator = "Amazon"
+    SiteSetting.translator_provider = "Amazon"
     client = Aws::Translate::Client.new(stub_responses: true)
     client.stub_responses(
       :translate_text,
diff --git a/spec/jobs/translate_translatable_spec.rb b/spec/jobs/translate_translatable_spec.rb
index 849262fa..927bb24e 100644
--- a/spec/jobs/translate_translatable_spec.rb
+++ b/spec/jobs/translate_translatable_spec.rb
@@ -7,7 +7,7 @@
 
   before do
     SiteSetting.translator_enabled = true
-    SiteSetting.translator = "Google"
+    SiteSetting.translator_provider = "Google"
     SiteSetting.automatic_translation_target_languages = "es|fr"
     allow(DiscourseTranslator::Google).to receive(:translate)
   end
diff --git a/spec/lib/guardian_extension_spec.rb b/spec/lib/guardian_extension_spec.rb
index fee03859..c85c8b6c 100644
--- a/spec/lib/guardian_extension_spec.rb
+++ b/spec/lib/guardian_extension_spec.rb
@@ -142,10 +142,10 @@
         before { SiteSetting.restrict_translation_by_group = "#{Group::AUTO_GROUPS[:everyone]}" }
 
         it "cannot translate" do
-          SiteSetting.experimental_topic_translation = true
+          SiteSetting.experimental_inline_translation = true
           expect(Guardian.new.can_translate?(post)).to eq(false)
 
-          SiteSetting.experimental_topic_translation = false
+          SiteSetting.experimental_inline_translation = false
           expect(Guardian.new.can_translate?(post)).to eq(false)
         end
       end
@@ -153,10 +153,10 @@
       it "cannot translate when post detected locale matches i18n locale" do
         post.set_detected_locale("pt")
 
-        SiteSetting.experimental_topic_translation = true
+        SiteSetting.experimental_inline_translation = true
         expect(guardian.can_translate?(post)).to eq(false)
 
-        SiteSetting.experimental_topic_translation = false
+        SiteSetting.experimental_inline_translation = false
         expect(guardian.can_translate?(post)).to eq(false)
       end
 
@@ -176,8 +176,8 @@
         expect(guardian.can_translate?(post)).to eq(false)
       end
 
-      describe "when experimental_topic_translation enabled" do
-        before { SiteSetting.experimental_topic_translation = true }
+      describe "when experimental_inline_translation enabled" do
+        before { SiteSetting.experimental_inline_translation = true }
 
         describe "logged in user" do
           it "cannot translate when user is not in restrict_translation_by_group" do
@@ -205,8 +205,8 @@
         end
       end
 
-      describe "when experimental topic translation disabled" do
-        before { SiteSetting.experimental_topic_translation = false }
+      describe "when experimental inline translation disabled" do
+        before { SiteSetting.experimental_inline_translation = false }
 
         it "cannot translate when user is not in restrict_translation_by_group" do
           SiteSetting.restrict_translation_by_group = "#{group.id + 1}"
diff --git a/spec/requests/translator_controller_spec.rb b/spec/requests/translator_controller_spec.rb
index e0356a0d..aa96d6a7 100644
--- a/spec/requests/translator_controller_spec.rb
+++ b/spec/requests/translator_controller_spec.rb
@@ -8,7 +8,7 @@ module DiscourseTranslator
 
     before do
       SiteSetting.translator_enabled = true
-      SiteSetting.translator = "Microsoft"
+      SiteSetting.translator_provider = "Microsoft"
       SiteSetting.restrict_translation_by_group = "#{Group.find_by(name: "trust_level_1").id}"
     end
 
diff --git a/spec/serializers/basic_topic_serializer_spec.rb b/spec/serializers/basic_topic_serializer_spec.rb
index 312686ed..616eb527 100644
--- a/spec/serializers/basic_topic_serializer_spec.rb
+++ b/spec/serializers/basic_topic_serializer_spec.rb
@@ -8,7 +8,7 @@
 
   before do
     SiteSetting.translator_enabled = true
-    SiteSetting.experimental_topic_translation = true
+    SiteSetting.experimental_inline_translation = true
   end
 
   describe "#fancy_title" do
@@ -18,7 +18,7 @@
 
     before do
       topic.title = original_title
-      SiteSetting.experimental_topic_translation = true
+      SiteSetting.experimental_inline_translation = true
       I18n.locale = "ja"
     end
 
@@ -29,8 +29,8 @@ def serialize_topic(guardian_user: user, params: {})
       BasicTopicSerializer.new(topic, scope: guardian)
     end
 
-    it "does not replace fancy_title with translation when experimental_topic_translation is disabled" do
-      SiteSetting.experimental_topic_translation = false
+    it "does not replace fancy_title with translation when experimental_inline_translation is disabled" do
+      SiteSetting.experimental_inline_translation = false
       topic.set_translation("ja", jap_title)
 
       expect(serialize_topic.fancy_title).to eq(topic.fancy_title)
diff --git a/spec/serializers/post_serializer_spec.rb b/spec/serializers/post_serializer_spec.rb
index 1333a354..20697951 100644
--- a/spec/serializers/post_serializer_spec.rb
+++ b/spec/serializers/post_serializer_spec.rb
@@ -66,11 +66,11 @@ def serialize_post(guardian_user: user, params: {})
 
     before do
       SiteSetting.translator_enabled = true
-      SiteSetting.experimental_topic_translation = true
+      SiteSetting.experimental_inline_translation = true
     end
 
-    it "does not return translated_cooked when experimental_topic_translation is disabled" do
-      SiteSetting.experimental_topic_translation = false
+    it "does not return translated_cooked when experimental_inline_translation is disabled" do
+      SiteSetting.experimental_inline_translation = false
       expect(serialize_post.cooked).to eq(post.cooked)
     end
 
diff --git a/spec/serializers/topic_view_serializer_spec.rb b/spec/serializers/topic_view_serializer_spec.rb
index 62f7659c..e618ed37 100644
--- a/spec/serializers/topic_view_serializer_spec.rb
+++ b/spec/serializers/topic_view_serializer_spec.rb
@@ -41,7 +41,7 @@
 
     before do
       topic.title = original_title
-      SiteSetting.experimental_topic_translation = true
+      SiteSetting.experimental_inline_translation = true
       I18n.locale = "ja"
     end
 
@@ -52,8 +52,8 @@ def serialize_topic(guardian_user: user, params: {})
       TopicViewSerializer.new(TopicView.new(topic), scope: guardian)
     end
 
-    it "does not replace fancy_title with translation when experimental_topic_translation is disabled" do
-      SiteSetting.experimental_topic_translation = false
+    it "does not replace fancy_title with translation when experimental_inline_translation is disabled" do
+      SiteSetting.experimental_inline_translation = false
       topic.set_translation("ja", jap_title)
 
       expect(serialize_topic.fancy_title).to eq(topic.fancy_title)
diff --git a/spec/services/discourse_ai_spec.rb b/spec/services/discourse_ai_spec.rb
index a2979c56..dbf8d428 100644
--- a/spec/services/discourse_ai_spec.rb
+++ b/spec/services/discourse_ai_spec.rb
@@ -11,7 +11,7 @@
     end
     SiteSetting.ai_helper_enabled = true
     SiteSetting.translator_enabled = true
-    SiteSetting.translator = "DiscourseAi"
+    SiteSetting.translator_provider = "DiscourseAi"
   end
 
   describe ".language_supported?" do
diff --git a/spec/services/problem_check/missing_translator_api_key_spec.rb b/spec/services/problem_check/missing_translator_api_key_spec.rb
index 52cfbd60..1ed8367e 100644
--- a/spec/services/problem_check/missing_translator_api_key_spec.rb
+++ b/spec/services/problem_check/missing_translator_api_key_spec.rb
@@ -8,7 +8,7 @@
 
     shared_examples "missing key checker" do |provider, key|
       context "when translator is #{provider}" do
-        before { SiteSetting.translator = provider }
+        before { SiteSetting.translator_provider = provider }
 
         it "when #{provider} is not provided" do
           SiteSetting.set(key, "")
diff --git a/spec/system/full_page_translation_spec.rb b/spec/system/full_page_translation_spec.rb
index a9023a25..ea6b0847 100644
--- a/spec/system/full_page_translation_spec.rb
+++ b/spec/system/full_page_translation_spec.rb
@@ -34,7 +34,7 @@
       SiteSetting.set_locale_from_cookie = true
       SiteSetting.set_locale_from_param = true
       SiteSetting.experimental_anon_language_switcher = true
-      SiteSetting.experimental_topic_translation = true
+      SiteSetting.experimental_inline_translation = true
     end
 
     it "shows the correct language based on the selected language and login status" do
diff --git a/test/javascripts/integration/translated-post-test.js b/test/javascripts/integration/translated-post-test.js
index 57376737..ea61c22b 100644
--- a/test/javascripts/integration/translated-post-test.js
+++ b/test/javascripts/integration/translated-post-test.js
@@ -17,7 +17,7 @@ module("Integration | Component | translated-post", function (hooks) {
       },
     });
 
-    this.siteSettings.experimental_topic_translation = false;
+    this.siteSettings.experimental_inline_translation = false;
     this.siteSettings.translator = "Google";
 
     await render(hbs`
@@ -30,7 +30,7 @@ module("Integration | Component | translated-post", function (hooks) {
     assert.dom(".cooked").hasText("こんにちは");
   });
 
-  test("hides translation when experimental_topic_translation is enabled", async function (assert) {
+  test("hides translation when experimental_inline_translation is enabled", async function (assert) {
     this.set("outletArgs", {
       post: {
         isTranslated: true,
@@ -39,7 +39,7 @@ module("Integration | Component | translated-post", function (hooks) {
       },
     });
 
-    this.siteSettings.experimental_topic_translation = true;
+    this.siteSettings.experimental_inline_translation = true;
 
     await render(hbs`
       <TranslatedPost @outletArgs={{this.outletArgs}} />
diff --git a/test/javascripts/service/translator-test.js b/test/javascripts/service/translator-test.js
index d486f14f..06dcebfc 100644
--- a/test/javascripts/service/translator-test.js
+++ b/test/javascripts/service/translator-test.js
@@ -31,7 +31,7 @@ module("Unit | Service | translator", function (hooks) {
   test("translatePost - with experimental translation for first post", async function (assert) {
     const service = this.owner.lookup("service:translator");
 
-    service.siteSettings.experimental_topic_translation = true;
+    service.siteSettings.experimental_inline_translation = true;
 
     let headerUpdateCalled = false;
     let postStreamRefreshCalled = false;

From 9094cb607f85510a670c666d019c102c7c90b411 Mon Sep 17 00:00:00 2001
From: Nat <natalie.tay@discourse.org>
Date: Thu, 27 Feb 2025 16:44:09 +0800
Subject: [PATCH 2/2] Update test to use new site setting

---
 test/javascripts/integration/translated-post-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/javascripts/integration/translated-post-test.js b/test/javascripts/integration/translated-post-test.js
index ea61c22b..c677d329 100644
--- a/test/javascripts/integration/translated-post-test.js
+++ b/test/javascripts/integration/translated-post-test.js
@@ -18,7 +18,7 @@ module("Integration | Component | translated-post", function (hooks) {
     });
 
     this.siteSettings.experimental_inline_translation = false;
-    this.siteSettings.translator = "Google";
+    this.siteSettings.translator_provider = "Google";
 
     await render(hbs`
       <TranslatedPost @outletArgs={{this.outletArgs}} />