From 79b4c37733c435f2a8eb43525187d37531577d41 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer <gautier+git@damsy.net>
Date: Mon, 14 Sep 2015 19:13:30 +0200
Subject: [PATCH] preset.js: trim terms when retrieving translations to avoid
 white spaces

---
 js/id/presets/collection.js | 9 +++++----
 js/id/presets/preset.js     | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/js/id/presets/collection.js b/js/id/presets/collection.js
index f3b9fb2a0..42d7b9638 100644
--- a/js/id/presets/collection.js
+++ b/js/id/presets/collection.js
@@ -31,6 +31,11 @@ iD.presets.Collection = function(collection) {
                     return a.suggestion === true;
                 });
 
+            function leading(a) {
+                var index = a.indexOf(value);
+                return index === 0 || a[index - 1] === ' ';
+            }
+
             // matches value to preset.name
             var leading_name = _.filter(searchable, function(a) {
                     return leading(a.name().toLowerCase());
@@ -50,10 +55,6 @@ iD.presets.Collection = function(collection) {
                     return _.any(_.without(_.values(a.tags || {}), '*'), leading);
                 });
 
-            function leading(a) {
-                var index = a.indexOf(value);
-                return index === 0 || a[index - 1] === ' ';
-            }
 
             // finds close matches to value in preset.name
             var levenstein_name = searchable.map(function(a) {
diff --git a/js/id/presets/preset.js b/js/id/presets/preset.js
index b33d76604..02a1e3572 100644
--- a/js/id/presets/preset.js
+++ b/js/id/presets/preset.js
@@ -46,7 +46,7 @@ iD.presets.Preset = function(id, preset, fields) {
     };
 
     preset.terms = function() {
-        return preset.t('terms', {'default': ''}).toLowerCase().split(/\s*,+\s*/);
+        return preset.t('terms', {'default': ''}).toLowerCase().trim().split(/\s*,+\s*/);
     };
 
     preset.isFallback = function() {