]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
fixed formatting of floating point numbers during localization (#27441)
authorKrasnoshchekovPavel <119816022+KrasnoshchekovPavel@users.noreply.github.com>
Mon, 29 Apr 2024 04:52:35 +0000 (07:52 +0300)
committerGitHub <noreply@github.com>
Mon, 29 Apr 2024 04:52:35 +0000 (21:52 -0700)
Content.Shared/Localizations/ContentLocalizationManager.cs

index 3c311f43821ca18f3f7e196d27eb0057fdf52010..7d40182f6cc896fd142acdb81b321f63ec286c83 100644 (file)
@@ -69,7 +69,7 @@ namespace Content.Shared.Localizations
             var maxDecimals = (int)Math.Floor(((LocValueNumber) args.Args[1]).Value);
             var formatter = (NumberFormatInfo)NumberFormatInfo.GetInstance(CultureInfo.GetCultureInfo(Culture)).Clone();
             formatter.NumberDecimalDigits = maxDecimals;
-            return new LocValueString(string.Format(formatter, "{0:N}", number).TrimEnd('0').TrimEnd('.') + "%");
+            return new LocValueString(string.Format(formatter, "{0:N}", number).TrimEnd('0').TrimEnd(char.Parse(formatter.NumberDecimalSeparator)) + "%");
         }
 
         private ILocValue FormatNaturalFixed(LocArgs args)
@@ -78,7 +78,7 @@ namespace Content.Shared.Localizations
             var maxDecimals = (int)Math.Floor(((LocValueNumber) args.Args[1]).Value);
             var formatter = (NumberFormatInfo)NumberFormatInfo.GetInstance(CultureInfo.GetCultureInfo(Culture)).Clone();
             formatter.NumberDecimalDigits = maxDecimals;
-            return new LocValueString(string.Format(formatter, "{0:N}", number).TrimEnd('0').TrimEnd('.'));
+            return new LocValueString(string.Format(formatter, "{0:N}", number).TrimEnd('0').TrimEnd(char.Parse(formatter.NumberDecimalSeparator)));
         }
 
         private static readonly Regex PluralEsRule = new("^.*(s|sh|ch|x|z)$");