From 70811f900ec4a15107c6e6b5a66323b52b0f5ad8 Mon Sep 17 00:00:00 2001 From: Braulio Bhavamitra Date: Mon, 9 Mar 2015 19:28:53 -0300 Subject: [PATCH] dates_helper: don't use constant for translation --- app/helpers/dates_helper.rb | 10 ++++++---- test/unit/dates_helper_test.rb | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/helpers/dates_helper.rb b/app/helpers/dates_helper.rb index 337c147..1a9b246 100644 --- a/app/helpers/dates_helper.rb +++ b/app/helpers/dates_helper.rb @@ -2,13 +2,15 @@ require 'noosfero/i18n' module DatesHelper - MONTHS = I18n.t('date.month_names') + def months + I18n.t('date.month_names') + end def month_name(n, abbreviated = false) if abbreviated I18n.t('date.abbr_month_names')[n] else - MONTHS[n] + months[n] end end @@ -37,7 +39,7 @@ module DatesHelper end end - # formats a datetime for displaying. + # formats a datetime for displaying. def show_time(time) if time _('%{day} %{month} %{year}, %{hour}:%{minutes}') % { :year => time.year, :month => month_name(time.month), :day => time.day, :hour => time.hour, :minutes => time.strftime("%M") } @@ -138,7 +140,7 @@ module DatesHelper else order = [:day, :month, :year] end - date_select(object, method, html_options.merge(options.merge(:include_blank => true, :order => order, :use_month_names => MONTHS))) + date_select(object, method, html_options.merge(options.merge(:include_blank => true, :order => order, :use_month_names => months))) end end diff --git a/test/unit/dates_helper_test.rb b/test/unit/dates_helper_test.rb index 6d82f1b..eb56682 100644 --- a/test/unit/dates_helper_test.rb +++ b/test/unit/dates_helper_test.rb @@ -99,20 +99,20 @@ class DatesHelperTest < ActiveSupport::TestCase should 'provide an intertionalized date selector pass month names' do expects(:language).returns('en') - expects(:date_select).with(:object, :method, { :include_blank => true, :order => [:month, :day, :year], :use_month_names => MONTHS }).returns("KKKKKKKK") + expects(:date_select).with(:object, :method, { :include_blank => true, :order => [:month, :day, :year], :use_month_names => months }).returns("KKKKKKKK") assert_equal 'KKKKKKKK', pick_date(:object, :method) end should 'order date in english like month day year' do expects(:language).returns('en') - expects(:date_select).with(:object, :method, { :include_blank => true, :order => [:month, :day, :year], :use_month_names => MONTHS }).returns("KKKKKKKK") + expects(:date_select).with(:object, :method, { :include_blank => true, :order => [:month, :day, :year], :use_month_names => months }).returns("KKKKKKKK") assert_equal 'KKKKKKKK', pick_date(:object, :method) end should 'order date in other languages like day month year' do expects(:language).returns('pt_BR') - expects(:date_select).with(:object, :method, { :include_blank => true, :order => [:day, :month, :year], :use_month_names => MONTHS }).returns("KKKKKKKK") + expects(:date_select).with(:object, :method, { :include_blank => true, :order => [:day, :month, :year], :use_month_names => months }).returns("KKKKKKKK") assert_equal 'KKKKKKKK', pick_date(:object, :method) end -- libgit2 0.21.2