Merge pull request unoplatform#13890 from unoplatform/dev/jela/issue1…

…3863 fix: property escape `%` in resw files
eriklimakc · Oct 4, 2023 · 52c6091 · 52c6091
2 parents 8adc8aa + e69047d
commit 52c6091
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/Uno.UI.RuntimeTests/MUX/Helpers/StringUtilTests.cs b/src/Uno.UI.RuntimeTests/MUX/Helpers/StringUtilTests.cs
@@ -16,6 +16,8 @@ public void When_StringUtil()
 			Validate_Formatting("test, icon", "%1!s!, icon", "test");
 			Validate_Formatting("test, 42 items", "%1!s!, %2!u! items", "test", 42);
 			Validate_Formatting("test, 42 test2", "%1!s!, %2!u! %3!s!", "test", 42, "test2");
+			Validate_Formatting("test %, 42% test2", "%1!s!, %2!u!%% %3!s!", "test %", 42, "test2");
+			Validate_Formatting("test, 42% test2", "%1!s!, %2!u!%% %3!s!", "test", 42, "test2");
 		}
 
 		private void Validate_Formatting(string expected, string format, params object[] args)

diff --git a/src/Uno.UI/Helpers/WinUI/StringUtil.cs b/src/Uno.UI/Helpers/WinUI/StringUtil.cs
@@ -26,7 +26,7 @@ internal static string FormatString(string format, params object[] parms)
 			// the output string, as the C++ index is staring at 1.
 			list.Insert(0, null);
 
-			return string.Format(CultureInfo.CurrentCulture, dotnetFormat, list.ToArray());
+			return string.Format(CultureInfo.CurrentCulture, dotnetFormat.Replace("%%", "%"), list.ToArray());
 		}
 
 		[GeneratedRegex(@"\%(\d+)!.*?!", RegexOptions.Singleline)]