i18n check and todo cleanup

rubberduck-vba · Jul 13, 2016 · c568f96 · c568f96
1 parent 13c9ee6
commit c568f96
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 14 deletions.
diff --git a/RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/ToolsParentMenu.cs b/RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/ToolsParentMenu.cs
@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+
+namespace Rubberduck.UI.Command.MenuItems.ParentMenus
+{
+    public class ToolsParentMenu : ParentMenuItemBase
+    {
+        public ToolsParentMenu(IEnumerable<IMenuItem> items)
+            : base("ToolsMenu", items)
+        {
+        }
+
+        public override int DisplayOrder
+        {
+            get
+            {
+                return (int)RubberduckMenuItemDisplayOrder.Tools;
+            }
+        }
+
+
+    }
+
+    public enum ToolsMenuItemDisplayOrder
+    {
+        SourceControl,
+        ToDoExplorer,
+        RegexAssistant,
+    }
+}
diff --git a/RetailCoder.VBE/UI/RegexAssistant/RegexAssistantViewModel.cs b/RetailCoder.VBE/UI/RegexAssistant/RegexAssistantViewModel.cs
@@ -1,4 +1,5 @@
 using Rubberduck.RegexAssistant;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Controls;
@@ -72,7 +73,7 @@ private void RecalculateDescription()
         {
             if (_pattern.Equals(string.Empty))
             {
-                _description = "No Pattern given";
+                _description = RubberduckUI.RegexAssistant_NoPatternError;
                 var results = new List<TreeViewItem>();
                 var rootTreeItem = new TreeViewItem();
                 rootTreeItem.Header = _description;
@@ -119,13 +120,7 @@ public string DescriptionResults
 
         private static TreeViewItem AsTreeViewItem(IRegularExpression expression)
         {
-            var result = new TreeViewItem();
-            result.Header = "Some unknown IRegularExpression subtype was in the view";
-            foreach (var subtree in expression.Subexpressions.Select(exp => AsTreeViewItem((dynamic)exp)))
-            {
-                result.Items.Add(subtree);
-            }
-            return result;
+            throw new InvalidOperationException("Some unknown IRegularExpression subtype was in RegexAssistantViewModel");
         }
 
         private static TreeViewItem AsTreeViewItem(ErrorExpression expression)

diff --git a/RetailCoder.VBE/UI/RubberduckUI.Designer.cs b/RetailCoder.VBE/UI/RubberduckUI.Designer.cs
diff --git a/RetailCoder.VBE/UI/RubberduckUI.de.resx b/RetailCoder.VBE/UI/RubberduckUI.de.resx
@@ -453,7 +453,7 @@ Warnung: Alle eigenen Einstellungen gehen dabei verloren. Die Originaldatei wird
     <value>Test Explorer</value>
   </data>
   <data name="TodoExplorer_Caption" xml:space="preserve">
-    <value>Todo Explorer</value>
+    <value>ToDo Liste</value>
   </data>
   <data name="Warning" xml:space="preserve">
     <value>Warnung</value>

diff --git a/RetailCoder.VBE/UI/RubberduckUI.resx b/RetailCoder.VBE/UI/RubberduckUI.resx
@@ -1751,4 +1751,7 @@ All our stargazers, likers &amp; followers, for the warm fuzzies
   <data name="ToolsMenu" xml:space="preserve">
     <value>T&amp;ools</value>
   </data>
+  <data name="RegexAssistant_NoPatternError" xml:space="preserve">
+    <value>No Pattern given</value>
+  </data>
 </root>
diff --git a/Rubberduck.RegexAssistant/Atom.cs b/Rubberduck.RegexAssistant/Atom.cs
@@ -26,7 +26,6 @@ public CharacterClass(string specifier)
             Match m = Matcher.Match(specifier);
             if (!m.Success)
             {
-                // TODO: i18n
                 throw new ArgumentException("The given specifier does not denote a character class");
             }
             this._specifier = specifier;
@@ -55,7 +54,6 @@ private IList<string> ExtractCharacterSpecifiers(string characterClass)
                 {
                     if (specifier.Value.EndsWith("-\\"))
                     {
-                        // TODO: i18n
                         throw new ArgumentException("Character Ranges that have incorrectly escaped characters as target are not allowed");
                     }
                     else if (specifier.Value.Length == 1)
@@ -112,7 +110,6 @@ public class Group : IAtom
             Match m = Matcher.Match(specifier);
             if (!m.Success)
             {
-                // TODO i18n
                 throw new ArgumentException("The given specifier does not denote a Group");
             }
             _subexpression = RegularExpression.Parse(m.Groups["expression"].Value);
@@ -184,7 +181,6 @@ public Literal(string specifier)
             Match m = Matcher.Match(specifier);
             if (!m.Success)
             {
-                // TODO: i18n
                 throw new ArgumentException("The given specifier does not denote a Literal");
             }
             _specifier = specifier;

diff --git a/Rubberduck.RegexAssistant/Quantifier.cs b/Rubberduck.RegexAssistant/Quantifier.cs
@@ -12,7 +12,6 @@ public class Quantifier
         public readonly int MinimumMatches;
         public readonly int MaximumMatches;
 
-        // FIXME i18n ? Shouldn't ever show up actually...
         public Quantifier(string expression)
         {
             if (expression.Length == 0)