Skip to content

Commit

Permalink
Merge pull request NecronomiconCoding#1330 from xKryptus/master
Browse files Browse the repository at this point in the history
Title number comma formatting
  • Loading branch information
NecronomiconCoding authored Jul 29, 2016
2 parents 342c78f + b1e87b0 commit 2856ff9
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions PoGo.NecroBot.Logic/Common/Translations.cs
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ public enum TranslationString

public class Translation : ITranslation
{
[JsonProperty("TranslationStrings",
ItemTypeNameHandling = TypeNameHandling.Arrays,
[JsonProperty("TranslationStrings",
ItemTypeNameHandling = TypeNameHandling.Arrays,
ItemConverterType = typeof(KeyValuePairConverter),
ObjectCreationHandling = ObjectCreationHandling.Replace,
DefaultValueHandling = DefaultValueHandling.Populate)]
Expand Down Expand Up @@ -230,8 +230,8 @@ public class Translation : ITranslation
new KeyValuePair<TranslationString, string>(Common.TranslationString.CatchTypeLure, "Lure"),
new KeyValuePair<TranslationString, string>(Common.TranslationString.CatchTypeIncense, "Incense"),
new KeyValuePair<TranslationString, string>(Common.TranslationString.WebSocketFailStart, "Failed to start WebSocketServer on port : {0}"),
new KeyValuePair<TranslationString, string>(Common.TranslationString.StatsTemplateString, "{0} - Runtime {1} - Lvl: {2} | EXP/H: {3:0} | P/H: {4:0} | Stardust: {5:0} | Transfered: {6:0} | Recycled: {7:0}"),
new KeyValuePair<TranslationString, string>(Common.TranslationString.StatsXpTemplateString, "{0} (next level in {1}h {2}m | {3}/{4} XP)"),
new KeyValuePair<TranslationString, string>(Common.TranslationString.StatsTemplateString, "{0} - Runtime {1} - Lvl: {2} | EXP/H: {3:n0} | P/H: {4:n0} | Stardust: {5:n0} | Transfered: {6:n0} | Recycled: {7:n0}"),
new KeyValuePair<TranslationString, string>(Common.TranslationString.StatsXpTemplateString, "{0} (Advance in {1}h {2}m | {3:n0}/{4:n0} XP)"),
new KeyValuePair<TranslationString, string>(Common.TranslationString.RequireInputText, "Program will continue after the key press..."),
new KeyValuePair<TranslationString, string>(Common.TranslationString.GoogleTwoFactorAuth, "As you have Google Two Factor Auth enabled, you will need to insert an App Specific Password into the auth.json"),
new KeyValuePair<TranslationString, string>(Common.TranslationString.GoogleTwoFactorAuthExplanation, "Opening Google App-Passwords. Please make a new App Password (use Other as Device)"),
Expand Down Expand Up @@ -267,7 +267,7 @@ public static Translation Load(ILogicSettings logicSettings)
var input = File.ReadAllText(fullPath);

var jsonSettings = new JsonSerializerSettings();
jsonSettings.Converters.Add(new StringEnumConverter {CamelCaseText = true});
jsonSettings.Converters.Add(new StringEnumConverter { CamelCaseText = true });
jsonSettings.ObjectCreationHandling = ObjectCreationHandling.Replace;
jsonSettings.DefaultValueHandling = DefaultValueHandling.Populate;
translations = JsonConvert.DeserializeObject<Translation>(input, jsonSettings);
Expand All @@ -287,7 +287,7 @@ public static Translation Load(ILogicSettings logicSettings)
public void Save(string fullPath)
{
var output = JsonConvert.SerializeObject(this, Formatting.Indented,
new StringEnumConverter {CamelCaseText = true});
new StringEnumConverter { CamelCaseText = true });

var folder = Path.GetDirectoryName(fullPath);
if (folder != null && !Directory.Exists(folder))
Expand Down

0 comments on commit 2856ff9

Please sign in to comment.