Merge branch 'develop'

Author: tlgkccampbell

TwistedLogik.Nucleus Tests/Text/LocalizationTest.cs

@@ -241,7 +241,24 @@ public void Localization_FallsBackToClosestLanguageIfAvailable()
                     .ShouldBe("rougeoyant");
             });
         }
-        
+
+        [Test]
+        public void Localization_FallsBackToAmericanEnglishAsLastResort()
+        {
+            LoadTestLocalizationDatabaseFromXml();
+
+            UsingCulture("ru-RU", () =>
+            {
+                var str1 = (String)Localization.Get("SWORD");
+                TheResultingString(str1)
+                    .ShouldBe("sword");
+
+                var str2 = (String)Localization.Get("GLOWING");
+                TheResultingString(str2)
+                    .ShouldBe("glowing");
+            });
+        }
+
         [Test]
         public void StringResource_SerializesToJson()
         {

TwistedLogik.Nucleus/Text/LocalizationDatabase.cs

@@ -344,8 +344,8 @@ private Dictionary<String, LocalizedString> GetCultureStrings(String culture)
         {
             if (!strings.ContainsKey(culture))
             {
-                culture = GetFallbackCulture(culture);
-                if (culture == null || !strings.ContainsKey(culture))
+                culture = GetFallbackCulture(culture) ?? "en-US";
+                if (!strings.ContainsKey(culture))
                 {
                     strings[culture] = new Dictionary<String, LocalizedString>();
                 }