Price formatting: the DisplayLocale's FormatProvider was not applied when CustomFormatting was specified for Currency

muratcakir · muratcakir · commit 2eef27f889e2 · 2014-05-29T01:53:57.000+02:00
diff --git a/changelog.md b/changelog.md
@@ -5,9 +5,12 @@
 ###Improvements###
 * UI: TabStrips remember their last selected tab across page requests in an unobtrusive way (removed old selection code)
 * TinyMCE 4: activated spell checking, added FontSelect and FontSizeSelect tools to the toolbar
+* Price formatting: the DisplayLocale's FormatProvider was not applied when _CustomFormatting_ was specified for Currency
+* Admin: Specification attributes are now sorted by DisplayOrder, THEN BY Name
 * (Developer) MVC filter attributes are now Autofac injectable
 * (Developer) Implemented _RunSync_ extension methods for _Func<Task>_ and _Func<Task<T>>_. A reliable way to execute async operations synchronously.
 * (Developer) Refactored model creation for category navigation: it now incorporates _TreeNode<MenuItem>_, which enables plugin developers to alter the main menu with the event hook _NavigationModelBuilt_.
+* (Developer) Added _user.less_ to Alpha theme for user defined css overrides and tweaks
 * #384 Web API: Inserting sluged recources like products require an URL record
 
 ###Bugfixes###
diff --git a/src/Libraries/SmartStore.Data/Setup/SeedData/InvariantSeedData.cs b/src/Libraries/SmartStore.Data/Setup/SeedData/InvariantSeedData.cs
@@ -271,7 +271,7 @@ public IList<Currency> Currencies()
 				CreateCurrency("en-AU", published: true, rate: 0.94M, order: 10),
 				CreateCurrency("en-CA", published: true, rate: 0.98M, order: 15),
 				CreateCurrency("de-DE", rate: 0.79M, order: 20/*, formatting: string.Format("0.00 {0}", "\u20ac")*/),
-				CreateCurrency("de-CH", rate: 0.93M, order: 25),
+				CreateCurrency("de-CH", rate: 0.93M, order: 25, formatting: "CHF #,##0.00"),
 				CreateCurrency("zh-CN", rate: 6.48M, order: 30),
 				CreateCurrency("zh-HK", rate: 7.75M, order: 35),
 				CreateCurrency("ja-JP", rate: 80.07M, order: 40),
diff --git a/src/Libraries/SmartStore.Services/Catalog/PriceFormatter.cs b/src/Libraries/SmartStore.Services/Catalog/PriceFormatter.cs
@@ -51,30 +51,35 @@ protected string GetCurrencyString(decimal amount)
         /// <param name="showCurrency">A value indicating whether to show a currency</param>
         /// <param name="targetCurrency">Target currency</param>
         /// <returns>Currency string without exchange rate</returns>
-        protected string GetCurrencyString(decimal amount,
-            bool showCurrency, Currency targetCurrency)
+        protected string GetCurrencyString(decimal amount, bool showCurrency, Currency targetCurrency)
         {
             string result = string.Empty;
-            if (!String.IsNullOrEmpty(targetCurrency.CustomFormatting))
+
+			IFormatProvider fmt = NumberFormatInfo.CurrentInfo;
+			try
+			{
+				fmt = CultureInfo.CreateSpecificCulture(targetCurrency.DisplayLocale);
+			}
+			catch { }
+
+
+            if (targetCurrency.CustomFormatting.HasValue())
             {
-                result = amount.ToString(targetCurrency.CustomFormatting);
+                result = amount.ToString(targetCurrency.CustomFormatting, fmt);
             }
             else
             {
-                if (!String.IsNullOrEmpty(targetCurrency.DisplayLocale))
+                if (targetCurrency.DisplayLocale.HasValue())
                 {
-                    result = amount.ToString("C", new CultureInfo(targetCurrency.DisplayLocale));
+                    result = amount.ToString("C", fmt);
                 }
                 else
                 {
-                    result = String.Format("{0} ({1})", amount.ToString("N"), targetCurrency.CurrencyCode);
+                    result = String.Format("{0} {1}", amount.ToString("N"), showCurrency ? targetCurrency.CurrencyCode : "").TrimEnd();
                     return result;
                 }
             }
 
-            // codehint: sm-edit (commented, refactor later)
-            /*if (showCurrency && _currencyService.GetAllCurrencies().Count > 1)
-                result = String.Format("{0} ({1})", result, targetCurrency.CurrencyCode);*/
             return result;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -51,30 +51,35 @@ protected string GetCurrencyString(decimal amount)`
`51`	`51`	`/// <param name="showCurrency">A value indicating whether to show a currency</param>`
`52`	`52`	`/// <param name="targetCurrency">Target currency</param>`
`53`	`53`	`/// <returns>Currency string without exchange rate</returns>`
`54`		`- protected string GetCurrencyString(decimal amount,`
`55`		`- bool showCurrency, Currency targetCurrency)`
	`54`	`+ protected string GetCurrencyString(decimal amount, bool showCurrency, Currency targetCurrency)`
`56`	`55`	`{`
`57`	`56`	`string result = string.Empty;`
`58`		`- if (!String.IsNullOrEmpty(targetCurrency.CustomFormatting))`
	`57`	`+`
	`58`	`+ IFormatProvider fmt = NumberFormatInfo.CurrentInfo;`
	`59`	`+ try`
	`60`	`+ {`
	`61`	`+ fmt = CultureInfo.CreateSpecificCulture(targetCurrency.DisplayLocale);`
	`62`	`+ }`
	`63`	`+ catch { }`
	`64`	`+`
	`65`	`+`
	`66`	`+ if (targetCurrency.CustomFormatting.HasValue())`
`59`	`67`	`{`
`60`		`- result = amount.ToString(targetCurrency.CustomFormatting);`
	`68`	`+ result = amount.ToString(targetCurrency.CustomFormatting, fmt);`
`61`	`69`	`}`
`62`	`70`	`else`
`63`	`71`	`{`
`64`		`- if (!String.IsNullOrEmpty(targetCurrency.DisplayLocale))`
	`72`	`+ if (targetCurrency.DisplayLocale.HasValue())`
`65`	`73`	`{`
`66`		`- result = amount.ToString("C", new CultureInfo(targetCurrency.DisplayLocale));`
	`74`	`+ result = amount.ToString("C", fmt);`
`67`	`75`	`}`
`68`	`76`	`else`
`69`	`77`	`{`
`70`		`- result = String.Format("{0} ({1})", amount.ToString("N"), targetCurrency.CurrencyCode);`
	`78`	`+ result = String.Format("{0} {1}", amount.ToString("N"), showCurrency ? targetCurrency.CurrencyCode : "").TrimEnd();`
`71`	`79`	`return result;`
`72`	`80`	`}`
`73`	`81`	`}`
`74`	`82`
`75`		`- // codehint: sm-edit (commented, refactor later)`
`76`		`- /*if (showCurrency && _currencyService.GetAllCurrencies().Count > 1)`
`77`		`- result = String.Format("{0} ({1})", result, targetCurrency.CurrencyCode);*/`
`78`	`83`	`return result;`
`79`	`84`	`}`
`80`	`85`