Fixed issue with encoding/parsing of resx xml

AndrewButenko · Jul 17, 2019 · 0083c94 · 0083c94
1 parent 882b073
commit 0083c94
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/AB.HtmlLocalization.Plugins/GetLocalizations.cs b/AB.HtmlLocalization.Plugins/GetLocalizations.cs
@@ -70,9 +70,19 @@ public void Execute(IServiceProvider serviceProvider)
 
                 var content = t.GetAttributeValue<string>("content");
 
-                content = Encoding.Default.GetString(Convert.FromBase64String(content));
-
-                var contentDocument = XDocument.Parse(content);
+                content = Encoding.UTF8.GetString(Convert.FromBase64String(content));
+
+                XDocument contentDocument;
+
+                try
+                {
+                    contentDocument = XDocument.Parse(content);
+                }
+                catch
+                {
+                    content = content.Substring(1);
+                    contentDocument = XDocument.Parse(content);
+                }
 
                 var dataNodes = contentDocument.XPathSelectElements("root/data").Select(n => new { Name = n.Attribute("name").Value, Value = n.Element("value").Value }).ToDictionary(n => n.Name, n => n.Value);
 

diff --git a/Solutions/HtmWebresourcesLocalization_2_0_0_1_managed.zip b/Solutions/HtmWebresourcesLocalization_2_0_0_1_managed.zip
diff --git a/Solutions/HtmWebresourcesLocalization_2_0_0_1_unmanaged.zip b/Solutions/HtmWebresourcesLocalization_2_0_0_1_unmanaged.zip