case-insensitive comparison of comment tags

#7

MainWindow.resx

@@ -981,7 +981,7 @@
     <value>2</value>
   </data>
   <data name="analyzeTab.Text" xml:space="preserve">
-    <value>Analyze</value>
+    <value>Find Duplicates</value>
   </data>
   <data name="&gt;&gt;analyzeTab.Name" xml:space="preserve">
     <value>analyzeTab</value>

Panels/AnalyzeControlPanel.cs

@@ -64,7 +64,7 @@ private void AnalyzeOnClick(object sender, EventArgs e)
 					Comment = d.Element("comment")?.Value
 				})
 				.Where(a => string.IsNullOrWhiteSpace(a.Comment) ||
-					!(a.Comment.Contains("SKIP") || a.Comment.Contains("NODUP")))
+					!(a.Comment.ContainsICIC("SKIP") || a.Comment.ContainsICIC("NODUP")))
 				.Select(d => d.Data);
 
 			Log($"Resx contains {data.Count()} strings" + NL);

ResxProvider.cs

@@ -35,7 +35,7 @@ public static List<XElement> CollectStrings(XElement root)
 					// TODO: what is this for?
 					e.Attribute("name")?.Value.StartsWith(">>") != true &&
 					// SKIP is a special flag indicating this entry should not be translated
-					e.Element("comment")?.Value.Contains("SKIP") != true)
+					e.Element("comment")?.Value.ContainsICIC("SKIP") != true)
 				.ToList();
 		}
 
@@ -59,7 +59,7 @@ public static List<XElement> CollectNewStrings(List<XElement> data, string path)
 					d.Attribute("type") == null &&
 					(
 						// collect all edited entries
-						d.Element("comment")?.Value.Contains("EDIT") == true ||
+						d.Element("comment")?.Value.ContainsICIC("EDIT") == true ||
 						// collect entries that don't exist in target
 						!target.Elements("data")
 							.Any(e => e.Attribute("name")?.Value == d.Attribute("name").Value)
@@ -84,8 +84,8 @@ public static List<XElement> CollectNewStrings(List<XElement> data, string path)
 		public static int MergeHints(XElement root, XElement hints)
 		{
 			var count = 0;
-            foreach (var hint in hints.Elements())
-            {
+			foreach (var hint in hints.Elements())
+			{
 				var preferred = hint.Element("preferred").Value.Trim();
 
 				var element = root.Elements("data").FirstOrDefault(e =>
@@ -102,7 +102,7 @@ public static int MergeHints(XElement root, XElement hints)
 				}
 			}
 
-            return count;
+			return count;
 		}
 
 
@@ -131,8 +131,8 @@ public static void SortData(XElement root)
 			var files = data
 				.Where(e => e.Attribute("type") != null)
 				.Select(e => new { Element = e, Values = e.Element("value").Value.Split(';') })
-				.OrderBy(e => e.Values[1])	// type
-				.ThenBy(e => e.Values[0])	// path
+				.OrderBy(e => e.Values[1])  // type
+				.ThenBy(e => e.Values[0])   // path
 				.ThenBy(e => e.Element.Attribute("name").Value)
 				.Select(e => e.Element)
 				.ToList();

StringExtensions.cs

@@ -1,9 +1,10 @@
 //************************************************************************************************
-// Copyright © 2020 Steven M Cohn.  All rights reserved.
+// Copyright © 2020 Steven M Cohn. All rights reserved.
 //************************************************************************************************
 
 namespace ResxTranslator
 {
+	using System;
 	using System.Text;
 
 
@@ -24,6 +25,24 @@ internal static class StringExtensions
 		private static readonly char[] EscapeChars = new char[] { '<', '>', '&' };
 
 
+		/// <summary>
+		/// Compares a string against the given instance, as non-case-sensitive.
+		/// </summary>
+		/// <param name="s">The string instance</param>
+		/// <param name="value">The other string for comparison</param>
+		/// <returns>True if the instance contains at least one occurance of value</returns>
+		public static bool ContainsICIC(this string s, string value)
+		{
+			return s.IndexOf(value, StringComparison.InvariantCultureIgnoreCase) >= 0;
+		}
+
+
+		/// <summary>
+		/// Escapes special XML characters in the given text values so those characters
+		/// survive round-trips as user-input text
+		/// </summary>
+		/// <param name="str">The user input string</param>
+		/// <returns>The user string with special XML characters escaped</returns>
 		public static string XmlEscape(this string str)
 		{
 			if (str == null)

Translator.cs

@@ -355,7 +355,7 @@ public async Task<bool> TranslateResx(
 					continue;
 				}
 
-				var editing = data[index].Element("comment")?.Value.Contains("EDIT") == true;
+				var editing = data[index].Element("comment")?.Value.ContainsICIC("EDIT") == true;
 
 				var name = editing
 					? $"{data[index].Attribute("name").Value} (EDITED)"
@@ -478,7 +478,7 @@ public static int ClearMarkers(string path)
 		{
 			var root = XElement.Load(path);
 			var comments = root.Elements("data").Elements("comment")
-				.Where(e => e.Value.Contains("EDIT"));
+				.Where(e => e.Value.ContainsICIC("EDIT"));
 
 			if (comments.Any())
 			{