Merge branch 'master' of https://github.com/MultinetInteractive/MN.L10n

Chris Gårdenberg · Chris Gårdenberg · commit ad1271dacc28 · 2017-09-13T10:37:43.000+02:00
diff --git a/MN.L10n/L10n.cs b/MN.L10n/L10n.cs
@@ -147,7 +147,7 @@ public static string FormatNamed(string formatString, object args = null)
 			var tmpVal = formatString;
 			foreach (var p in t.GetProperties())
 			{
-				tmpVal = tmpVal.Replace("$" + p.Name + "$", p.GetValue(args).ToString());
+				tmpVal = tmpVal.Replace("$" + p.Name + "$", p.GetValue(args)?.ToString());
 			}
 
 			return tmpVal;

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public static string FormatNamed(string formatString, object args = null)`
`147`	`147`	`var tmpVal = formatString;`
`148`	`148`	`foreach (var p in t.GetProperties())`
`149`	`149`	`{`
`150`		`- tmpVal = tmpVal.Replace("$" + p.Name + "$", p.GetValue(args).ToString());`
	`150`	`+ tmpVal = tmpVal.Replace("$" + p.Name + "$", p.GetValue(args)?.ToString());`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`return tmpVal;`