Merge pull request #521 from aminiz/master

Improve/decimal separator based on locale
3lvis · May 11, 2016 · 05a771b · 05a771b
2 parents 0f79829 + bf9694d
commit 05a771b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Source/Formatters/FORMFloatFormatter.m b/Source/Formatters/FORMFloatFormatter.m
@@ -6,7 +6,9 @@ - (NSString *)formatString:(NSString *)string reverse:(BOOL)reverse {
     string = [super formatString:string reverse:reverse];
     if (!string) return nil;
 
-    if (reverse) {
+    NSString *decimalSeparator = [[NSLocale currentLocale] objectForKey:NSLocaleDecimalSeparator];
+
+    if (reverse || [decimalSeparator isEqualToString:@"."]) {
         return [string stringByReplacingOccurrencesOfString:@"," withString:@"."];
     } else {
         return [string stringByReplacingOccurrencesOfString:@"." withString:@","];

diff --git a/Source/Input Validators/FORMFloatInputValidator.m b/Source/Input Validators/FORMFloatInputValidator.m
@@ -8,12 +8,14 @@ - (BOOL)validateReplacementString:(NSString *)string withText:(NSString *)text w
 
     if (!valid) return valid;
 
+    NSString *decimalSeparator = [[NSLocale currentLocale] objectForKey:NSLocaleDecimalSeparator];
+
     BOOL hasDelimiter = ([text hyp_containsString:@","] || [text hyp_containsString:@"."]);
-    BOOL stringIsNilOrComma = (!string || [string isEqualToString:@","]);
+    BOOL stringIsNilOrDecimalSeparator = (!string || [string isEqualToString:decimalSeparator]);
 
-    if (hasDelimiter && stringIsNilOrComma) return NO;
+    if (hasDelimiter && stringIsNilOrDecimalSeparator) return NO;
 
-    NSCharacterSet *floatSet = [NSCharacterSet characterSetWithCharactersInString:@"1234567890,"];
+    NSCharacterSet *floatSet = [NSCharacterSet characterSetWithCharactersInString: [NSString stringWithFormat:@"1234567890%@", decimalSeparator]];
     NSCharacterSet *stringSet = [NSCharacterSet characterSetWithCharactersInString:string];
 
     return [floatSet isSupersetOfSet:stringSet];