Use {{count}} instead of {{(node|way_relation)_count}} since {{count}}

is a magical enumerated variable in Rails.

diff --git a/app/views/browse/_changeset_details.rhtml b/app/views/browse/_changeset_details.rhtml
index 92002b6e30f7274c4cdc560b72c89d8010bd57c7..24d5da08c3c00d4bb5b2adda0ed15cf24f677a42 100644 (file)
--- a/app/views/browse/_changeset_details.rhtml
+++ b/app/views/browse/_changeset_details.rhtml
@@ -49,7 +49,7 @@
 
   <% unless @nodes.empty? %>
     <tr valign="top">
-      <th><%= t 'browse.changeset_details.has_nodes', :node_count => @node_pages.item_count %></th>
+      <th><%= t 'browse.changeset_details.has_nodes', :count => @node_pages.item_count %></th>
       <td>
         <table cellpadding="0">
           <% @nodes.each do |node| %>
@@ -63,7 +63,7 @@
   
   <% unless @ways.empty? %>
     <tr valign="top">
-      <th><%= t 'browse.changeset_details.has_ways', :way_count => @way_pages.item_count %></th>
+      <th><%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %></th>
       <td>
         <table cellpadding="0">
           <% @ways.each do |way| %>
@@ -80,7 +80,7 @@
   
   <% unless @relations.empty? %>
     <tr valign="top">
-      <th><%= t 'browse.changeset_details.has_relations', :relation_count => @relation_pages.item_count %></th>
+      <th><%= t 'browse.changeset_details.has_relations', :count => @relation_pages.item_count %></th>
       <td>
         <table cellpadding="0">
           <% @relations.each do |relation| %>

diff --git a/config/locales/be.yml b/config/locales/be.yml
index 174e7321742ed0a8aa2de141086b08a0bab5b73d..1ea64082ac121caa2080dc417a26e0bed27c80e9 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -89,9 +89,9 @@ be:
       no_bounding_box: "Межы гэтага набора зменаў не вызначаны."
       show_area_box: "Паказаць мяжу мясцовасці"
       box: "мяжа"
-      has_nodes: "Складаецца з {{node_count}} вузлоў:"
-      has_ways: "Складаецца з {{way_count}} шляхоў:"
-      has_relations: "Складаецца з {{relation_count}} сувязей:"
+      has_nodes: "Складаецца з {{count}} вузлоў:"
+      has_ways: "Складаецца з {{count}} шляхоў:"
+      has_relations: "Складаецца з {{count}} сувязей:"
     common_details: 
       edited_at: "Зменена:"
       edited_by: "Карыстальнікам:"

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 9dd9f5827e8af1eff609eb987c1204732556bdef..52d4bec8dbc183d9fbac94aec106db5f29a5f8f3 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -89,9 +89,9 @@ de:
       no_bounding_box: "Für dieses Changeset wurde kein Bereich gespeichert."
       show_area_box: "Bereichsgrenze anzeigen"
       box: "Bereichsgrenze"
-      has_nodes: "Enthält folgende {{node_count}} Knoten:"
-      has_ways: "Enthält folgende {{way_count}} Wege:"
-      has_relations: "Enthält folgende {{relation_count}} Relationen:"
+      has_nodes: "Enthält folgende {{count}} Knoten:"
+      has_ways: "Enthält folgende {{count}} Wege:"
+      has_relations: "Enthält folgende {{count}} Relationen:"
     common_details: 
       edited_at: "Bearbeitet am:"
       edited_by: "Bearbeitet von:"

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 396fd28d6941f5d081861163f1d3e6e09298d95a..bcbd161566a8988117282628565b7b4f437bc010 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -91,9 +91,9 @@ en:
       no_bounding_box: "No bounding box has been stored for this changeset."
       show_area_box: "Show Area Box"
       box: "box"
-      has_nodes: "Has the following {{node_count}} nodes:"
-      has_ways: "Has the following {{way_count}} ways:"
-      has_relations: "Has the following {{relation_count}} relations:"
+      has_nodes: "Has the following {{count}} nodes:"
+      has_ways: "Has the following {{count}} ways:"
+      has_relations: "Has the following {{count}} relations:"
     common_details: 
       edited_at: "Edited at:"
       edited_by: "Edited by:"

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index c4c734b46b84d9cbe2f85d8004ce9025af0a0f9e..93d43e60e6c454e2c1f204588804126e829b68ee 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -17,9 +17,9 @@ fr:
       no_bounding_box: "Aucune bounding box n'a été stockée pour ce changeset."
       show_area_box: "Montrer la boite"
       box: "boite"
-      has_nodes: "A les {{node_count}} points suivants :"
-      has_ways: "A les {{way_count}} ways suivants :"
-      has_relations: "A les {{relation_count}} relations suivantes :"
+      has_nodes: "A les {{count}} points suivants :"
+      has_ways: "A les {{count}} ways suivants :"
+      has_relations: "A les {{count}} relations suivantes :"
     common_details:
       edited_at: "Édité le :"
       edited_by: "Édité par :"

diff --git a/config/locales/he.yml b/config/locales/he.yml
index d8caf33cbabdccf36c9b47cfb06c312660536154..6ed96ccfbe1474d7ddd9a66bf7c6c384783821dc 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -89,9 +89,9 @@ he:
       no_bounding_box: "No bounding box has been stored for this changeset."
       show_area_box: "Show Area Box"
       box: "box"
-      has_nodes: "Has the following {{node_count}} nodes:"
-      has_ways: "Has the following {{way_count}} ways:"
-      has_relations: "Has the following {{relation_count}} relations:"
+      has_nodes: "Has the following {{count}} nodes:"
+      has_ways: "Has the following {{count}} ways:"
+      has_relations: "Has the following {{count}} relations:"
     common_details: 
       edited_at: "Edited at:"
       edited_by: "Edited by:"

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 810b9611f4563a062ca2dc24316b189849fc7144..8f1473a5d3798b9b32d622c7629c264ef110a849 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -89,9 +89,9 @@ is:
       no_bounding_box: "Engin svæðismörk voru vistuð ásamt þessu breytingarsetti."
       show_area_box: "Sýna svæðismörk á aðalkorti"
       box: "svæðismörk"
-      has_nodes: "Inniheldur {{node_count}} hnúta:"
-      has_ways: "Inniheldur {{way_count}} vegi:"
-      has_relations: "Inniheldur {{relation_count}} vensl:"
+      has_nodes: "Inniheldur {{count}} hnúta:"
+      has_ways: "Inniheldur {{count}} vegi:"
+      has_relations: "Inniheldur {{count}} vensl:"
     common_details: 
       edited_at: "Breytt:"
       edited_by: "Breytt af:"

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 26515477359d17f04896e31ff05fc18f3ce1e474..e0dd8eaeb9d36df90e6d63727b4a254a3647b07b 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -89,9 +89,9 @@ it:
       no_bounding_box: "Per questo gruppo di modifiche non è stato memorizzato alcun riquadro di selezione."
       show_area_box: "Mostra il riquadro dell'area"
       box: "riquadro"
-      has_nodes: "Possiede i seguenti {{node_count}} nodi:"
-      has_ways: "Possiede i seguenti {{way_count}} percorsi:"
-      has_relations: "Possiede le seguenti {{relation_count}} relazioni:"
+      has_nodes: "Possiede i seguenti {{count}} nodi:"
+      has_ways: "Possiede i seguenti {{count}} percorsi:"
+      has_relations: "Possiede le seguenti {{count}} relazioni:"
     common_details:
       edited_at: "Modificato il:"
       edited_by: "Modificato da:"

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index f8a4ffe8f7f6b910a3213a9f12b8977ce5e61c84..3dacc1941e2694344253a3aa58b636a864e97d42 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -89,9 +89,9 @@ nl:
       no_bounding_box: "Geen coördinaten opgeslagen voor deze changeset."
       show_area_box: "Laat gebied zien"
       box: "vak" #good translation?
-      has_nodes: "Bevat de volgende {{node_count}} nodes:"
-      has_ways: "Bevat de volgende {{way_count}} ways:"
-      has_relations: "Bevat de volgende {{relation_count}} relaties:"
+      has_nodes: "Bevat de volgende {{count}} nodes:"
+      has_ways: "Bevat de volgende {{count}} ways:"
+      has_relations: "Bevat de volgende {{count}} relaties:"
     common_details: 
       edited_at: "Bewerkt op:"
       edited_by: "Bewerkt door:"

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 31bec632d713c743999b1a03e1a186eb760728f5..8a7ccaeccedf8433742ae6f123e5f2c177331d4c 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -89,9 +89,9 @@ pl:
       no_bounding_box: "Ten changeset został zapisany bez prostokątu ograniczającego."
       show_area_box: "Pokaż obszar prostokątu"
       box: "prostokąt"
-      has_nodes: "Zawiera następujących {{node_count}} węzłów:"
-      has_ways: "Zawiera następujących {{way_count}} dróg:"
-      has_relations: "Zawiera następujących {{relation_count}} relacji:"
+      has_nodes: "Zawiera następujących {{count}} węzłów:"
+      has_ways: "Zawiera następujących {{count}} dróg:"
+      has_relations: "Zawiera następujących {{count}} relacji:"
     common_details: 
       edited_at: "Edytowano:"
       edited_by: "Edytował(a):"

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 71cd8539125781ce3dd89ce1a5fb4547897df3c6..a2aeef6bd7236c33414b3f935c1225d8c8b6db41 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -89,9 +89,9 @@ ru:
       no_bounding_box: "Для данного сеанса границы не установлены."
       box: "Показать"
       box: "граница"
-      has_nodes: "Содержит {{node_count}} узла(ов):"
-      has_ways: "Содержит {{way_count}} линий:"
-      has_relations: "Содержит {{relation_count}} отношений:"
+      has_nodes: "Содержит {{count}} узла(ов):"
+      has_ways: "Содержит {{count}} линий:"
+      has_relations: "Содержит {{count}} отношений:"
     common_details:
       edited_at: "Изменено:"
       edited_by: "Пользователь:"

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 7d0f4bbdd862f7193df3af16ceda206d0aa867da..a4d915ec28a1677436e4184a5d638383f487df8b 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -91,9 +91,9 @@ sl:
       no_bounding_box: "Ta paket nima določenega pravokotnega področja."
       show_area_box: "Prikaži pravokotno področje"
       box: "področje"
-      has_nodes: "Vsebuje naslednjih {{node_count}} vozlišč:"
-      has_ways: "Vsebuje naslednjih {{way_count}} poti:"
-      has_relations: "Vsebuje naslednjih {{relation_count}} relacij:"
+      has_nodes: "Vsebuje naslednjih {{count}} vozlišč:"
+      has_ways: "Vsebuje naslednjih {{count}} poti:"
+      has_relations: "Vsebuje naslednjih {{count}} relacij:"
     common_details: 
       edited_at: "Urejeno ob:"
       edited_by: "Uredil:"

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 6391c7a9a2526cd9559eacb8de46affb10bf9e58..9886b19e0ea5e6fe9c5f70f508d6ab057160299f 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -89,9 +89,9 @@ zh-CN:
       no_bounding_box: "No bounding box has been stored for this changeset."
       show_area_box: "显示区域窗口"
       box: "box"
-      has_nodes: "有如下{{node_count}}个点:"
-      has_ways: "有如下路径 {{way_count}} :"
-      has_relations: "有如下{{relation_count}}种关系:"
+      has_nodes: "有如下{{count}}个点:"
+      has_ways: "有如下路径 {{count}} :"
+      has_relations: "有如下{{count}}种关系:"
     common_details: 
       edited_at: "Edited at:"
       edited_by: "Edited by:"