mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #18462 from dmasur/patch-1
Removing :en in favor of default locale for duration#inspect
This commit is contained in:
commit
0fee2d4085
2 changed files with 10 additions and 1 deletions
|
@ -91,7 +91,7 @@ module ActiveSupport
|
|||
reduce(::Hash.new(0)) { |h,(l,r)| h[l] += r; h }.
|
||||
sort_by {|unit, _ | [:years, :months, :days, :minutes, :seconds].index(unit)}.
|
||||
map {|unit, val| "#{val} #{val == 1 ? unit.to_s.chop : unit.to_s}"}.
|
||||
to_sentence(:locale => :en)
|
||||
to_sentence(locale: ::I18n.default_locale)
|
||||
end
|
||||
|
||||
def as_json(options = nil) #:nodoc:
|
||||
|
|
|
@ -70,6 +70,15 @@ class DurationTest < ActiveSupport::TestCase
|
|||
assert_equal '14 days', 1.fortnight.inspect
|
||||
end
|
||||
|
||||
def test_inspect_locale
|
||||
current_locale = I18n.default_locale
|
||||
I18n.default_locale = :de
|
||||
I18n.backend.store_translations(:de, { support: { array: { last_word_connector: ' und ' } } })
|
||||
assert_equal '10 years, 1 month und 1 day', (10.years + 1.month + 1.day).inspect
|
||||
ensure
|
||||
I18n.default_locale = current_locale
|
||||
end
|
||||
|
||||
def test_minus_with_duration_does_not_break_subtraction_of_date_from_date
|
||||
assert_nothing_raised { Date.today - Date.today }
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue