From 2d4b6bf45b862e08f07fdd7f177c260db5e01139 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Tue, 28 May 2013 19:55:06 -0700
Subject: [PATCH] Add description and fixme fields

---
 data/presets.yaml                    |  4 ++++
 data/presets/fields.json             | 10 ++++++++++
 data/presets/fields/description.json |  5 +++++
 data/presets/fields/fixme.json       |  5 +++++
 dist/locales/en.json                 |  7 ++++++-
 5 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 data/presets/fields/description.json
 create mode 100644 data/presets/fields/fixme.json

diff --git a/data/presets.yaml b/data/presets.yaml
index d2982c562..862d0c0cc 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -89,6 +89,8 @@ en:
         label: Denomination
       denotation: 
         label: Denotation
+      description: 
+        label: Description
       elevation: 
         label: Elevation
       emergency: 
@@ -100,6 +102,8 @@ en:
         placeholder: +31 42 123 4567
       fee: 
         label: Fee
+      fixme: 
+        label: Fix Me
       highway: 
         label: Type
       historic: 
diff --git a/data/presets/fields.json b/data/presets/fields.json
index ce98abf92..9130dda1f 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -194,6 +194,11 @@
         "type": "combo",
         "label": "Denotation"
     },
+    "description": {
+        "key": "description",
+        "type": "textarea",
+        "label": "Description"
+    },
     "elevation": {
         "key": "ele",
         "type": "number",
@@ -222,6 +227,11 @@
         "type": "check",
         "label": "Fee"
     },
+    "fixme": {
+        "key": "fixme",
+        "type": "textarea",
+        "label": "Fix Me"
+    },
     "highway": {
         "key": "highway",
         "type": "combo",
diff --git a/data/presets/fields/description.json b/data/presets/fields/description.json
new file mode 100644
index 000000000..d7ad5da03
--- /dev/null
+++ b/data/presets/fields/description.json
@@ -0,0 +1,5 @@
+{
+    "key": "description",
+    "type": "textarea",
+    "label": "Description"
+}
\ No newline at end of file
diff --git a/data/presets/fields/fixme.json b/data/presets/fields/fixme.json
new file mode 100644
index 000000000..525edc49d
--- /dev/null
+++ b/data/presets/fields/fixme.json
@@ -0,0 +1,5 @@
+{
+    "key": "fixme",
+    "type": "textarea",
+    "label": "Fix Me"
+}
\ No newline at end of file
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 83d84c714..0c845d584 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -218,7 +218,6 @@
         "show_more": "Show More",
         "new_tag": "New tag",
         "view_on_osm": "View on openstreetmap.org",
-        "editing_feature": "Editing {feature}",
         "all_tags": "All tags",
         "all_members": "All members",
         "all_relations": "All relations",
@@ -480,6 +479,9 @@
             "denotation": {
                 "label": "Denotation"
             },
+            "description": {
+                "label": "Description"
+            },
             "elevation": {
                 "label": "Elevation"
             },
@@ -496,6 +498,9 @@
             "fee": {
                 "label": "Fee"
             },
+            "fixme": {
+                "label": "Fix Me"
+            },
             "highway": {
                 "label": "Type"
             },