Support localized decimal separators for float values (#22024).

Patch by Liane Hampe (@liane_hampe).


git-svn-id: https://svn.redmine.org/redmine/trunk@22592 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 14 insertions, 1 deletions

diff --git a/lib/redmine/field_format.rb b/lib/redmine/field_format.rb
index a27311141..5e81055f1 100644
--- a/lib/redmine/field_format.rb
+++ b/lib/redmine/field_format.rb
@@ -539,8 +539,9 @@ module Redmine
       end
 
       def validate_single_value(custom_field, value, customized=nil)
+        value = normalize_float(value)
         errs = super
-        errs << ::I18n.t('activerecord.errors.messages.invalid') unless (Kernel.Float(value) rescue nil)
+        errs << ::I18n.t('activerecord.errors.messages.invalid') unless Kernel.Float(value, exception: false)
         errs
       end
 
diff --git a/lib/redmine/i18n.rb b/lib/redmine/i18n.rb
index 8434cd9be..dab486893 100644
--- a/lib/redmine/i18n.rb
+++ b/lib/redmine/i18n.rb
@@ -99,6 +99,18 @@ module Redmine
       end
     end
 
+    # Will consider language specific separator in user input
+    # and normalize them to a unified format to be accepted by Kernel.Float().
+    #
+    # @param value [String] A string represenation of a float value.
+    #
+    # @note The delimiter cannot be used here if it is a decimal point since it
+    #       will clash with the dot separator.
+    def normalize_float(value)
+      separator = ::I18n.t('number.format.separator')
+      value.gsub(/[#{separator}]/, separator => '.')
+    end
+
     def day_name(day)
       ::I18n.t('date.day_names')[day % 7]
     end