Ignore <, >, ≤, ≥ replace amp;

prongbang · Oct 16, 2021 · 1cd2558 · 1cd2558
1 parent dfd4e57
commit 1cd2558
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/internal/pkg/android/repository.go b/internal/pkg/android/repository.go
@@ -62,19 +62,28 @@ func (r *repository) GenerateXmlResources(csv csvx.CsvList, localeIndex int) str
 		escapedAmp, _ := regexp.Compile("[&]")
 		escapedPercent, _ := regexp.Compile("[%]")
 		escapedLessThan, _ := regexp.Compile("[<]")
+		escapedLessThanEquals, _ := regexp.Compile("[≤]")
 		escapedMoreThan, _ := regexp.Compile("[>]")
+		escapedMoreThanEquals, _ := regexp.Compile("[≥]")
 		escapedStringAutoBinding, _ := regexp.Compile("{([0-9])}")
 
 		// Prepare data
 		escapedContent := row[localeIndex]
 		escapedContent = escapedDoubleQuote.ReplaceAllString(escapedContent, `"`)
 		escapedContent = escapedSingleQuote.ReplaceAllString(escapedContent, "\\'")
-		escapedContent = escapedAmp.ReplaceAllString(escapedContent, "&amp;")
+		if !strings.Contains(escapedContent, "&lt;") &&
+			!strings.Contains(escapedContent, "&gt;") &&
+			!strings.Contains(escapedContent, "&le;") &&
+			!strings.Contains(escapedContent, "&ge;") {
+			escapedContent = escapedAmp.ReplaceAllString(escapedContent, "&amp;")
+		}
 		escapedContent = escapedDots.ReplaceAllString(escapedContent, "&#8230;")
 		escapedContent = escapedPercent.ReplaceAllString(escapedContent, "%")
 		escapedContent = escapedStringBinding.ReplaceAllString(escapedContent, "%s")
 		escapedContent = escapedLessThan.ReplaceAllString(escapedContent, "&lt;")
+		escapedContent = escapedLessThanEquals.ReplaceAllString(escapedContent, "&le;")
 		escapedContent = escapedMoreThan.ReplaceAllString(escapedContent, "&gt;")
+		escapedContent = escapedMoreThanEquals.ReplaceAllString(escapedContent, "&ge;")
 		escapedContent = escapedStringAutoBinding.ReplaceAllString(escapedContent, "%${1}$$s")
 
 		// Create key name