fix open/close message consistency, missing error message (fixes processing#3253

benfry · benfry · commit 6e99cdbfedee · 2015-05-12T10:49:54.000-04:00
diff --git a/build/shared/lib/languages/PDE.properties b/build/shared/lib/languages/PDE.properties
@@ -333,13 +333,13 @@ editor.status.warning = Warning
 editor.status.error = Error
 editor.status.error_on = Error on "%s"
 editor.status.missing.default = Missing "%c"
-editor.status.missing.semi_colon = Missing a semi-colon ";"
-editor.status.missing.open_sq_bracket = Missing opening square bracket "["
-editor.status.missing.closing_sq_bracket = Missing closing square bracket "]"
-editor.status.missing.open_paren = Missing opening parentheses "("
-editor.status.missing.closing_paren = Missing closing parentheses ")"
-editor.status.missing.open_curly_bracket = Missing opening curly bracket "{"
-editor.status.missing.closing_curly_bracket = Missing closing curly bracket "}"
+editor.status.missing.semicolon = Missing a semicolon ";"
+editor.status.missing.left_sq_bracket = Missing left square bracket "["
+editor.status.missing.right_sq_bracket = Missing right square bracket "]"
+editor.status.missing.left_paren = Missing left parenthesis "("
+editor.status.missing.right_paren = Missing right parenthesis ")"
+editor.status.missing.left_curly_bracket = Missing left curly bracket "{"
+editor.status.missing.right_curly_bracket = Missing right curly bracket "}"
 editor.status.missing.add = Consider adding "%s"
 editor.status.reserved_words = "color" and "int" are reserved words & cannot be used as variable names
 # methoddef, varname, classname, namefield, typeA, typeB will be replaced with the correct value during runtime (don't translate)
diff --git a/java/src/processing/mode/java/pdex/ErrorMessageSimplifier.java b/java/src/processing/mode/java/pdex/ErrorMessageSimplifier.java
@@ -274,13 +274,13 @@ static private String removePackagePrefixes(String input) {
 
   static private String getErrorMessageForBracket(char c) {
     switch (c) {
-      case ';': return Language.text("editor.status.missing.semi_colon");
-      case '[': return Language.text("editor.status.missing.open_sq_bracket");
-      case ']': return Language.text("editor.status.missing.closing_sq_bracket");
-      case '(': return Language.text("editor.status.missing.open_paren");
-      case ')': return Language.text("editor.status.missing.close_paren");
-      case '{': return Language.text("editor.status.missing.open_curly_bracket");
-      case '}': return Language.text("editor.status.missing.closing_curly_bracket");
+      case ';': return Language.text("editor.status.missing.semicolon");
+      case '[': return Language.text("editor.status.missing.left_sq_bracket");
+      case ']': return Language.text("editor.status.missing.right_sq_bracket");
+      case '(': return Language.text("editor.status.missing.left_paren");
+      case ')': return Language.text("editor.status.missing.right_paren");
+      case '{': return Language.text("editor.status.missing.left_curly_bracket");
+      case '}': return Language.text("editor.status.missing.right_curly_bracket");
     }
     // This seems to be unreachable and wasn't in PDE.properties.
     // I've added it for 3.0a8, but that seems gross. [fry]
