Skip to content

Commit 8bb7749

Browse files
authored
Merge pull request #399 from fatkodima/fix-t-with-false
Fix translate with default: [false]
2 parents 6dc0102 + 1365d49 commit 8bb7749

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

lib/i18n/backend/base.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ def default(locale, object, subject, options = {})
103103
case subject
104104
when Array
105105
subject.each do |item|
106-
result = resolve(locale, object, item, options) and return result
106+
result = resolve(locale, object, item, options)
107+
return result unless result.nil?
107108
end and nil
108109
else
109110
resolve(locale, object, subject, options)

lib/i18n/tests/defaults.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ def setup
2424
assert_equal 'bar', I18n.t(:does_not_exist, :default => [:does_not_exist_2, :'foo.bar'])
2525
end
2626

27+
test "defaults: given an array as a default with false it returns false" do
28+
assert_equal false, I18n.t(:does_not_exist, :default => [false])
29+
end
30+
2731
test "defaults: given false it returns false" do
2832
assert_equal false, I18n.t(:does_not_exist, :default => false)
2933
end

0 commit comments

Comments
 (0)