singleton-client-test 0.7.0.26 → 0.7.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a0d174f65d5ce5b87ead4f4c61bc57070bc051ab51bc65343c7ca50a0fd0b68
-  data.tar.gz: eaf356bee612ecf0f512083e029964de5307acd3dc05555c710ce386384346ea
+  metadata.gz: '0989ae16ca4fcfd6088931a367ac5eb671fd8e087a8d9e32539a2480d1107b34'
+  data.tar.gz: d750961a5b1c116914f50a947626e0fc4e8a391b3fa28b8e2a77e3651c823ba2
 SHA512:
-  metadata.gz: 512573410bae6caa91cf0b893f27e95a0864a0374e75bd601a55a2f471ca75ed69c6f537aeb24ca7b9202a6bc59c231a838c3d5a167fdc56f130c8ab844a32e5
-  data.tar.gz: 6a2f2f82f806b564ede5218c7cda2123e528515f5089bb4ea3658451598174d140006e9d075ed68e4b1ae3c04b78b4dc3892a00bc26e447387edb282a8f35c9b
+  metadata.gz: 89e893c6f79dde564732300a4431581effb0dc6aeb7eb3f8fc665c8108d4eaf0292a64e962da259f931c9ebf21299ae05d0db4cac427ec78c5a50c3c81d9a562
+  data.tar.gz: fd50009cbda5e06c8e1a3d7f81ec02c6b1d060fec95d6824b8e8713f33c48acad660be1e276ee565403cc8eda5abcf9d8f6f0faa936b895ceb9cef29feec0dbd

data/lib/sgtn-client/api/translation.rb

@@ -42,16 +42,7 @@ module SgtnClient
       end
 
       def self.getStrings(component, locale)
-        flocale = SgtnClient::LocaleUtil.fallback(locale)
-        cache_key = SgtnClient::CacheUtil.get_cachekey(component, flocale)
-        items = SgtnClient::CacheUtil.get_cache(cache_key)
-        if items.nil?
-          items = getTranslations(component, flocale)
-          SgtnClient::CacheUtil.write_cache(cache_key, items)
-        else
-          SgtnClient.logger.debug "Getting translations from cache with key: " + cache_key
-        end
-
+        items = get_cs(component, locale)
         default = SgtnClient::Config.configurations.default
         if items.nil? || items["messages"] == nil
           items = {}
@@ -68,11 +59,20 @@ module SgtnClient
       private
 
       def self.getTranslation(component, key, locale)
+        items = get_cs(component, locale)
+        if items.nil? || items["messages"] == nil
+          nil
+        else
+          items["messages"][key]
+        end
+      end
+
+      def self.get_cs(component, locale)
         flocale = SgtnClient::LocaleUtil.fallback(locale)
         cache_key = SgtnClient::CacheUtil.get_cachekey(component, flocale)
         items = SgtnClient::CacheUtil.get_cache(cache_key)
         if items.nil?
-          items = getTranslations(component, flocale)
+          items = load(component, flocale)
           if items.nil?
             items = SgtnClient::Source.getSources(component, SgtnClient::Config.configurations.default)
             SgtnClient::Core::Cache.put(cache_key, items, 60)
@@ -82,24 +82,21 @@ module SgtnClient
         else
           SgtnClient.logger.debug "Getting translations from cache with key: " + cache_key
         end
-        if items.nil? || items["messages"] == nil
-          nil
-        else
-          items["messages"][key]
-        end
-      end
-      
-      def self.getTranslations(component, locale)
+
+        return items
+       end
+
+      def self.load(component, locale)
         env = SgtnClient::Config.default_environment
         mode = SgtnClient::Config.configurations[env]["bundle_mode"]
         if mode == 'offline'
-          return get_offbundle(component, locale)
+          return load_o(component, locale)
         else
-          return get_server(component, locale)
+          return load_s(component, locale)
         end
       end
 
-      def self.get_offbundle(component, locale)
+      def self.load_o(component, locale)
         env = SgtnClient::Config.default_environment
         product_name = SgtnClient::Config.configurations[env]["product_name"]
         version = SgtnClient::Config.configurations[env]["version"].to_s
@@ -109,7 +106,7 @@ module SgtnClient
         SgtnClient::FileUtil.read_json(bundlepath)
       end
 
-      def self.get_server(component, locale)
+      def self.load_s(component, locale)
         env = SgtnClient::Config.default_environment
         product_name = SgtnClient::Config.configurations[env]["product_name"]
         vip_server = SgtnClient::Config.configurations[env]["vip_server"]

data/lib/sgtn-client/core/config.rb

@@ -40,7 +40,7 @@ module SgtnClient
     :rest_endpoint, :rest_token_endpoint, :client_id, :client_secret,
     :openid_endpoint, :openid_redirect_uri, :openid_client_id, :openid_client_secret,
     :verbose_logging, :product_name, :version, :vip_server, :bundle_mode,
-    :translation_bundle, :source_bundle, :cache_expiry_period, :disable_cache
+    :translation_bundle, :source_bundle, :cache_expiry_period, :disable_cache, :default_language
 
 
     # Create Config object

data/lib/sgtn-client/util/cache-util.rb

@@ -32,7 +32,12 @@ module SgtnClient
         env = SgtnClient::Config.default_environment
         product_name = SgtnClient::Config.configurations[env]["product_name"]
         version = SgtnClient::Config.configurations[env]["version"].to_s
-        return product_name + "_" + version + "_" + component + "_" + locale
+        default_l = SgtnClient::Config.configurations[env]["default_language"]
+        if default_l == nil
+          default_l = 'en'
+        end
+        lc = locale == default_l ? SgtnClient::Config.configurations.default: locale
+        return product_name + "_" + version + "_" + component + "_" + lc
       end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: singleton-client-test
 version: !ruby/object:Gem::Version
-  version: 0.7.0.26
+  version: 0.7.0.27
 platform: ruby
 authors:
 - VMware G11n Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-25 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client