Update tests

.gitignore

@@ -13,6 +13,9 @@
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
+# Rider
+.idea
+
 # Mono auto generated files
 mono_crash.*
 

src/Lepo.i18n.DependencyInjection/StaticStringLocalizer.cs

@@ -18,7 +18,7 @@ ILocalizationCultureManager cultureManager
     /// </summary>
     /// <param name="name">The name of the localized string.</param>
     /// <returns>The localized string.</returns>
-    public LocalizedString this[string name] => this[name, Array.Empty<object>()];
+    public LocalizedString this[string name] => this[name, []];
 
     /// <summary>
     /// Gets the localized string for the specified name and format arguments.

src/Lepo.i18n.Json/LocalizationBuilderExtensions.cs

@@ -23,6 +23,29 @@ public static class LocalizationBuilderExtensions
             Converters = { new TranslationsContainerConverter() }
         };
 
+    public static LocalizationBuilder FromJsonString(
+        this LocalizationBuilder builder,
+        string jsonString,
+        CultureInfo culture
+    )
+    {
+        return builder.FromJsonString(jsonString, default, culture);
+    }
+
+    public static LocalizationBuilder FromJsonString(
+        this LocalizationBuilder builder,
+        string jsonString,
+        string? baseName,
+        CultureInfo culture
+    )
+    {
+        builder.AddLocalization(
+            new LocalizationSet(baseName, culture, ComputeLocalizationPairs(jsonString))
+        );
+
+        return builder;
+    }
+
     /// <summary>
     /// Loads localization data from a JSON file in the calling assembly.
     /// </summary>
@@ -63,11 +86,24 @@ CultureInfo culture
 
         string? contents = EmbeddedResourceReader.ReadToEnd(path, assembly);
 
+        builder.AddLocalization(
+            new LocalizationSet(
+                Path.GetFileNameWithoutExtension(path).Trim().ToLowerInvariant(),
+                culture,
+                ComputeLocalizationPairs(contents)
+            )
+        );
+
+        return builder;
+    }
+
+    private static IEnumerable<KeyValuePair<string, string?>> ComputeLocalizationPairs(
+        string? contents
+    )
+    {
         if (contents is null)
         {
-            throw new LocalizationBuilderException(
-                $"Resource {path} not found in assembly {assembly.FullName}."
-            );
+            throw new ArgumentNullException(nameof(contents));
         }
 
         Version schemaVersion =
@@ -101,21 +137,13 @@ CultureInfo culture
             if (localizedStrings.ContainsKey(localizedString.Name))
             {
                 throw new LocalizationBuilderException(
-                    $"The {path} file contains duplicate \"{localizedString.Name}\" keys."
+                    $"The contents of the JSON file contains duplicate \"{localizedString.Name}\" keys."
                 );
             }
 
             localizedStrings.Add(localizedString.Name, localizedString.Value);
         }
 
-        builder.AddLocalization(
-            new LocalizationSet(
-                Path.GetFileNameWithoutExtension(path).Trim().ToLowerInvariant(),
-                culture,
-                localizedStrings!
-            )
-        );
-
-        return builder;
+        return localizedStrings!;
     }
 }

src/Lepo.i18n.Wpf/StringLocalizerExtension.cs

@@ -69,7 +69,7 @@ public StringLocalizerExtension(string? text, string? textNamespace)
             ?.GetLocalizationSet(
                 LocalizationProviderFactory.GetInstance()?.GetCulture()
                     ?? CultureInfo.CurrentUICulture,
-                Namespace ?? default
+                Namespace?.ToLowerInvariant() ?? default
             );
 
         if (localizationSet is null)

src/Lepo.i18n/LocalizationBuilderExtensions.cs

@@ -180,10 +180,9 @@ CultureInfo culture
                 .Where(x => x.Key is string)
                 .ToDictionary(x => (string)x.Key!, x => (string?)x.Value);
 
-            builder.AddLocalization(new LocalizationSet(baseName, culture, localizations));
-
-            Thread.CurrentThread.CurrentCulture = cultureToRestore;
-            Thread.CurrentThread.CurrentUICulture = cultureToRestore;
+            builder.AddLocalization(
+                new LocalizationSet(baseName.ToLowerInvariant(), culture, localizations)
+            );
 
             return builder;
         }
@@ -194,5 +193,10 @@ CultureInfo culture
                 ex
             );
         }
+        finally
+        {
+            Thread.CurrentThread.CurrentCulture = cultureToRestore;
+            Thread.CurrentThread.CurrentUICulture = cultureToRestore;
+        }
     }
 }

src/Lepo.i18n/LocalizationSet.cs

@@ -15,4 +15,21 @@ public record LocalizationSet(
     string? Name,
     CultureInfo Culture,
     IEnumerable<KeyValuePair<string, string?>> Strings
-);
+)
+{
+    public string? this[string key]
+    {
+        get
+        {
+            foreach (KeyValuePair<string, string?> localizationString in Strings)
+            {
+                if (localizationString.Key == key)
+                {
+                    return localizationString.Value;
+                }
+            }
+
+            return key;
+        }
+    }
+}

src/Lepo.i18n/Translator.cs

@@ -24,6 +24,7 @@ public static class Translator
     [Obsolete("This method is obsolete and should not be used.")]
     public static string String(string value)
     {
+        // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
         if (value is null)
         {
             return string.Empty;

src/Lepo.i18n/Yaml/LocalizationBuilderExtensions.cs

@@ -74,7 +74,9 @@ KeyValuePair<string, IDictionary<string, string>> localizedStrings in deserializ
                     ? baseNamespace
                     : localizedStrings.Key;
 
-            builder.AddLocalization(new LocalizationSet(name, culture, localizedStrings.Value!));
+            builder.AddLocalization(
+                new LocalizationSet(name.ToLowerInvariant(), culture, localizedStrings.Value!)
+            );
         }
 
         return builder;

tests/Lepo.i18n.DependencyInjection.UnitTests/Lepo.i18n.DependencyInjection.UnitTests.csproj

@@ -12,11 +12,6 @@
     <None Remove="Resources\Translations-pl-PL.yaml" />
     <None Remove="Resources\Translations-en-US.yaml" />
   </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\Translations-pl-PL.yaml" />
-    <EmbeddedResource Include="Resources\Translations-en-US.yaml" />
-  </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" />