From a02b6e95256f8909d1cc0311f1672a70e1ef0c9e Mon Sep 17 00:00:00 2001
From: Benjamin Gerber <benjamin.gerber@camptocamp.com>
Date: Tue, 24 Oct 2017 10:47:50 +0200
Subject: [PATCH] Use ng-attr to bind interpolated attributes

---
 .../gmf/src/directives/partials/authentication.html    | 10 +++++-----
 contribs/gmf/src/directives/partials/featurestyle.html |  2 +-
 contribs/gmf/src/directives/partials/print.html        |  6 +++---
 contribs/gmf/src/directives/partials/search.html       |  2 +-
 contribs/gmf/src/directives/partials/share.html        |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/contribs/gmf/src/directives/partials/authentication.html b/contribs/gmf/src/directives/partials/authentication.html
index 0435f6102d6a..52cefef763e0 100644
--- a/contribs/gmf/src/directives/partials/authentication.html
+++ b/contribs/gmf/src/directives/partials/authentication.html
@@ -42,7 +42,7 @@
           class="form-control"
           name="oldpassword"
           ng-model="authCtrl.oldPwdVal"
-          placeholder="{{'Old password' | translate}}"/>
+          ng-attr-placeholder="{{'Old password' | translate}}"/>
     </div>
     <div class="form-group">
       <input
@@ -50,7 +50,7 @@
           class="form-control"
           name="newpassword"
           ng-model="authCtrl.newPwdVal"
-          placeholder="{{'New password' | translate}}"/>
+          ng-attr-placeholder="{{'New password' | translate}}"/>
     </div>
     <div class="form-group">
       <input
@@ -58,7 +58,7 @@
           class="form-control"
           name="newpasswordconfirm"
           ng-model="authCtrl.newPwdConfVal"
-          placeholder="{{'Confirm new password' | translate}}"/>
+          ng-attr-placeholder="{{'Confirm new password' | translate}}"/>
     </div>
     <div class="form-group">
       <input
@@ -114,7 +114,7 @@ <h4 class="modal-title">
           class="form-control"
           name="login"
           ng-model="authCtrl.loginVal"
-          placeholder="{{'Username' | translate}}" />
+          ng-attr-placeholder="{{'Username' | translate}}" />
     </div>
     <div class="form-group">
       <input
@@ -122,7 +122,7 @@ <h4 class="modal-title">
           class="form-control"
           name="password"
           ng-model="authCtrl.pwdVal"
-          placeholder="{{'Password' | translate}}"/>
+          ng-attr-placeholder="{{'Password' | translate}}"/>
     </div>
     <div class="form-group">
     <input
diff --git a/contribs/gmf/src/directives/partials/featurestyle.html b/contribs/gmf/src/directives/partials/featurestyle.html
index 1d8e54b4cbf8..df6b568c57c1 100644
--- a/contribs/gmf/src/directives/partials/featurestyle.html
+++ b/contribs/gmf/src/directives/partials/featurestyle.html
@@ -3,7 +3,7 @@
     <input
         ng-model="fsCtrl.getSetName"
         ng-model-options="{getterSetter: true}"
-        placeholder="{{'Name' | translate}}"
+        ng-attr-placeholder="{{'Name' | translate}}"
         class="form-control"/>
   </div>
 </div>
diff --git a/contribs/gmf/src/directives/partials/print.html b/contribs/gmf/src/directives/partials/print.html
index e958d4b07906..b87abca1cf76 100644
--- a/contribs/gmf/src/directives/partials/print.html
+++ b/contribs/gmf/src/directives/partials/print.html
@@ -10,21 +10,21 @@
         ng-model="customField.value"
         class="form-control"
         type="number"
-        placeholder="{{customField.name | translate}}">
+        ng-attr-placeholder="{{customField.name | translate}}">
 
       <input
         ng-if="customField.type === 'text'"
         ng-model="customField.value"
         class="form-control"
         type="text"
-        placeholder="{{customField.name | translate}}">
+        ng-attr-placeholder="{{customField.name | translate}}">
 
       <textarea
         ng-if="customField.type === 'textarea'"
         ng-model="customField.value"
         class="form-control"
         row="3"
-        placeholder="{{customField.name | translate}}"></textarea>
+        ng-attr-placeholder="{{customField.name | translate}}"></textarea>
 
       <div
         ng-if="customField.type === 'checkbox'"
diff --git a/contribs/gmf/src/directives/partials/search.html b/contribs/gmf/src/directives/partials/search.html
index 69ce19f50f45..661665c49556 100644
--- a/contribs/gmf/src/directives/partials/search.html
+++ b/contribs/gmf/src/directives/partials/search.html
@@ -1,5 +1,5 @@
 <div class="gmf-search">
-  <input type="text" placeholder="{{ctrl.placeholder}}"
+  <input type="text" ng-attr-placeholder="{{ctrl.placeholder}}"
     class="form-control"
     ng-model="ctrl.inputValue"
     ngeo-search="ctrl.options"
diff --git a/contribs/gmf/src/directives/partials/share.html b/contribs/gmf/src/directives/partials/share.html
index 6b874b988f74..389c69b9d643 100644
--- a/contribs/gmf/src/directives/partials/share.html
+++ b/contribs/gmf/src/directives/partials/share.html
@@ -21,7 +21,7 @@ <h4 class="modal-title" translate>Share this map</h4>
     <div class="gmf-share-email" ng-if="::shareCtrl.enableEmail">
       <div class="form-group">
         <label for="gmfShareInputEmail" translate>Send this link to</label>
-        <input type="email" class="form-control"  name="inputEmail" id="gmfShareInputEmail" placeholder="Email" ng-model="shareCtrl.email" required>
+        <input type="email" class="form-control"  name="inputEmail" id="gmfShareInputEmail" placeholder="E-mail" ng-model="shareCtrl.email" required>
         <span ng-show="gmfShareForm.$submitted || gmfShareForm.inputEmail.$touched">
           <span class="text-danger" ng-show="gmfShareForm.inputEmail.$error.email || gmfShareForm.inputEmail.$error.required">
             <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
@@ -29,7 +29,7 @@ <h4 class="modal-title" translate>Share this map</h4>
         </span>
       </div>
       <div class="form-group">
-        <textarea class="form-control" placeholder="{{'Message (optional)' | translate }}" ng-model="shareCtrl.message"></textarea>
+        <textarea class="form-control" ng-attr-placeholder="{{'Message (optional)' | translate }}" ng-model="shareCtrl.message"></textarea>
       </div>
       <span class="text-success" ng-if="shareCtrl.successfullySent">
         <i class="fa fa-check" aria-hidden="true"></i>