use current locale if available

Author: dorianmariecom

lib/code/object/date.rb

@@ -705,13 +705,15 @@ def code_format(format, locale: nil)
         code_locale = locale.to_code
 
         requested_locale = code_locale.raw&.to_s
-        locale = requested_locale&.presence_in(LOCALES)&.to_sym || I18n.locale
-        locale = I18n.locale unless I18n.available_locales.include?(locale.to_sym)
+        locale = requested_locale&.presence_in(LOCALES)&.to_sym
+        locale ||= ::Current.locale if defined?(::Current)
+        locale ||= ::I18n.locale
+        locale = ::I18n.locale unless ::I18n.available_locales.include?(locale.to_sym)
 
         format = code_format.raw || :default
-        format = format.to_sym if I18n.exists?("date.formats.#{format}", locale)
+        format = format.to_sym if ::I18n.exists?("date.formats.#{format}", locale)
 
-        String.new(I18n.l(raw, format: format, locale: locale))
+        String.new(::I18n.l(raw, format: format, locale: locale))
       end
 
       def code_format_locale_from_arguments(code_arguments)

lib/code/object/time.rb

@@ -814,13 +814,15 @@ def code_format(format, locale: nil)
         code_locale = locale.to_code
 
         requested_locale = code_locale.raw&.to_s
-        locale = requested_locale&.presence_in(LOCALES)&.to_sym || I18n.locale
-        locale = I18n.locale unless I18n.available_locales.include?(locale.to_sym)
+        locale = requested_locale&.presence_in(LOCALES)&.to_sym
+        locale ||= ::Current.locale if defined?(::Current)
+        locale ||= ::I18n.locale
+        locale = ::I18n.locale unless ::I18n.available_locales.include?(locale.to_sym)
 
         format = code_format.raw || :default
-        format = format.to_sym if I18n.exists?("time.formats.#{format}", locale)
+        format = format.to_sym if ::I18n.exists?("time.formats.#{format}", locale)
 
-        String.new(I18n.l(raw, format: format, locale: locale))
+        String.new(::I18n.l(raw, format: format, locale: locale))
       end
 
       def code_today