Changeset 4377 in josm for trunk/src/org

Timestamp:

2011-08-28T16:09:23+02:00 (13 years ago)

Author:

stoecker

Message:

use lower case search expressions only

Location:

trunk/src/org/openstreetmap/josm/actions/search

Files:

• SearchAction.java (modified) (1 diff)
• SearchCompiler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -211 +211 @@
         descriptionText.appendItem(tr("<b>foot:</b> - key=foot set to any value."));
         descriptionText.appendItemHeader(tr("Special targets"));
-        descriptionText.appendItem(tr("<b>type:</b> - objects with corresponding type (<b>node</b>, <b>way</b>, <b>relation</b>)"));
-        descriptionText.appendItem(tr("<b>user:</b>... - objects changed by user"));
-        descriptionText.appendItem(tr("<b>user:anonymous</b> - objects changed by anonymous users"));
-        descriptionText.appendItem(tr("<b>id:</b>... - objects with given ID (0 for new objects)"));
-        descriptionText.appendItem(tr("<b>version:</b>... - objects with given version (0 objects without an assigned version)"));
-        descriptionText.appendItem(tr("<b>changeset:</b>... - objects with given changeset id (0 objects without assigned changeset)"));
-        descriptionText.appendItem(tr("<b>nodes:</b>... - objects with given number of nodes (nodes:count, nodes:min-max, nodes:min- or nodes:-max)"));
-        descriptionText.appendItem(tr("<b>tags:</b>... - objects with given number of tags (nodes:count, nodes:min-max, nodes:min- or nodes:-max)"));
-        descriptionText.appendItem(tr("<b>role:</b>... - objects with given role in a relation"));
-        descriptionText.appendItem(tr("<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"));
-        descriptionText.appendItem(tr("<b>areasize:</b>... - closed ways with given area in m\u00b2 (areasize:min-max or areasize:max)"));
-        descriptionText.appendItem(tr("<b>modified</b> - all changed objects"));
-        descriptionText.appendItem(tr("<b>selected</b> - all selected objects"));
-        descriptionText.appendItem(tr("<b>incomplete</b> - all incomplete objects"));
-        descriptionText.appendItem(tr("<b>untagged</b> - all untagged objects"));
-        descriptionText.appendItem(tr("<b>closed</b> - all closed ways (a node is not considered closed)"));
-        descriptionText.appendItem(tr("<b>child <i>expr</i></b> - all children of objects matching the expression"));
-        descriptionText.appendItem(tr("<b>parent <i>expr</i></b> - all parents of objects matching the expression"));
-        descriptionText.appendItem(tr("<b>(all)inDownloadedArea</b> - objects (and all its way nodes / relation members) in downloaded area"));
-        descriptionText.appendItem(tr("<b>(all)inView</b> - objects (and all its way nodes / relation members) in current view"));
-        descriptionText.appendItem(tr("Use <b>|</b> or <b>OR</b> to combine with logical or"));
+        /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>type:</b> - objects with corresponding type (<b>node</b>, <b>way</b>, <b>relation</b>)"));
+        /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>user:</b>... - objects changed by user"));
+        /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>user:anonymous</b> - objects changed by anonymous users"));
+        /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>id:</b>... - objects with given ID (0 for new objects)"));
+        /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>version:</b>... - objects with given version (0 objects without an assigned version)"));
+        /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>changeset:</b>... - objects with given changeset id (0 objects without assigned changeset)"));
+        /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>nodes:</b>... - objects with given number of nodes (nodes:count, nodes:min-max, nodes:min- or nodes:-max)"));
+        /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>tags:</b>... - objects with given number of tags (nodes:count, nodes:min-max, nodes:min- or nodes:-max)"));
+        /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>role:</b>... - objects with given role in a relation"));
+        /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>timestamp:</b>... - objects with this timestamp (<b>2009-11-12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"));
+        /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>areasize:</b>... - closed ways with given area in m\u00b2 (areasize:min-max or areasize:max)"));
+        /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>modified</b> - all changed objects"));
+        /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>selected</b> - all selected objects"));
+        /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>incomplete</b> - all incomplete objects"));
+        /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>untagged</b> - all untagged objects"));
+        /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>closed</b> - all closed ways (a node is not considered closed)"));
+        /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>child <i>expr</i></b> - all children of objects matching the expression"));
+        /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>parent <i>expr</i></b> - all parents of objects matching the expression"));
+        /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>(all)indownloadedarea</b> - objects (and all its way nodes / relation members) in downloaded area"));
+        /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("<b>(all)inview</b> - objects (and all its way nodes / relation members) in current view"));
+        /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("Use <b>|</b> or <b>OR</b> to combine with logical or"));
         descriptionText.appendItem(tr("Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)")
                 + "<br/>"

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -886 +886 @@
             else if ("parent".equals(key))
                 return new Parent(parseFactor());
-            else if ("inDownloadedArea".equals(key))
+            else if ("indownloadedarea".equals(key))
                 return new InDataSourceArea(false);
-            else if ("allinDownloadedArea".equals(key))
+            else if ("allindownloadedarea".equals(key))
                 return new InDataSourceArea(true);
-            else if ("inView".equals(key))
+            else if ("inview".equals(key))
                 return new InView(false);
-            else if ("allinView".equals(key))
+            else if ("allinview".equals(key))
                 return new InView(true);
             else