From 42be94c97f750526238b26efc78356c20b336ebe Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 11 Mar 2013 20:15:28 -0700
Subject: [PATCH] Localize address placeholders

---
 js/id/presets/form.js      | 6 +++++-
 js/id/ui/preset/address.js | 8 ++++----
 locale/en.js               | 8 +++++++-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/js/id/presets/form.js b/js/id/presets/form.js
index e0e232d2a..79135b076 100644
--- a/js/id/presets/form.js
+++ b/js/id/presets/form.js
@@ -1,8 +1,12 @@
 iD.presets.Form = function(form, id) {
     form = _.clone(form);
 
+    form.t = function(scope, options) {
+        return t('presets.forms.' + id + '.' + scope, options);
+    };
+
     form.label = function() {
-        return t('presets.forms.' + id + '.label', {default: form.key});
+        return form.t('label', {default: form.key});
     };
 
     return form;
diff --git a/js/id/ui/preset/address.js b/js/id/ui/preset/address.js
index 777a74eb7..3989a731f 100644
--- a/js/id/ui/preset/address.js
+++ b/js/id/ui/preset/address.js
@@ -43,7 +43,7 @@ iD.ui.preset.address = function(form, context) {
 
         housename = selection.append('input')
             .property('type', 'text')
-            .attr('placeholder', 'Housename')
+            .attr('placeholder', form.t('placeholders.housename'))
             .attr('class', 'addr-housename')
             .on('blur', change)
             .on('change', change)
@@ -51,7 +51,7 @@ iD.ui.preset.address = function(form, context) {
 
         housenumber = selection.append('input')
             .property('type', 'text')
-            .attr('placeholder', '123')
+            .attr('placeholder', form.t('placeholders.number'))
             .attr('class', 'addr-number')
             .on('blur', change)
             .on('change', change)
@@ -62,14 +62,14 @@ iD.ui.preset.address = function(form, context) {
 
         street = streetwrap.append('input')
             .property('type', 'text')
-            .attr('placeholder', 'Street')
+            .attr('placeholder', form.t('placeholders.street'))
             .attr('class', 'addr-street')
             .on('blur', change)
             .on('change', change);
 
         city = selection.append('input')
             .property('type', 'text')
-            .attr('placeholder', 'City')
+            .attr('placeholder', form.t('placeholders.city'))
             .attr('class', 'addr-city')
             .on('blur', change)
             .on('change', change)
diff --git a/locale/en.js b/locale/en.js
index 0ca323771..b84079553 100644
--- a/locale/en.js
+++ b/locale/en.js
@@ -248,7 +248,13 @@ locale.en = {
                 "label": "Access"
             },
             "address": {
-                "label": "Address"
+                "label": "Address",
+                "placeholders": {
+                    "housename": "Housename",
+                    "number": "123",
+                    "street": "Street",
+                    "city": "City"
+                }
             },
             "atm": {
                 "label": "ATM"