Merge pull request #22550 from kbrock/unpeg_i18n

Upgrade i18n version
ManageIQ · Jul 24, 2023 · 02ac620 · 02ac620
2 parents e5acb48 + 1dc4bd9
commit 02ac620
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -38,12 +38,9 @@ gem "default_value_for",                "~>3.3"
 gem "docker-api",                       "~>1.33.6",          :require => false
 gem "elif",                             "=0.1.0",            :require => false
 gem "fast_gettext",                     "~>2.0.1"
-gem "gettext_i18n_rails",               "~>1.10.1"
+gem "gettext_i18n_rails",               "~>1.11"
 gem "gettext_i18n_rails_js",            "~>1.3.0"
 gem "hamlit",                           "~>2.11.0"
-# rails-i18n typically takes care of this dependency
-# hardcoding to avoid 1.14 issue. remove once 1.15 comes out
-gem "i18n",                             "~>1.13.0"
 gem "inifile",                          "~>3.0",             :require => false
 gem "inventory_refresh",                "~>2.0",             :require => false
 gem "kubeclient",                       "~>4.0",             :require => false # For scaling pods at runtime

diff --git a/app/models/dictionary.rb b/app/models/dictionary.rb
@@ -52,7 +52,7 @@ def self.ui_lookup(options = {})
 
   def self.i18n_lookup(type, text)
     result = I18n.t("dictionary.#{type}.#{text}", :locale => "en")
-    result.start_with?("translation missing:") ? nil : result
+    result if result && !result.match?(/Translation missing:/i)
   end
   private_class_method :i18n_lookup
 end