Decompose I18n::Backend::Base#localize

ruby-i18n · Nov 7, 2016 · 8ac0252 · 8ac0252
1 parent 4b3725d
commit 8ac0252
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/lib/i18n/backend/base.rb b/lib/i18n/backend/base.rb
@@ -59,18 +59,7 @@ def localize(locale, object, format = :default, options = {})
           format  = I18n.t(:"#{type}.formats.#{key}", options)
         end
 
-        # format = resolve(locale, object, format, options)
-        format = format.to_s.gsub(/%[aAbBpP]/) do |match|
-          case match
-          when '%a' then I18n.t(:"date.abbr_day_names",                  :locale => locale, :format => format)[object.wday]
-          when '%A' then I18n.t(:"date.day_names",                       :locale => locale, :format => format)[object.wday]
-          when '%b' then I18n.t(:"date.abbr_month_names",                :locale => locale, :format => format)[object.mon]
-          when '%B' then I18n.t(:"date.month_names",                     :locale => locale, :format => format)[object.mon]
-          when '%p' then I18n.t(:"time.#{object.hour < 12 ? :am : :pm}", :locale => locale, :format => format).upcase if object.respond_to? :hour
-          when '%P' then I18n.t(:"time.#{object.hour < 12 ? :am : :pm}", :locale => locale, :format => format).downcase if object.respond_to? :hour
-          end
-        end
-
+        format = translate_format(format)
         object.strftime(format)
       end
 
@@ -184,6 +173,19 @@ def load_yml(filename)
             raise InvalidLocaleData.new(filename, e.inspect)
           end
         end
+
+        def translate_format(format)
+          format.to_s.gsub(/%[aAbBpP]/) do |match|
+            case match
+            when '%a' then I18n.t(:"date.abbr_day_names",                  :locale => locale, :format => format)[object.wday]
+            when '%A' then I18n.t(:"date.day_names",                       :locale => locale, :format => format)[object.wday]
+            when '%b' then I18n.t(:"date.abbr_month_names",                :locale => locale, :format => format)[object.mon]
+            when '%B' then I18n.t(:"date.month_names",                     :locale => locale, :format => format)[object.mon]
+            when '%p' then I18n.t(:"time.#{object.hour < 12 ? :am : :pm}", :locale => locale, :format => format).upcase if object.respond_to? :hour
+            when '%P' then I18n.t(:"time.#{object.hour < 12 ? :am : :pm}", :locale => locale, :format => format).downcase if object.respond_to? :hour
+            end
+          end
+        end
     end
   end
 end