web47core 1.1.7 → 1.1.8
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/lib/app/models/concerns/time_zone_able.rb +9 -2
- data/lib/web47core/version.rb +1 -1
- 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: 975f1a3a3b37ab6603436cd3e763d591dde1b13cc7ae378897b16e43210dc580
|
|
4
|
+
data.tar.gz: 82d9918130d0dcf59280dc2d09aebcb587fdeeffdd554eb24f30098b0e3b1f6f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9865843ea3e57714c08dcd6febe17e728a40d5ac3c99e0b0a9ee8741c848456f3a9b862fdce2aa032d915d882cee97e7c75d5a91e3e3e4d6cc5be47d04679107
|
|
7
|
+
data.tar.gz: e1fa706d97fddb0ef31f32d4c7076be811031e0ce2564fc287f1ff4caa01258ae6d184667866b869fedd58d4f2d4e216787cc2c18f4f3d908d8ef1f447e288dc
|
|
@@ -31,8 +31,15 @@ module TimeZoneAble
|
|
|
31
31
|
# Return the given time in the localized time for this object
|
|
32
32
|
#
|
|
33
33
|
def local_date(date, format = :medium, default = 'N/A')
|
|
34
|
-
|
|
35
|
-
|
|
34
|
+
case date
|
|
35
|
+
when Time
|
|
36
|
+
tz = TZInfo::Timezone.get(time_zone.presence || SystemConfiguration.default_time_zone)
|
|
37
|
+
date.present? ? I18n.l(date.in_time_zone(tz).to_date, format: format) : default
|
|
38
|
+
when Date
|
|
39
|
+
I18n.l(date, format: format)
|
|
40
|
+
else
|
|
41
|
+
default
|
|
42
|
+
end
|
|
36
43
|
rescue StandardError
|
|
37
44
|
default
|
|
38
45
|
end
|
data/lib/web47core/version.rb
CHANGED