Only normalize within discourse ai

Author: nattsw

app/services/discourse_translator/base.rb

@@ -63,12 +63,11 @@ def self.get_text(topic_or_post)
       end
     end
 
-    def self.language_supported?(detected_lang, site_lang)
+    def self.language_supported?(detected_lang)
       raise NotImplementedError unless self.const_defined?(:SUPPORTED_LANG_MAPPING)
-      site_lang_sym = site_lang.to_sym
       supported_lang = const_get(:SUPPORTED_LANG_MAPPING)
-      return false if supported_lang[site_lang_sym].nil?
-      detected_lang.to_sym != supported_lang[site_lang_sym].to_sym
+      return false if supported_lang[I18n.locale].nil?
+      detected_lang != supported_lang[I18n.locale]
     end
 
     private

app/services/discourse_translator/discourse_ai.rb

@@ -6,8 +6,9 @@
 module DiscourseTranslator
   class DiscourseAi < Base
     MAX_DETECT_LOCALE_TEXT_LENGTH = 1000
-    def self.language_supported?(_, _)
-      true
+    def self.language_supported?(detected_lang)
+      locale_without_region = I18n.locale.to_s.split("_").first
+      detected_lang != locale_without_region
     end
 
     def self.detect(topic_or_post)

lib/discourse_translator/guardian_extension.rb

@@ -22,24 +22,17 @@ def can_detect_language?(post)
   def can_translate?(post)
     return false if !user_group_allow_translate?
 
-    # we will deal with strings (not syms) when comparing locales below
+    # we will deal with regionalized_strings (not syms) when comparing locales
+    # e.g. "en_GB"
+    #      not "en-GB"
+    #      nor :en_GB (I18n.locale)
     detected_lang =
       post.custom_fields[::DiscourseTranslator::DETECTED_LANG_CUSTOM_FIELD].to_s.sub("-", "_")
     return false if detected_lang.blank?
 
-    locale_without_region = I18n.locale.to_s.split("_").first
-    site_locale =
-      (
-        if SiteSetting.normalize_language_variants_map.include?(locale_without_region)
-          locale_without_region
-        else
-          I18n.locale.to_s
-        end
-      )
-    detected_lang != site_locale &&
+    detected_lang != I18n.locale.to_s &&
       "DiscourseTranslator::#{SiteSetting.translator}".constantize.language_supported?(
         detected_lang,
-        site_locale,
       )
   end
 end

spec/services/base_spec.rb

@@ -12,21 +12,24 @@ class EmptyTranslator < DiscourseTranslator::Base
 
   describe ".language_supported?" do
     it "raises an error when the method is not implemented" do
-      expect { EmptyTranslator.language_supported?("en", "en") }.to raise_error(NotImplementedError)
+      expect { EmptyTranslator.language_supported?("en") }.to raise_error(NotImplementedError)
     end
 
     it "returns false when the locale is not supported" do
-      expect(TestTranslator.language_supported?("en", "xx")).to eq(false)
+      I18n.stubs(:locale).returns(:xx)
+      expect(TestTranslator.language_supported?("en")).to eq(false)
     end
 
     it "returns true when the detected language is not the current locale" do
-      expect(TestTranslator.language_supported?("en", "pt")).to eq(true)
-      expect(TestTranslator.language_supported?("ar", "pt")).to eq(true)
-      expect(TestTranslator.language_supported?("es-MX", "pt")).to eq(true)
+      I18n.locale = :pt
+      expect(TestTranslator.language_supported?("en")).to eq(true)
+      expect(TestTranslator.language_supported?("ar")).to eq(true)
+      expect(TestTranslator.language_supported?("es-MX")).to eq(true)
     end
 
     it "returns false when the detected language is the detected locale" do
-      expect(TestTranslator.language_supported?("pt", "pt")).to eq(false)
+      I18n.locale = :pt
+      expect(TestTranslator.language_supported?("pt")).to eq(false)
     end
   end
 

spec/services/discourse_ai_spec.rb

@@ -15,8 +15,14 @@
   end
 
   describe ".language_supported?" do
-    it "returns true for any language" do
-      expect(described_class.language_supported?("any-language", "??")).to eq(true)
+    it "returns true when detected language is different from i18n locale" do
+      I18n.stubs(:locale).returns(:xx)
+      expect(described_class.language_supported?("any-language")).to eq(true)
+    end
+
+    it "returns false when detected language is same base language as i18n locale" do
+      I18n.stubs(:locale).returns(:en_GB)
+      expect(described_class.language_supported?("en")).to eq(false)
     end
   end