code-ruby 1.9.3 → 1.9.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/VERSION +1 -1
- data/lib/code/object/date.rb +6 -4
- data/lib/code/object/time.rb +6 -4
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1f08b2e7af8f9cc36ddb680eb1d62d84ada6b1848025cf1d231dc10f1d39523c
|
|
4
|
+
data.tar.gz: 0fa0bffda699ee3067916308f5751fed9526e26144273d2aeecc97c3bf0570c1
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 04c0ea8332a715b4d9d39d9f22d7b7ee1cd959c9d7a9ecc1c57a76b0ea07ac1744d4c44777969478bdaccc2de28f389ae0a6200fb9f5fd19b6b468692f0406ad
|
|
7
|
+
data.tar.gz: 5484b3ceae22f03f63427f0f48351e90b1ee15e793f668cbdfb5b839df64dadcdd2ead2a6b47152df0b130a09420d12f5710b3ded917b8ed08d78322b811d526
|
data/Gemfile.lock
CHANGED
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
1.9.
|
|
1
|
+
1.9.4
|
data/lib/code/object/date.rb
CHANGED
|
@@ -705,13 +705,15 @@ class Code
|
|
|
705
705
|
code_locale = locale.to_code
|
|
706
706
|
|
|
707
707
|
requested_locale = code_locale.raw&.to_s
|
|
708
|
-
locale = requested_locale&.presence_in(LOCALES)&.to_sym
|
|
709
|
-
locale
|
|
708
|
+
locale = requested_locale&.presence_in(LOCALES)&.to_sym
|
|
709
|
+
locale ||= ::Current.locale if defined?(::Current)
|
|
710
|
+
locale ||= ::I18n.locale
|
|
711
|
+
locale = ::I18n.locale unless ::I18n.available_locales.include?(locale.to_sym)
|
|
710
712
|
|
|
711
713
|
format = code_format.raw || :default
|
|
712
|
-
format = format.to_sym if I18n.exists?("date.formats.#{format}", locale)
|
|
714
|
+
format = format.to_sym if ::I18n.exists?("date.formats.#{format}", locale)
|
|
713
715
|
|
|
714
|
-
String.new(I18n.l(raw, format: format, locale: locale))
|
|
716
|
+
String.new(::I18n.l(raw, format: format, locale: locale))
|
|
715
717
|
end
|
|
716
718
|
|
|
717
719
|
def code_format_locale_from_arguments(code_arguments)
|
data/lib/code/object/time.rb
CHANGED
|
@@ -814,13 +814,15 @@ class Code
|
|
|
814
814
|
code_locale = locale.to_code
|
|
815
815
|
|
|
816
816
|
requested_locale = code_locale.raw&.to_s
|
|
817
|
-
locale = requested_locale&.presence_in(LOCALES)&.to_sym
|
|
818
|
-
locale
|
|
817
|
+
locale = requested_locale&.presence_in(LOCALES)&.to_sym
|
|
818
|
+
locale ||= ::Current.locale if defined?(::Current)
|
|
819
|
+
locale ||= ::I18n.locale
|
|
820
|
+
locale = ::I18n.locale unless ::I18n.available_locales.include?(locale.to_sym)
|
|
819
821
|
|
|
820
822
|
format = code_format.raw || :default
|
|
821
|
-
format = format.to_sym if I18n.exists?("time.formats.#{format}", locale)
|
|
823
|
+
format = format.to_sym if ::I18n.exists?("time.formats.#{format}", locale)
|
|
822
824
|
|
|
823
|
-
String.new(I18n.l(raw, format: format, locale: locale))
|
|
825
|
+
String.new(::I18n.l(raw, format: format, locale: locale))
|
|
824
826
|
end
|
|
825
827
|
|
|
826
828
|
def code_today
|