Added support for nesting formats in LocalizationFormatter

axuno · Aug 29, 2023 · 1e43acf · 1e43acf
1 parent 2bb777c
commit 1e43acf
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 1 deletion.
diff --git a/src/SmartFormat.Tests/Extensions/LocalizationFormatterTests.cs b/src/SmartFormat.Tests/Extensions/LocalizationFormatterTests.cs
@@ -204,4 +204,17 @@ public void Combine_With_PluralLocalizationFormatter(string format, int count, s
         var actual = smart.Format(CultureInfo.GetCultureInfo(cultureName), format, count);
         Assert.That(actual, Is.EqualTo(expected));
     }
-}
+
+    [TestCase("{:L:{ProductType}}", "en", "paper", "Paper")]
+    [TestCase("{:L:{ProductType}}", "de", "paper", "das Papier")]
+    [TestCase("{:L:{ProductType}}", "fr", "paper", "Papier")]
+    [TestCase("{:L:{ProductType}}", "en", "pen", "Pen")]
+    [TestCase("{:L:{ProductType}}", "de", "pen", "der Kugelschreiber")]
+    [TestCase("{:L:{ProductType}}", "fr", "pen", "Bic")]
+    public void Combine_With_Nesting(string format, string cultureName, string productType, string expected)
+    {
+        var smart = GetFormatterWithRegisteredResource();
+        var actual = smart.Format(CultureInfo.GetCultureInfo(cultureName), format, new { ProductType = productType });
+        Assert.That(actual, Is.EqualTo(expected));
+    }
+}
diff --git a/src/SmartFormat.Tests/Localization/LocTest1.de.resx b/src/SmartFormat.Tests/Localization/LocTest1.de.resx
@@ -132,4 +132,10 @@
   <data name="{} items" xml:space="preserve">
     <value>{} Elemente</value>
   </data>
+  <data name="paper" xml:space="preserve">
+    <value>das Papier</value>
+  </data>
+  <data name="pen" xml:space="preserve">
+    <value>der Kugelschreiber</value>
+  </data>
 </root>
diff --git a/src/SmartFormat.Tests/Localization/LocTest1.es.resx b/src/SmartFormat.Tests/Localization/LocTest1.es.resx
@@ -132,4 +132,10 @@
   <data name="{} items" xml:space="preserve">
     <value>{} elementos</value>
   </data>
+  <data name="paper" xml:space="preserve">
+    <value>Papel</value>
+  </data>
+  <data name="pen" xml:space="preserve">
+    <value>Bolígrafo</value>
+  </data>
 </root>
diff --git a/src/SmartFormat.Tests/Localization/LocTest1.fr.resx b/src/SmartFormat.Tests/Localization/LocTest1.fr.resx
@@ -132,4 +132,10 @@
   <data name="{} items" xml:space="preserve">
     <value>{} éléments</value>
   </data>
+  <data name="paper" xml:space="preserve">
+    <value>Papier</value>
+  </data>
+  <data name="pen" xml:space="preserve">
+    <value>Bic</value>
+  </data>
 </root>
diff --git a/src/SmartFormat.Tests/Localization/LocTest1.resx b/src/SmartFormat.Tests/Localization/LocTest1.resx
@@ -136,4 +136,10 @@
   <data name="{} items" xml:space="preserve">
     <value>{} items</value>
   </data>
+  <data name="paper" xml:space="preserve">
+    <value>Paper</value>
+  </data>
+  <data name="pen" xml:space="preserve">
+    <value>Pen</value>
+  </data>
 </root>
diff --git a/src/SmartFormat/Extensions/LocalizationFormatter.cs b/src/SmartFormat/Extensions/LocalizationFormatter.cs
@@ -68,6 +68,14 @@ public bool TryEvaluateFormat(IFormattingInfo formattingInfo)
         // Get the localized string
         var localized = LocalizationProvider!.GetString(formattingInfo.Format!.RawText, cultureInfo);
 
+        // Try formatting if localized string was not found, but a format has nested items
+        if (localized is null && formattingInfo.Format!.HasNested)
+        {
+            var formatted = _formatter!.Format(formattingInfo.Format!.RawText, formattingInfo.CurrentValue);
+
+            localized = LocalizationProvider!.GetString(formatted, cultureInfo);
+        }
+
         if (localized is null) throw new LocalizationFormattingException(formattingInfo.Format, $"No localized string found for '{formattingInfo.Format!.RawText}'", formattingInfo.Format.StartIndex);
 
         // Use an existing Format from the cache