From a515058ca74e326307a10ac868d745904cae4bc7 Mon Sep 17 00:00:00 2001
From: vng <viktor.govako@gmail.com>
Date: Wed, 1 Jul 2015 10:24:27 +0300
Subject: [PATCH] [categories] Correct synonyms for new languages.

---
 data/categories.txt           | 26 +++++++++++++-------------
 indexer/categories_holder.cpp |  5 ++---
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/data/categories.txt b/data/categories.txt
index 8f50ce5a0f..44b2958257 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -24,8 +24,8 @@ sv:3bankomat|pengar
 vi:2máy atm|tiền
 id:2atm|uang
 ro:3bancomat|bani
-nb:2penger
-fi:2raha
+nb:2penger|minibank
+fi:2raha|pankkiautomaatti
 
 amenity-bank
 en:3bank|money
@@ -227,7 +227,7 @@ sv:3bensinstation|3bränsle|2gas|3bensin
 vi:trạm xăng|khí đốt
 id:pompa bensin|bahan bakar
 ro:3benzinărie|benzină
-nb:3bensinstasjon
+nb:3bensinstasjon|drivstoff
 fi:3huoltoasema
 
 shop-bakery
@@ -1616,10 +1616,10 @@ da:3parkering
 tr:3otopark
 sv:3parkering
 vi:đỗ xe
-id:parkir
-ro:parcare
-nb:parkering
-fi:parkkipaikka
+id:3parkir
+ro:3parcare
+nb:3parkering
+fi:3parkkipaikka
 
 amenity-pharmacy
 en:3pharmacy|3drugstore|apothecary|dispensary
@@ -1643,12 +1643,12 @@ zh-Hans:1药店|药店|药剂师
 ar:الصيدلية
 da:3apotek
 tr:3eczane
-sv:3apotek|3apotek|apotekare|apotek
-vi:bệnh viện
-id:apotek
-ro:farmacie
-nb:apotek
-fi:apteekki
+sv:3apotek|apotekare
+vi:3hiệu thuốc
+id:3apotek
+ro:3farmacie
+nb:3apotek
+fi:3apteekki
 
 amenity-post_box
 en:3postbox|post
diff --git a/indexer/categories_holder.cpp b/indexer/categories_holder.cpp
index 883480b79a..e1d6dd546c 100644
--- a/indexer/categories_holder.cpp
+++ b/indexer/categories_holder.cpp
@@ -65,9 +65,8 @@ bool CategoriesHolder::ValidKeyToken(StringT const & s)
     return true;
 
   /// @todo We need to have global stop words array for the most used languages.
-  char const * arr[] = { "a", "z", "s", "d", "di", "de", "le", "wi", "fi", "ra", "xe", "ao" };
-  for (size_t i = 0; i < ARRAY_SIZE(arr); ++i)
-    if (s.IsEqualAscii(arr[i]))
+  for (char const * token : { "a", "z", "s", "d", "di", "de", "le", "wi", "fi", "ra", "ao" })
+    if (s.IsEqualAscii(token))
       return false;
 
   return true;