From f29aa17f1b4e87ab5c5df0a04dff39a61322425d Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Fri, 30 Oct 2015 08:56:19 +0000 Subject: [PATCH] Fixed that #l_hours_short shows 2 h (#21069). git-svn-id: http://svn.redmine.org/redmine/trunk@14766 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/i18n.rb | 2 +- test/unit/lib/redmine/i18n_test.rb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/redmine/i18n.rb b/lib/redmine/i18n.rb index e88e407b9..9523f2313 100644 --- a/lib/redmine/i18n.rb +++ b/lib/redmine/i18n.rb @@ -49,7 +49,7 @@ module Redmine end def l_hours_short(hours) - l(:label_f_hour_short, :value => ("%.2f h" % hours.to_f)) + l(:label_f_hour_short, :value => ("%.2f" % hours.to_f)) end def ll(lang, str, arg=nil) diff --git a/test/unit/lib/redmine/i18n_test.rb b/test/unit/lib/redmine/i18n_test.rb index 67823977d..4e3d8fcb7 100644 --- a/test/unit/lib/redmine/i18n_test.rb +++ b/test/unit/lib/redmine/i18n_test.rb @@ -154,6 +154,11 @@ class Redmine::I18nTest < ActiveSupport::TestCase end end + def test_l_hours_short + set_language_if_valid 'en' + assert_equal '2.00 h', l_hours_short(2.0) + end + def test_number_to_currency_default set_language_if_valid 'bs' assert_equal "KM -1000,20", number_to_currency(-1000.2) -- 2.39.5