Use thread CurrencySymbol in filter displays vs. hardcoding $

programcsharp · programcsharp · commit bf8ccb1c8d8d · 2015-09-11T11:17:38.000-07:00
diff --git a/Build/CommonAssemblyInfo.cs b/Build/CommonAssemblyInfo.cs
@@ -15,5 +15,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.4.2")]
-[assembly: AssemblyFileVersion("1.4.2")]
+[assembly: AssemblyVersion("1.4.3")]
+[assembly: AssemblyFileVersion("1.4.3")]
diff --git a/Griddly.Mvc/GriddlyExtensions.cs b/Griddly.Mvc/GriddlyExtensions.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using System.Threading;
 using System.Web;
 using System.Web.Mvc;
 using System.Web.Mvc.Html;
@@ -15,6 +16,14 @@ namespace Griddly.Mvc
 {
     public static class GriddlyExtensions
     {
+        public static string CurrencySymbol
+        {
+            get
+            {
+                return Thread.CurrentThread.CurrentCulture.NumberFormat.CurrencySymbol;
+            }
+        }
+
         public static MvcHtmlString Griddly(this HtmlHelper htmlHelper, string actionName)
         {
             return htmlHelper.Griddly(actionName, null);
@@ -203,7 +212,7 @@ public static string Current(this UrlHelper helper, object routeValues = null, b
                         // values[value.Key] = (DateTime)value.Value; -- BAD: can't unbox a value type as a different type
                         values[value.Key] = Convert.ChangeType(value.Value, typeof(DateTime));
                     else if (t.IsArray || t.IsSubclassOf(typeof(IEnumerable)))
-                        values[value.Key] = string.Join(",", ((IEnumerable)value.Value).Cast<object>()); 
+                        values[value.Key] = string.Join(",", ((IEnumerable)value.Value).Cast<object>());
                 }
             }
 
diff --git a/Griddly/Views/Shared/Griddly/GriddlyFilterForm.cshtml b/Griddly/Views/Shared/Griddly/GriddlyFilterForm.cshtml
@@ -31,7 +31,7 @@
                     @:<div class="input-group input-group-sm">
                     if (filter.DataType == FilterDataType.Currency)
                     {
-                        <span class="input-group-addon">$</span>
+                        <span class="input-group-addon">@GriddlyExtensions.CurrencySymbol</span>
                     }
                     else if (filter.DataType == FilterDataType.Date)
                     {
@@ -58,7 +58,7 @@
                     @:<div class="input-group input-group-sm">
                     if (filter.DataType == FilterDataType.Currency)
                     {
-                        <span class="input-group-addon">$</span>
+                        <span class="input-group-addon">@GriddlyExtensions.CurrencySymbol</span>
                     }
                     else if (filter.DataType == FilterDataType.Date)
                     {
@@ -83,7 +83,7 @@
                     @:<div class="input-group input-group-sm">
                     if (filter.DataType == FilterDataType.Currency)
                     {
-                        <span class="input-group-addon">$</span>
+                        <span class="input-group-addon">@GriddlyExtensions.CurrencySymbol</span>
                     }
                     else if (filter.DataType == FilterDataType.Date)
                     {
diff --git a/Griddly/Views/Shared/Griddly/GriddlyFilterInline.cshtml b/Griddly/Views/Shared/Griddly/GriddlyFilterInline.cshtml
@@ -105,7 +105,7 @@
                         <div class="input-group input-group-sm">
                             @if (filter.DataType == FilterDataType.Currency)
                             {
-                                <span class="input-group-addon">$</span>
+                                <span class="input-group-addon">@GriddlyExtensions.CurrencySymbol</span>
                             }
                             else if (filter.DataType == FilterDataType.Date)
                             {
@@ -127,7 +127,7 @@
                         <div class="input-group input-group-sm">
                             @if (filter.DataType == FilterDataType.Currency)
                             {
-                                <span class="input-group-addon">$</span>
+                                <span class="input-group-addon">@GriddlyExtensions.CurrencySymbol</span>
                             }
                             else if (filter.DataType == FilterDataType.Date)
                             {
@@ -147,7 +147,7 @@
                         <div class="input-group input-group-sm">
                             @if (filter.DataType == FilterDataType.Currency)
                             {
-                                <span class="input-group-addon">$</span>
+                                <span class="input-group-addon">@GriddlyExtensions.CurrencySymbol</span>
                             }
                             else if (filter.DataType == FilterDataType.Date)
                             {

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using System.Linq;`
`5`	`5`	`using System.Reflection;`
`6`	`6`	`using System.Text;`
	`7`	`+using System.Threading;`
`7`	`8`	`using System.Web;`
`8`	`9`	`using System.Web.Mvc;`
`9`	`10`	`using System.Web.Mvc.Html;`
`@@ -15,6 +16,14 @@ namespace Griddly.Mvc`
`15`	`16`	`{`
`16`	`17`	`public static class GriddlyExtensions`
`17`	`18`	`{`
	`19`	`+ public static string CurrencySymbol`
	`20`	`+ {`
	`21`	`+ get`
	`22`	`+ {`
	`23`	`+ return Thread.CurrentThread.CurrentCulture.NumberFormat.CurrencySymbol;`
	`24`	`+ }`
	`25`	`+ }`
	`26`	`+`
`18`	`27`	`public static MvcHtmlString Griddly(this HtmlHelper htmlHelper, string actionName)`
`19`	`28`	`{`
`20`	`29`	`return htmlHelper.Griddly(actionName, null);`
`@@ -203,7 +212,7 @@ public static string Current(this UrlHelper helper, object routeValues = null, b`
`203`	`212`	`// values[value.Key] = (DateTime)value.Value; -- BAD: can't unbox a value type as a different type`
`204`	`213`	`values[value.Key] = Convert.ChangeType(value.Value, typeof(DateTime));`
`205`	`214`	`else if (t.IsArray \|\| t.IsSubclassOf(typeof(IEnumerable)))`
`206`		`- values[value.Key] = string.Join(",", ((IEnumerable)value.Value).Cast<object>());`
	`215`	`+ values[value.Key] = string.Join(",", ((IEnumerable)value.Value).Cast<object>());`
`207`	`216`	`}`
`208`	`217`	`}`
`209`	`218`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`@:<div class="input-group input-group-sm">`
`32`	`32`	`if (filter.DataType == FilterDataType.Currency)`
`33`	`33`	`{`
`34`		`- <span class="input-group-addon">$</span>`
	`34`	`+ <span class="input-group-addon">@GriddlyExtensions.CurrencySymbol</span>`
`35`	`35`	`}`
`36`	`36`	`else if (filter.DataType == FilterDataType.Date)`
`37`	`37`	`{`
`@@ -58,7 +58,7 @@`
`58`	`58`	`@:<div class="input-group input-group-sm">`
`59`	`59`	`if (filter.DataType == FilterDataType.Currency)`
`60`	`60`	`{`
`61`		`- <span class="input-group-addon">$</span>`
	`61`	`+ <span class="input-group-addon">@GriddlyExtensions.CurrencySymbol</span>`
`62`	`62`	`}`
`63`	`63`	`else if (filter.DataType == FilterDataType.Date)`
`64`	`64`	`{`
`@@ -83,7 +83,7 @@`
`83`	`83`	`@:<div class="input-group input-group-sm">`
`84`	`84`	`if (filter.DataType == FilterDataType.Currency)`
`85`	`85`	`{`
`86`		`- <span class="input-group-addon">$</span>`
	`86`	`+ <span class="input-group-addon">@GriddlyExtensions.CurrencySymbol</span>`
`87`	`87`	`}`
`88`	`88`	`else if (filter.DataType == FilterDataType.Date)`
`89`	`89`	`{`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@`
`105`	`105`	`<div class="input-group input-group-sm">`
`106`	`106`	`@if (filter.DataType == FilterDataType.Currency)`
`107`	`107`	`{`
`108`		`- <span class="input-group-addon">$</span>`
	`108`	`+ <span class="input-group-addon">@GriddlyExtensions.CurrencySymbol</span>`
`109`	`109`	`}`
`110`	`110`	`else if (filter.DataType == FilterDataType.Date)`
`111`	`111`	`{`
`@@ -127,7 +127,7 @@`
`127`	`127`	`<div class="input-group input-group-sm">`
`128`	`128`	`@if (filter.DataType == FilterDataType.Currency)`
`129`	`129`	`{`
`130`		`- <span class="input-group-addon">$</span>`
	`130`	`+ <span class="input-group-addon">@GriddlyExtensions.CurrencySymbol</span>`
`131`	`131`	`}`
`132`	`132`	`else if (filter.DataType == FilterDataType.Date)`
`133`	`133`	`{`
`@@ -147,7 +147,7 @@`
`147`	`147`	`<div class="input-group input-group-sm">`
`148`	`148`	`@if (filter.DataType == FilterDataType.Currency)`
`149`	`149`	`{`
`150`		`- <span class="input-group-addon">$</span>`
	`150`	`+ <span class="input-group-addon">@GriddlyExtensions.CurrencySymbol</span>`
`151`	`151`	`}`
`152`	`152`	`else if (filter.DataType == FilterDataType.Date)`
`153`	`153`	`{`