Merge pull request #74 from jehhynes/master

Fix bug when pluralizing non-English language

Author: programcsharp

Build/CommonAssemblyInfo.cs

@@ -15,6 +15,6 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.5.16")]
-[assembly: AssemblyFileVersion("1.5.16")]
+[assembly: AssemblyVersion("1.5.17")]
+[assembly: AssemblyFileVersion("1.5.17")]
 //[assembly: AssemblyInformationalVersion("1.4.5-editlyalpha2")]

Griddly.Mvc/GriddlyFilter.cs

@@ -12,6 +12,9 @@ public abstract class GriddlyFilter
     {
         string _caption;
 
+        static readonly PluralizationService _pluralizationService
+            = PluralizationService.CreateService(CultureInfo.GetCultureInfo("en-US"));
+
         public string Caption
         {
             get
@@ -20,10 +23,14 @@ public string Caption
             }
             set
             {
-                if (!string.IsNullOrWhiteSpace(value))
-                    CaptionPlural = PluralizationService.CreateService(CultureInfo.CurrentUICulture).Pluralize(value);
+                if (CultureInfo.CurrentUICulture.TwoLetterISOLanguageName == "en" && !string.IsNullOrWhiteSpace(value))
+                {
+                    CaptionPlural = _pluralizationService.Pluralize(value);
+                }
                 else
-                    CaptionPlural = null;
+                {
+                    CaptionPlural = Caption;
+                }
 
                 _caption = value;
             }