From d71f8b67d7767c9100f259f475df5203289819c4 Mon Sep 17 00:00:00 2001 From: Franco Leonardo Bulgarelli Date: Mon, 10 Apr 2023 18:38:05 -0300 Subject: [PATCH] Make translation work with i18n >= 1 --- gem/lib/mulang/expectation/i18n.rb | 4 ++-- gem/mulang.gemspec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gem/lib/mulang/expectation/i18n.rb b/gem/lib/mulang/expectation/i18n.rb index e695081dc..159120d1b 100644 --- a/gem/lib/mulang/expectation/i18n.rb +++ b/gem/lib/mulang/expectation/i18n.rb @@ -9,7 +9,7 @@ def translate(e, tokens = nil) def translate!(e, tokens = nil) e = e.as_v2 key = key_for e.binding, e.inspection - ::I18n.t key, translation_params(e, tokens) + ::I18n.t(key, **translation_params(e, tokens)) end alias t translate @@ -41,7 +41,7 @@ def t_target(parsed) end def t_matching(tokens, parsed) - ::I18n.t("mulang.expectation.#{parsed.matcher.type}", with_tokens(tokens, value: parsed.matcher.value)) if parsed.matcher + ::I18n.t("mulang.expectation.#{parsed.matcher.type}", **with_tokens(tokens, value: parsed.matcher.value)) if parsed.matcher end def with_tokens(tokens, params) diff --git a/gem/mulang.gemspec b/gem/mulang.gemspec index 753334600..b3bf817fc 100644 --- a/gem/mulang.gemspec +++ b/gem/mulang.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |spec| spec.add_dependency "mumukit-core", '~> 1.19' spec.add_development_dependency 'codeclimate-test-reporter' - spec.add_development_dependency "activesupport", "~> 6.0" + spec.add_development_dependency "activesupport", ">= 6.0" spec.add_development_dependency "rake", "~> 13.0" spec.add_development_dependency "rspec", "~> 3.0" spec.add_development_dependency "pry", "~> 3.0"