singleton-client-test 0.7.0.11 → 0.7.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e383b9b5f7d7ecb475fea3c26f2d0206d104d1d1c2f123a2b0e7b713c4caa38
-  data.tar.gz: c9f1e6766601af5c3bb6110850b9c14e3d2536cdabdce1528b549588d9e11937
+  metadata.gz: 332b39a0bf24294e31ed737dcfa87b3e681471f786876162c47b6f03326cccf7
+  data.tar.gz: 486a9c58afc2505444237a764d80b715617f50ee2496033cf91e631b12b905f5
 SHA512:
-  metadata.gz: 6baf69345a6ba4be2762dd6072392b1a2dedd7e40d62f05266a43e825df44e1b65e0760c28bd1335a9f77c43858e77e6b9debc73f7c995eb24a36e43378e7e39
-  data.tar.gz: ffd2122264ae556007ac8050f9eaf7d2638abbca12866eb0aa0460d67083ec24cb56a24e628515195c04ce94caab450b69341a887074d402bbfc58d7f4c65cfd
+  metadata.gz: 6427e56f2e9b213a0491f5980a580ad40786fd836d96d08f664592e99fa3fdae45eb38b17e350b1843f5986b208f4bebb0283a2739feefe9c8f847d9be9371d7
+  data.tar.gz: 82262acff173efbdea7abd8d2ebadb7555e6e5c53a24733e536d01a8a57d0eef4feec3918e6214208800aba1d38ae20735a9e148b7fbf1d716fcd96d4c8b0d37

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

@@ -17,11 +17,14 @@ module SgtnClient
         else
           SgtnClient.logger.debug "Getting sources from cache with key: " + cache_key
         end
-        if items.nil?
-          return key
+        s = items[locale][key]
+        if items.nil? || s.nil?
+          SgtnClient.logger.debug "Source not found, return key: " + key
+          #return key
+          return nil
+        else
+          return s
         end
-        str = items[locale][key]
-        return str
       end
 
       def self.getSources(component, locale)

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

@@ -12,30 +12,25 @@ module SgtnClient
   class Translation
 
       def self.getString(component, key, 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
+        str = getTranslation(component, key, locale)
+        if str.nil?
+          str = SgtnClient::Source.getSource(component, key, SgtnClient::Config.configurations.default)
         end
+        str
+      end
 
-        default = SgtnClient::Config.configurations.default
-        if items.nil? || items["messages"] == nil
-          return SgtnClient::Source.getSource(component, key, default)
-        end
-        str = items["messages"][key]
+      def self.getString_p(component, key, plural_args, locale)
+        str = getTranslation(component, key, locale)
         if str.nil?
-          return SgtnClient::Source.getSource(component, key, default)
+          str = SgtnClient::Source.getSource(component, key, SgtnClient::Config.configurations.default)
+          str.to_plural_s(:en, plural_args)
         else
-          return str
+          str.to_plural_s(locale, plural_args)
         end
-       end
+      end
 
-      def self.getString_f(component, key, args, locale)
-         s = getString(component, key, locale)
+      def self.getString_f(component, key, args, locale, *optionals)
+         s = getString(component, key, locale, *optionals)
          if args.is_a?(Hash)
           args.each do |source, arg|
             s.gsub! "{#{source}}", arg
@@ -62,7 +57,7 @@ module SgtnClient
           items = {}
           s = SgtnClient::Source.getSources(component, default)
           default_component, value = s.first
-          items["component"] = default_component
+          items["component"] = component
           items["messages"] = value
           items["locale"] = 'source'
         end
@@ -72,6 +67,23 @@ module SgtnClient
 
       private
 
+      def self.getTranslation(component, key, 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
+        if items.nil? || items["messages"] == nil
+          nil
+        else
+          items["messages"][key]
+        end
+      end
+      
       def self.getTranslations(component, locale)
         env = SgtnClient::Config.default_environment
         mode = SgtnClient::Config.configurations[env]["bundle_mode"]

data/lib/sgtn-client/cldr/localized_datetime.rb

@@ -1,27 +1,63 @@
 require 'date'
 require 'time'
 
-DateTime.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
-          def l_full_s(locale = TwitterCldr.locale)
-             self.localize(locale).to_full_s
+DateTime.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 2
+          def l_full_s(locale = TwitterCldr.locale, *args)
+            timezone = args[0]
+            display_name = args[1]
+            if timezone.nil?
+               self.localize(locale).to_full_s
+            elsif display_name.nil?
+               self.localize(locale).with_timezone(timezone).to_full_s
+            else
+               tz = TwitterCldr::Timezones::Timezone.instance(timezone, locale)
+               tz.display_name_for(self, display_name)
+            end
           end
         LOCALIZE
 
 DateTime.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
-          def l_long_s(locale = TwitterCldr.locale)
-             self.localize(locale).to_long_s
+          def l_long_s(locale = TwitterCldr.locale, *args)
+             timezone = args[0]
+             display_name = args[1]
+             if timezone.nil?
+                self.localize(locale).to_long_s
+             elsif display_name.nil?
+                self.localize(locale).with_timezone(timezone).to_long_s
+             else
+                tz = TwitterCldr::Timezones::Timezone.instance(timezone, locale)
+                tz.display_name_for(self, display_name)
+             end
           end
         LOCALIZE
 
 DateTime.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
-          def l_medium_s(locale = TwitterCldr.locale)
-             self.localize(locale).to_medium_s
+          def l_medium_s(locale = TwitterCldr.locale, *args)
+             timezone = args[0]
+             display_name = args[1]
+             if timezone.nil?
+                self.localize(locale).to_medium_s
+             elsif display_name.nil?
+                self.localize(locale).with_timezone(timezone).to_medium_s
+             else
+                tz = TwitterCldr::Timezones::Timezone.instance(timezone, locale)
+                tz.display_name_for(self, display_name)
+             end
           end
         LOCALIZE
 
 
 DateTime.class_eval <<-LOCALIZE, __FILE__, __LINE__ + 1
-        def l_short_s(locale = TwitterCldr.locale)
-           self.localize(locale).to_short_s
+        def l_short_s(locale = TwitterCldr.locale, *args)
+           timezone = args[0]
+           display_name = args[1]
+           if timezone.nil?
+              self.localize(locale).to_short_s
+           elsif display_name.nil?
+              self.localize(locale).with_timezone(timezone).to_short_s
+           else
+              tz = TwitterCldr::Timezones::Timezone.instance(timezone, locale)
+              tz.display_name_for(self, display_name)
+           end
         end
       LOCALIZE

data/lib/version.rb

@@ -1,3 +1,3 @@
 
-    VERSION_INFO = [0, 1, 8].freeze
+    VERSION_INFO = [0, 2, 1].freeze
     VERSION = VERSION_INFO.map(&:to_s).join('.').freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: singleton-client-test
 version: !ruby/object:Gem::Version
-  version: 0.7.0.11
+  version: 0.7.0.15
 platform: ruby
 authors:
 - VMware G11n Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-28 00:00:00.000000000 Z
+date: 2021-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client