singleton-client-test 0.7.0.13 → 0.7.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 197fe36f1862932229b3e8901d19f8ad232e6f3a231615c7af28e77684ab906f
-  data.tar.gz: aa84d7909dde95f9beb33d9343a4476263dedb72d61b1d50f23caff1fbfe5db2
+  metadata.gz: d6857a6d43824c3215fc8b7a1f924702d8dc859a1cdaa4445b381efc5fbbaa1c
+  data.tar.gz: 0f103e0cf2697e616c51e0f97c8a862eef177002f438e37c598987e78d311cbc
 SHA512:
-  metadata.gz: c4dfc25597e7230f67e35835aa44cc22576dd9c873664f81e4c78d2f469511a7d44b336b7c8d2c399505b3cb197336ac944e1e14c81c028a431529815ebce510
-  data.tar.gz: 21301320623975a97530889f17f11f0512730cef45aed8155c7186b4dd49e21b97e3da420e1ed1d4979d93efffaadb2207e6ad3acd2dadd203300836eb9d2cd7
+  metadata.gz: a507ec0cdfa8680d910ef10572955bc6494533edb2b3e7798d9d9c62946a9fb7e2c41c56a964033cf82290f0f1cd31d2b918f7631d3ebf713734df731998ba59
+  data.tar.gz: a1cbe10c90139f63dad0b9ae86cdacfb6e283f784664b1e2b51cfc8dc7b9b882c60ffacfa35fe4eefebd3f25f7bc0e7af62119a5c188055d2beb3c59a0724e6b

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.13
+  version: 0.7.0.14
 platform: ruby
 authors:
 - VMware G11n Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-30 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client