Merge pull request NecronomiconCoding#2016 from Oolaruu/patch-14

Fixed typos + French
schnapster · Aug 2, 2016 · 266b996 · 266b996
2 parents c33aaac + 10873bb
commit 266b996
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.fr.json b/PoGo.NecroBot.CLI/Config/Translations/translation.fr.json
@@ -30,7 +30,7 @@
     },
     {
       "Key": "eventFortUsed",
-      "Value": "{0} | {1}XP, Objets: {3} | {2}"
+      "Value": "{0} | {1}XP | {2} | Objets: {3} | Lat: {4}, Long: {5}"
     },
     {
       "Key": "eventFortFailed",
@@ -74,7 +74,7 @@
     },
     {
       "Key": "eventPokemonCapture",
-      "Value": "({0}) |{1}-{2} | Lv {3} {6}% {4}/{5} | {7}% Chance sur {8}m | {10} {9} restant, {11}"
+      "Value": "({0}) |{1}-{2}| Lv {3} {6}% {4}/{5} | {7}% dist {8}m | {10} {9} restant | {11} | lat: {12} long: {13}""
     },
     {
       "Key": "eventNoPokeballs",

diff --git a/PoGo.NecroBot.Logic/Inventory.cs b/PoGo.NecroBot.Logic/Inventory.cs
@@ -231,10 +231,10 @@ public async Task<int> GetTotalItemCount()
 
         public async Task<IEnumerable<ItemData>> GetItemsToRecycle(ISession session)
         {
-            var itemsToRecylce = new List<ItemData>();
+            var itemsToRecycle = new List<ItemData>();
             var myItems = (await GetItems()).ToList();
 
-            var otherItemsToRecylce = myItems
+            var otherItemsToRecycle = myItems
                 .Where(x => _logicSettings.ItemRecycleFilter.Any(f => f.Key == x.ItemId && x.Count > f.Value))
                 .Select(
                     x =>
@@ -245,9 +245,9 @@ public async Task<IEnumerable<ItemData>> GetItemsToRecycle(ISession session)
                             Unseen = x.Unseen
                         });
 
-            itemsToRecylce.AddRange(otherItemsToRecylce);
+            itemsToRecycle.AddRange(otherItemsToRecycle);
 
-            return itemsToRecylce;
+            return itemsToRecycle;
         }
 
         public double GetPerfect(PokemonData poke)
@@ -434,4 +434,4 @@ public async Task<UpgradePokemonResponse> UpgradePokemon(ulong pokemonid)
             return upgradeResult;
         }
     }
-}
+}
diff --git a/PoGo.NecroBot.Logic/Settings.cs b/PoGo.NecroBot.Logic/Settings.cs
@@ -242,7 +242,7 @@ public class GlobalSettings
         [DefaultValue(1000)]
         public int MaxTravelDistanceInMeters;
         [DefaultValue(120)]
-        public int TotalAmountOfPokebalsToKeep;
+        public int TotalAmountOfPokeballsToKeep;
         [DefaultValue(80)]
         public int TotalAmountOfPotionsToKeep;
         [DefaultValue(60)]
@@ -784,7 +784,7 @@ public LogicSettings(GlobalSettings settings)
         public bool SnipeIgnoreUnknownIv => _settings.SnipeIgnoreUnknownIv;
         public int MinDelayBetweenSnipes => _settings.MinDelayBetweenSnipes;
         public double SnipingScanOffset => _settings.SnipingScanOffset;
-        public int TotalAmountOfPokeballsToKeep => _settings.TotalAmountOfPokebalsToKeep;
+        public int TotalAmountOfPokeballsToKeep => _settings.TotalAmountOfPokeballsToKeep;
         public int TotalAmountOfPotionsToKeep => _settings.TotalAmountOfPotionsToKeep;
         public int TotalAmountOfRevivesToKeep => _settings.TotalAmountOfRevivesToKeep;
         public int TotalAmountOfBerriesToKeep => _settings.TotalAmountOfBerriesToKeep;