Merge pull request #1144 from ferrisoxide/fix-1102

Support for hash arguments in i18n. Fixes #1102

lib/fat_free_crm/i18n.rb

@@ -14,7 +14,7 @@ def t(*args)
       if args.size == 1
         super(args.first, default: args.first.to_s)
       elsif args.second.is_a?(Hash)
-        super(*args)
+        super(args.first, **args.second)
       elsif args.second.is_a?(Integer)
         super(args.first, count: args.second)
       else

spec/lib/fat_free_crm/i18n.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2008-2013 Michael Dvorkin and contributors.
+#
+# Fat Free CRM is freely distributable under the terms of MIT license.
+# See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
+#------------------------------------------------------------------------------
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe 'I18n.t()' do
+
+  class TestController < ActionController::Base
+    include FatFreeCRM::I18n
+  end
+
+  let(:entity_string) { 'entities' }
+  let(:hidden_count) { 10 }
+  let(:test_controller) { TestController.new }
+
+  it 'should translate hash arguments' do
+    expect(test_controller.t(:not_showing_hidden_entities, entity: entity_string, count: hidden_count))
+      .to eq("Not showing 10 hidden entities.")
+  end
+end