Replace EN-US Culture with invariant culture [#144]

Zeugma440 · May 22, 2022 · 227eddd · 227eddd
1 parent 2155950
commit 227eddd
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/ATL.test/IO/MetaData/AA.cs b/ATL.test/IO/MetaData/AA.cs
@@ -47,7 +47,7 @@ public void TagIO_R_AA_simple()
             new ConsoleLogger();
 
             string location = TestUtils.GetResourceLocationRoot() + notEmptyFile;
-            AudioDataManager theFile = new AudioDataManager(ATL.AudioData.AudioDataIOFactory.GetInstance().GetFromPath(location) );
+            AudioDataManager theFile = new AudioDataManager(AudioDataIOFactory.GetInstance().GetFromPath(location) );
 
             readExistingTagsOnFile(theFile, 1);
         }

diff --git a/ATL/AudioData/IO/AA.cs b/ATL/AudioData/IO/AA.cs
@@ -158,7 +158,7 @@ protected override bool isLittleEndian
         }
         public override string EncodeDate(DateTime date)
         {
-            return date.ToString("dd-MMM-yyyy", Utils.EnUsCulture).ToUpper();
+            return date.ToString("dd-MMM-yyyy", CultureInfo.InvariantCulture).ToUpper();
         }
 
         public long AudioDataOffset { get; set; }

diff --git a/ATL/AudioData/IO/VGM.cs b/ATL/AudioData/IO/VGM.cs
@@ -7,6 +7,7 @@
 using System.IO.Compression;
 using static ATL.ChannelsArrangements;
 using static ATL.TagData;
+using System.Globalization;
 
 namespace ATL.AudioData.IO
 {
@@ -103,7 +104,7 @@ public override string EncodeDate(DateTime date)
                 return date.Year.ToString();
             else
                 // According to GD3 spec for release date
-                return date.ToString("yyyy/MM/dd", Utils.EnUsCulture);
+                return date.ToString("yyyy/MM/dd", CultureInfo.InvariantCulture);
         }
 
 

diff --git a/ATL/Entities/MetadataHolder.cs b/ATL/Entities/MetadataHolder.cs
@@ -2,6 +2,7 @@
 using Commons;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Text;
 using static ATL.TagData;
 
@@ -166,8 +167,8 @@ public DateTime Date
                 tagData.IntegrateValue(Field.RECORDING_DATE, (value > DateTime.MinValue) ? TrackUtils.FormatISOTimestamp(value) : null);
                 tagData.IntegrateValue(Field.RECORDING_YEAR, (value > DateTime.MinValue) ? value.Year.ToString() : null);
                 tagData.IntegrateValue(Field.RECORDING_YEAR_OR_DATE, (value > DateTime.MinValue) ? value.ToShortDateString() : null);
-                tagData.IntegrateValue(Field.RECORDING_DAYMONTH, (value > DateTime.MinValue) ? value.ToString("ddMM", Utils.EnUsCulture) : null);
-                tagData.IntegrateValue(Field.RECORDING_TIME, (value > DateTime.MinValue) ? value.ToString("HHmm", Utils.EnUsCulture) : null);
+                tagData.IntegrateValue(Field.RECORDING_DAYMONTH, (value > DateTime.MinValue) ? value.ToString("ddMM", CultureInfo.InvariantCulture) : null);
+                tagData.IntegrateValue(Field.RECORDING_TIME, (value > DateTime.MinValue) ? value.ToString("HHmm", CultureInfo.InvariantCulture) : null);
             }
         }
         /// <inheritdoc/>

diff --git a/ATL/Utils/Utils.cs b/ATL/Utils/Utils.cs
@@ -1,6 +1,5 @@
 using ATL;
 using System;
-using System.Globalization;
 using System.Text;
 using System.Collections.Generic;
 using System.IO;
@@ -14,7 +13,7 @@ internal static class Utils
     {
         private static Encoding latin1Encoding = Encoding.GetEncoding("ISO-8859-1");
         private static IDictionary<string, Encoding> encodingCache = new Dictionary<string, Encoding>();
-        private static CultureInfo enUsCulture = CultureInfo.CreateSpecificCulture("en-US");
+
         /// <summary>
         /// 'ZERO WIDTH NO-BREAK SPACE' invisible character, sometimes used by certain tagging softwares
         /// Looks like a BOM unfortunately converted into an unicode character :/
@@ -32,11 +31,6 @@ internal static class Utils
         /// </summary>
         public static Encoding Latin1Encoding { get { return latin1Encoding; } }
 
-        /// <summary>
-        /// en-US culture
-        /// </summary>
-        public static CultureInfo EnUsCulture { get { return enUsCulture; } }
-
 
         /// <summary>
         /// Transform the given string so that is becomes non-null