Merge remote-tracking branch 'upstream/pull/1800'

diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js
index 1a3e0d4ecae558056b2b9867c4ea2ea0fe4b9920..7fda7f7f0b118f1e9b6c52e21cb849ca1e4b44f4 100644 (file)
--- a/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@ -53,6 +53,10 @@ OSM.Directions = function (map) {
       }
     });
 
+    input.on("keydown", function() {
+      input.removeClass("highlight_error");
+    });
+
     input.on("change", function (e) {
       awaitingGeocode = true;
       
@@ -86,7 +90,8 @@ OSM.Directions = function (map) {
         endpoint.awaitingGeocode = false;
         endpoint.hasGeocode = true;
         if (json.length === 0) {
-          alert(I18n.t('javascripts.directions.errors.no_place'));
+          alert(I18n.t('javascripts.directions.errors.no_place', {place: endpoint.value}));
+          input.addClass("highlight_error");
           return;
         }
 

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 4353e5e659d85628ff9a8f175d291ffdd4465652..462cc50a71c5a55e10f47c414e1d13cee93ace93 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -938,6 +938,10 @@ header .search_forms,
     border-radius: 0 2px 2px 0;
   }
 
+  input.highlight_error {
+    background-color: rgba(255, 0, 0, 0.5);
+  }
+
   select {
     /* this next line is to polyfill the vertical alignment of text within a select element,
      * which is different between firefox and chrome. */

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2aca45255291e4d609731038019d52b31d777686..8a12d10a18e133d8a8f39e75aa2689eba067bb8b 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2325,7 +2325,7 @@ en:
       distance: "Distance"
       errors:
         no_route: "Couldn't find a route between those two places."
-        no_place: "Sorry - couldn't find that place."
+        no_place: "Sorry - couldn't locate '%{place}'."
       instructions:
         continue_without_exit: Continue on %{name}
         slight_right_without_exit: Slight right onto %{name}