culture info taken into account when parsing decimal | #10

Samyeak · Samyeak · commit 1714c0548d80 · 2024-01-03T10:20:41.000+05:45
diff --git a/NumericWordsConversion.sln b/NumericWordsConversion.sln
@@ -1,24 +1,20 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29509.3
+# Visual Studio Version 17
+VisualStudioVersion = 17.8.34330.188
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NumericWordsConversion", "NumericWordsConversion\NumericWordsConversion.csproj", "{85861DC0-DE30-4D37-9C07-FAFE66409A47}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests", "UnitTests\UnitTests.csproj", "{06BB2AD6-C600-4221-8E21-2EBDDFECF31B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleTest", "ConsoleTest\ConsoleTest.csproj", "{1CD938FE-2CE9-483F-A4BB-9E099BA7D76F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NumericWordsConversion", "NumericWordsConversion\NumericWordsConversion.csproj", "{457F6EE6-B519-4B02-A17A-B58AE34D8CD2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{85861DC0-DE30-4D37-9C07-FAFE66409A47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85861DC0-DE30-4D37-9C07-FAFE66409A47}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85861DC0-DE30-4D37-9C07-FAFE66409A47}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85861DC0-DE30-4D37-9C07-FAFE66409A47}.Release|Any CPU.Build.0 = Release|Any CPU
 		{06BB2AD6-C600-4221-8E21-2EBDDFECF31B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{06BB2AD6-C600-4221-8E21-2EBDDFECF31B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{06BB2AD6-C600-4221-8E21-2EBDDFECF31B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -27,6 +23,10 @@ Global
 		{1CD938FE-2CE9-483F-A4BB-9E099BA7D76F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1CD938FE-2CE9-483F-A4BB-9E099BA7D76F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1CD938FE-2CE9-483F-A4BB-9E099BA7D76F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{457F6EE6-B519-4B02-A17A-B58AE34D8CD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{457F6EE6-B519-4B02-A17A-B58AE34D8CD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{457F6EE6-B519-4B02-A17A-B58AE34D8CD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{457F6EE6-B519-4B02-A17A-B58AE34D8CD2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/NumericWordsConversion/ConversionFactory.cs b/NumericWordsConversion/ConversionFactory.cs
@@ -83,7 +83,7 @@ internal string ConvertDigits(string digits)
             if (_options.Culture == Culture.International)
                 scaleMapIndex = (int)Math.Ceiling((decimal)digits.Length / 3);
             else
-                scaleMapIndex = (digits.Length - 3) < 1 ? 1 : digits.Length / 2;
+                scaleMapIndex = digits.Length - 3 < 1 ? 1 : digits.Length / 2;
             for (int i = scaleMapIndex; i > 0; i--)
             {
                 string inWords;
@@ -97,14 +97,14 @@ internal string ConvertDigits(string digits)
                     default: //For Everything Greater than hundreds
                         if (_options.Culture == Culture.International)
                         {
-                            int length = (digits.Length % ((i - 1) * 3 + 1)) + 1;
+                            int length = digits.Length % ((i - 1) * 3 + 1) + 1;
                             string hundreds = digits.Substring(0, length);
                             digits = digits.Remove(0, length);
                             inWords = ToHundredthWords(hundreds);
                         }
                         else
                         {
-                            int length = (digits.Length % 2 == 0) ? 1 : 2;
+                            int length = digits.Length % 2 == 0 ? 1 : 2;
                             string hundreds = digits.Substring(0, length);
                             digits = digits.Remove(0, length);
                             inWords = ToTensWord(hundreds);
diff --git a/NumericWordsConversion/Culture.cs b/NumericWordsConversion/Culture.cs
@@ -5,17 +5,17 @@
     /// </summary>
     public enum Culture
     {
-    /// <summary>
-    /// Uses the International Numeral System for Words Conversion
-    /// </summary>
+        /// <summary>
+        /// Uses the International Numeral System for Words Conversion
+        /// </summary>
         International,
-    /// <summary>
-    /// Uses the Nepalese Numeral System for Words Conversion
-    /// </summary>
+        /// <summary>
+        /// Uses the Nepalese Numeral System for Words Conversion
+        /// </summary>
         Nepali,
-    /// <summary>
-    /// Uses the Hindi Numeral System for Words Conversion
-    /// </summary>
+        /// <summary>
+        /// Uses the Hindi Numeral System for Words Conversion
+        /// </summary>
         Hindi
     }
 }
diff --git a/NumericWordsConversion/CurrencyWordsConverter.cs b/NumericWordsConversion/CurrencyWordsConverter.cs
@@ -16,7 +16,7 @@ public class CurrencyWordsConverter
         /// </summary>
         public CurrencyWordsConverter()
         {
-            this._options = GlobalOptions.CurrencyWordsOptions;
+            _options = GlobalOptions.CurrencyWordsOptions;
             _conversionFactory = Utilities.InitializeConversionFactory(_options);
         }
 
@@ -25,7 +25,7 @@ public CurrencyWordsConverter()
         /// </summary>
         public CurrencyWordsConverter(CurrencyWordsConversionOptions options)
         {
-            this._options = options;
+            _options = options;
             _conversionFactory = Utilities.InitializeConversionFactory(_options);
         }
         #endregion
@@ -47,18 +47,18 @@ public string ToWords(decimal number)
                                                     CultureInfo.InvariantCulture)
                                                 .Split('.')
                                                 .ElementAtOrDefault(1) ?? Empty;
-            if (decimal.Parse(integralDigitsString) <= 0 && decimal.Parse(fractionalDigitsString) <= 0) return Empty;
+            if (decimal.Parse(integralDigitsString, CultureInfo.InvariantCulture) <= 0 && decimal.Parse(fractionalDigitsString, CultureInfo.InvariantCulture) <= 0) return Empty;
 
             string integralWords = Empty;
-            if (decimal.Parse(integralDigitsString) > 0)
+            if (decimal.Parse(integralDigitsString, CultureInfo.InvariantCulture) > 0)
             {
                 integralWords = _conversionFactory.ConvertDigits(integralDigitsString);
                 integralWords = _options.CurrencyNotationType == NotationType.Prefix
                     ? _options.CurrencyUnit + " " + integralWords
                     : integralWords + " " + _options.CurrencyUnit;
             }
 
-            if (int.Parse(fractionalDigitsString) <= 0 || IsNullOrEmpty(fractionalDigitsString)) return Concat(integralWords, (IsNullOrEmpty(_options.EndOfWordsMarker) ? "" : " " + _options.EndOfWordsMarker)).CapitalizeFirstLetter();
+            if (int.Parse(fractionalDigitsString) <= 0 || IsNullOrEmpty(fractionalDigitsString)) return Concat(integralWords, IsNullOrEmpty(_options.EndOfWordsMarker) ? "" : " " + _options.EndOfWordsMarker).CapitalizeFirstLetter();
 
             string fractionalWords = _conversionFactory.ConvertDigits(fractionalDigitsString);
             fractionalWords = _options.SubCurrencyNotationType == NotationType.Prefix
diff --git a/NumericWordsConversion/NumericWordsConfiguration.cs b/NumericWordsConversion/NumericWordsConfiguration.cs
@@ -34,7 +34,7 @@ public static class GlobalOptions
         public static NumericWordsConverter NumericWordsConverter { get; internal set; } = new NumericWordsConverter(NumericWordsOptions);
 
         public static CurrencyWordsConverter CurrencyWordsConverter { get; internal set; } = new CurrencyWordsConverter(CurrencyWordsOptions);
-}
+    }
 
     public class OptionsInitializer
     {
diff --git a/NumericWordsConversion/NumericWordsConversion.csproj b/NumericWordsConversion/NumericWordsConversion.csproj
@@ -1,35 +1,14 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Authors>Samyeak Maharjan</Authors>
-    <Description>Numeric Words Conversion is a C# library for converting numeric into words. The goal is to create a simple customizable library which can easily be used to convert any numbers or currencies to words. Supports Nepali, Hindi and International Numeral System out of the box.</Description>
-    <Copyright>Samyeak Maharjan</Copyright>
-    <NeutralLanguage>en</NeutralLanguage>
-    <Version>2.0.0.0</Version>
-    <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <PackageProjectUrl>https://github.com/Samyeak/NumericWordsConversion.git</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/Samyeak/NumericWordsConversion.git</RepositoryUrl>
-    <RepositoryType>github</RepositoryType>
-    <PackageTags>NumberToText;Numeric; NumericToWords; CurrencyToWords; InWords; Currency In Words; Number In Words; ToWords; AmountToWords; Nepali; Devnagari; Unicode; DecimalToWords; Nepali Number To Words; Amount To Words; Hindi Number To Words; Hindi Currency To Text</PackageTags>
-    <PackageReleaseNotes>* Added Application Level Configuration
-* Added Hindi Numeral System</PackageReleaseNotes>
-    <SignAssembly>false</SignAssembly>
-    <DelaySign>false</DelaySign>
-    <AssemblyOriginatorKeyFile>NumericWordsConversionSignatureKey.snk</AssemblyOriginatorKeyFile>
-    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageIconUrl>https://repository-images.githubusercontent.com/233162696/d06bb100-4545-11ea-8853-f816e055791a</PackageIconUrl>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <Optimize>true</Optimize>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\LICENSE">
-      <Pack>True</Pack>
+    <None Include="..\LICENSE" Link="LICENSE">
       <PackagePath></PackagePath>
+      <Pack>True</Pack>
     </None>
   </ItemGroup>
 
diff --git a/NumericWordsConversion/NumericWordsConversionOptions.cs b/NumericWordsConversion/NumericWordsConversionOptions.cs
@@ -56,6 +56,6 @@ public string DecimalSeparator
         /// In order to use generic algorithm for all the numeral system,
         /// this is used to map suitable resources as per different numeral system
         /// </summary>
-        internal int ResourceLimitIndex => this.OutputFormat == OutputFormat.English ? 20 : 100;
+        internal int ResourceLimitIndex => OutputFormat == OutputFormat.English ? 20 : 100;
     }
 }
diff --git a/NumericWordsConversion/NumericWordsConverter.cs b/NumericWordsConversion/NumericWordsConverter.cs
@@ -22,7 +22,7 @@ public class NumericWordsConverter
         /// </summary>
         public NumericWordsConverter()
         {
-            this._options = GlobalOptions.NumericWordsOptions;
+            _options = GlobalOptions.NumericWordsOptions;
             _conversionFactory = Utilities.InitializeConversionFactory(_options);
         }
 
@@ -31,7 +31,7 @@ public NumericWordsConverter()
         /// </summary>
         public NumericWordsConverter(NumericWordsConversionOptions options)
         {
-            this._options = options;
+            _options = options;
             _conversionFactory = Utilities.InitializeConversionFactory(_options);
         }
         #endregion
@@ -45,13 +45,12 @@ public string ToWords(decimal number)
         {
             string integralDigitsString = number
                 .ToString(CultureInfo.InvariantCulture)
-                .Split('.')
-                .ElementAt(0);
+                .Split('.')[0];
 
             decimal fractionalDigits = number % 1;
 
             string integralWords = _conversionFactory.ConvertDigits(integralDigitsString);
-            string fractionalDigitsString = (_options.DecimalPlaces > -1 ? decimal.Parse(fractionalDigits.ToString($"F{_options.DecimalPlaces}", CultureInfo.InvariantCulture))
+            string fractionalDigitsString = (_options.DecimalPlaces > -1 ? decimal.Parse(fractionalDigits.ToString($"F{_options.DecimalPlaces}", CultureInfo.InvariantCulture), CultureInfo.InvariantCulture)
                 .ToString($"G{_options.DecimalPlaces}", CultureInfo.InvariantCulture)
                 : fractionalDigits.ToString("G", CultureInfo.InvariantCulture)
                 )

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public class CurrencyWordsConverter`
`16`	`16`	`/// </summary>`
`17`	`17`	`public CurrencyWordsConverter()`
`18`	`18`	`{`
`19`		`- this._options = GlobalOptions.CurrencyWordsOptions;`
	`19`	`+ _options = GlobalOptions.CurrencyWordsOptions;`
`20`	`20`	`_conversionFactory = Utilities.InitializeConversionFactory(_options);`
`21`	`21`	`}`
`22`	`22`
`@@ -25,7 +25,7 @@ public CurrencyWordsConverter()`
`25`	`25`	`/// </summary>`
`26`	`26`	`public CurrencyWordsConverter(CurrencyWordsConversionOptions options)`
`27`	`27`	`{`
`28`		`- this._options = options;`
	`28`	`+ _options = options;`
`29`	`29`	`_conversionFactory = Utilities.InitializeConversionFactory(_options);`
`30`	`30`	`}`
`31`	`31`	`#endregion`
`@@ -47,18 +47,18 @@ public string ToWords(decimal number)`
`47`	`47`	`CultureInfo.InvariantCulture)`
`48`	`48`	`.Split('.')`
`49`	`49`	`.ElementAtOrDefault(1) ?? Empty;`
`50`		`- if (decimal.Parse(integralDigitsString) <= 0 && decimal.Parse(fractionalDigitsString) <= 0) return Empty;`
	`50`	`+ if (decimal.Parse(integralDigitsString, CultureInfo.InvariantCulture) <= 0 && decimal.Parse(fractionalDigitsString, CultureInfo.InvariantCulture) <= 0) return Empty;`
`51`	`51`
`52`	`52`	`string integralWords = Empty;`
`53`		`- if (decimal.Parse(integralDigitsString) > 0)`
	`53`	`+ if (decimal.Parse(integralDigitsString, CultureInfo.InvariantCulture) > 0)`
`54`	`54`	`{`
`55`	`55`	`integralWords = _conversionFactory.ConvertDigits(integralDigitsString);`
`56`	`56`	`integralWords = _options.CurrencyNotationType == NotationType.Prefix`
`57`	`57`	`? _options.CurrencyUnit + " " + integralWords`
`58`	`58`	`: integralWords + " " + _options.CurrencyUnit;`
`59`	`59`	`}`
`60`	`60`
`61`		`- if (int.Parse(fractionalDigitsString) <= 0 \|\| IsNullOrEmpty(fractionalDigitsString)) return Concat(integralWords, (IsNullOrEmpty(_options.EndOfWordsMarker) ? "" : " " + _options.EndOfWordsMarker)).CapitalizeFirstLetter();`
	`61`	`+ if (int.Parse(fractionalDigitsString) <= 0 \|\| IsNullOrEmpty(fractionalDigitsString)) return Concat(integralWords, IsNullOrEmpty(_options.EndOfWordsMarker) ? "" : " " + _options.EndOfWordsMarker).CapitalizeFirstLetter();`
`62`	`62`
`63`	`63`	`string fractionalWords = _conversionFactory.ConvertDigits(fractionalDigitsString);`
`64`	`64`	`fractionalWords = _options.SubCurrencyNotationType == NotationType.Prefix`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public static class GlobalOptions`
`34`	`34`	`public static NumericWordsConverter NumericWordsConverter { get; internal set; } = new NumericWordsConverter(NumericWordsOptions);`
`35`	`35`
`36`	`36`	`public static CurrencyWordsConverter CurrencyWordsConverter { get; internal set; } = new CurrencyWordsConverter(CurrencyWordsOptions);`
`37`		`-}`
	`37`	`+ }`
`38`	`38`
`39`	`39`	`public class OptionsInitializer`
`40`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,6 @@ public string DecimalSeparator`
`56`	`56`	`/// In order to use generic algorithm for all the numeral system,`
`57`	`57`	`/// this is used to map suitable resources as per different numeral system`
`58`	`58`	`/// </summary>`
`59`		`- internal int ResourceLimitIndex => this.OutputFormat == OutputFormat.English ? 20 : 100;`
	`59`	`+ internal int ResourceLimitIndex => OutputFormat == OutputFormat.English ? 20 : 100;`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public class NumericWordsConverter`
`22`	`22`	`/// </summary>`
`23`	`23`	`public NumericWordsConverter()`
`24`	`24`	`{`
`25`		`- this._options = GlobalOptions.NumericWordsOptions;`
	`25`	`+ _options = GlobalOptions.NumericWordsOptions;`
`26`	`26`	`_conversionFactory = Utilities.InitializeConversionFactory(_options);`
`27`	`27`	`}`
`28`	`28`
`@@ -31,7 +31,7 @@ public NumericWordsConverter()`
`31`	`31`	`/// </summary>`
`32`	`32`	`public NumericWordsConverter(NumericWordsConversionOptions options)`
`33`	`33`	`{`
`34`		`- this._options = options;`
	`34`	`+ _options = options;`
`35`	`35`	`_conversionFactory = Utilities.InitializeConversionFactory(_options);`
`36`	`36`	`}`
`37`	`37`	`#endregion`
`@@ -45,13 +45,12 @@ public string ToWords(decimal number)`
`45`	`45`	`{`
`46`	`46`	`string integralDigitsString = number`
`47`	`47`	`.ToString(CultureInfo.InvariantCulture)`
`48`		`- .Split('.')`
`49`		`- .ElementAt(0);`
	`48`	`+ .Split('.')[0];`
`50`	`49`
`51`	`50`	`decimal fractionalDigits = number % 1;`
`52`	`51`
`53`	`52`	`string integralWords = _conversionFactory.ConvertDigits(integralDigitsString);`
`54`		`- string fractionalDigitsString = (_options.DecimalPlaces > -1 ? decimal.Parse(fractionalDigits.ToString($"F{_options.DecimalPlaces}", CultureInfo.InvariantCulture))`
	`53`	`+ string fractionalDigitsString = (_options.DecimalPlaces > -1 ? decimal.Parse(fractionalDigits.ToString($"F{_options.DecimalPlaces}", CultureInfo.InvariantCulture), CultureInfo.InvariantCulture)`
`55`	`54`	`.ToString($"G{_options.DecimalPlaces}", CultureInfo.InvariantCulture)`
`56`	`55`	`: fractionalDigits.ToString("G", CultureInfo.InvariantCulture)`
`57`	`56`	`)`