From 347177fa7ec4c909b54b78b635741ce6e6310516 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Mon, 14 Aug 2017 12:13:43 -0400
Subject: [PATCH] Restore placeholders

---
 data/core.yaml                   | 2 --
 data/presets.yaml                | 4 ++++
 data/presets/fields.json         | 6 ++++--
 data/presets/fields/comment.json | 3 ++-
 data/presets/fields/source.json  | 5 +++--
 dist/locales/en.json             | 8 ++++----
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/data/core.yaml b/data/core.yaml
index daad1e943..9f45ae26c 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -254,8 +254,6 @@ en:
     rateLimit: The API is limiting anonymous connections.  You can fix this by logging in.
   commit:
     title: Upload to OpenStreetMap
-    description_placeholder: Brief description of your contributions (required)
-    message_label: Changeset Comment
     upload_explanation: "The changes you upload will be visible on all maps that use OpenStreetMap data."
     upload_explanation_with_user: "The changes you upload as {user} will be visible on all maps that use OpenStreetMap data."
     request_review: "I would like someone to review my edits."
diff --git a/data/presets.yaml b/data/presets.yaml
index 8c4726f57..1e4967d01 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -342,6 +342,8 @@ en:
       comment:
         # comment=*
         label: Changeset Comment
+        # comment field placeholder
+        placeholder: Brief description of your contributions (required)
       communication_multi:
         # 'communication:=*'
         label: Communication Types
@@ -1225,6 +1227,8 @@ en:
       source:
         # source=*
         label: Source
+        # source field placeholder
+        placeholder: 'survey, local knowledge, aerial imagery'
       sport:
         # sport=*
         label: Sports
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 1a083f6d6..dcb437a6c 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -440,7 +440,8 @@
         "comment": {
             "key": "comment",
             "type": "textarea",
-            "label": "Changeset Comment"
+            "label": "Changeset Comment",
+            "placeholder": "Brief description of your contributions (required)"
         },
         "communication_multi": {
             "key": "communication:",
@@ -1637,7 +1638,8 @@
             "type": "text",
             "icon": "source",
             "universal": true,
-            "label": "Source"
+            "label": "Source",
+            "placeholder": "survey, local knowledge, aerial imagery"
         },
         "sport_ice": {
             "key": "sport",
diff --git a/data/presets/fields/comment.json b/data/presets/fields/comment.json
index 1c213deb4..71072e1d4 100644
--- a/data/presets/fields/comment.json
+++ b/data/presets/fields/comment.json
@@ -1,5 +1,6 @@
 {
     "key": "comment",
     "type": "textarea",
-    "label": "Changeset Comment"
+    "label": "Changeset Comment",
+    "placeholder": "Brief description of your contributions (required)"
 }
diff --git a/data/presets/fields/source.json b/data/presets/fields/source.json
index 0cad9fa73..e1464d99b 100644
--- a/data/presets/fields/source.json
+++ b/data/presets/fields/source.json
@@ -3,5 +3,6 @@
     "type": "text",
     "icon": "source",
     "universal": true,
-    "label": "Source"
-}
\ No newline at end of file
+    "label": "Source",
+    "placeholder": "survey, local knowledge, aerial imagery"
+}
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 9f4ddb770..c8a5570a1 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -328,8 +328,6 @@
         },
         "commit": {
             "title": "Upload to OpenStreetMap",
-            "description_placeholder": "Brief description of your contributions (required)",
-            "message_label": "Changeset Comment",
             "upload_explanation": "The changes you upload will be visible on all maps that use OpenStreetMap data.",
             "upload_explanation_with_user": "The changes you upload as {user} will be visible on all maps that use OpenStreetMap data.",
             "request_review": "I would like someone to review my edits.",
@@ -1356,7 +1354,8 @@
                     "label": "Collection Times"
                 },
                 "comment": {
-                    "label": "Changeset Comment"
+                    "label": "Changeset Comment",
+                    "placeholder": "Brief description of your contributions (required)"
                 },
                 "communication_multi": {
                     "label": "Communication Types"
@@ -2101,7 +2100,8 @@
                     "label": "Type"
                 },
                 "source": {
-                    "label": "Source"
+                    "label": "Source",
+                    "placeholder": "survey, local knowledge, aerial imagery"
                 },
                 "sport_ice": {
                     "label": "Sports"