Locale fix

5andr0 · Jul 29, 2016 · 5e3b4c8 · 5e3b4c8 · romkazor · Jul 29, 2016
1 parent 41d01f4
commit 5e3b4c8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/PogoLocationFeeder/Config/Settings.cs b/PogoLocationFeeder/Config/Settings.cs
@@ -13,7 +13,7 @@ namespace PoGo.LocationFeeder.Settings
     public class GlobalSettings
     {
         //public ulong ServerId = 206065054846681088;
-        public List<string> ServerChannels = new List<string> { "snipers", "high_iv_pokemon", "rare_pokemon" };
+        public List<string> ServerChannels = new List<string> { "sniping", "high_iv_pokemon", "rare_pokemon" };
         public string DiscordToken = "";
         public int Port = 16969;
         public bool useToken = false;

diff --git a/PogoLocationFeeder/Helper/MessageParser.cs b/PogoLocationFeeder/Helper/MessageParser.cs
@@ -1,6 +1,7 @@
 using POGOProtos.Enums;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Text.RegularExpressions;
 
 namespace PogoLocationFeeder.Helper
@@ -33,21 +34,21 @@ public List<SniperInfo> parseMessage(string message)
 
         private bool parseGeoCoordinates(string input)
         {
-            Match match = Regex.Match(input, @"(?<lat>\-?\d+(\.\d+)+),\s*(?<long>\-?\d+(\.\d+)+)");
+            Match match = Regex.Match(input, @"(?<lat>\-?\d+[\,\.]\d+),\s*(?<long>\-?\d+[\,\.]\d+)");
             if (match.Success)
             {
-                sniperInfo.latitude = Convert.ToDouble(match.Groups["lat"].Value);
-                sniperInfo.longitude = Convert.ToDouble(match.Groups["long"].Value);
+                sniperInfo.latitude = Convert.ToDouble(match.Groups["lat"].Value.Replace(',', '.'), CultureInfo.InvariantCulture);
+                sniperInfo.longitude = Convert.ToDouble(match.Groups["long"].Value.Replace(',', '.'), CultureInfo.InvariantCulture);
             }
             return match.Success;
         }
 
         private void parseIV(string input)
         {
-            Match match = Regex.Match(input, @"(\d+\.?\d*)\%?\s?IV", RegexOptions.IgnoreCase);
+            Match match = Regex.Match(input, @"(\d+[\,\.]?\d*)\%?\s?IV", RegexOptions.IgnoreCase);
             if (match.Success)
             {
-                sniperInfo.iv = Convert.ToDouble(match.Groups[1].Value);
+                sniperInfo.iv = Convert.ToDouble(match.Groups[1].Value.Replace(',', '.'), CultureInfo.InvariantCulture);
             }
         }