The relation browser used the translated nominative model names of

Node/Way/Relation in /browse/relation/:id. And used the bad practice
of concating things together to translate them.

Fixed it to use translation variables.

diff --git a/app/views/browse/_relation_member.html.erb b/app/views/browse/_relation_member.html.erb
index ead58490cd6f014e53efcfe30956626e36dd1236..cee2e0e75b7157aeb7fcf1f95d0d525aab3c2c06 100644 (file)
--- a/app/views/browse/_relation_member.html.erb
+++ b/app/views/browse/_relation_member.html.erb
@@ -1,10 +1,12 @@
 <tr>
 <tr>

-  <td>
-    <%= t 'activerecord.models.'+relation_member.member_type.downcase %>
-    <%= link_to h(printable_name(relation_member.member)), :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s %>
-    <% unless relation_member.member_role.blank? %>
-      <%= t'browse.relation_member.as' %>
-      <%= h(relation_member.member_role) %>
-    <% end %>
-  </td>
+  <td><%=
+    linked_name = link_to h(printable_name(relation_member.member)), :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s
+    type_str = t'browse.relation_member.type.' + relation_member.member_type.downcase
+
+    if relation_member.member_role.blank?
+      t'browse.relation_member.entry', :type => type_str, :name => linked_name
+    else
+      t'browse.relation_member.entry_role', :type => type_str, :name => linked_name, :role => h(relation_member.member_role)
+    end
+  %></td>

 </tr> 
 </tr> 

diff --git a/config/locales/be.yml b/config/locales/be.yml
index 03e983b3c11f4cbad03e62682ec84aa55bf7d578..88b6047e2b3e57357b44ad81d25c3149f8eade3f 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -128,8 +128,6 @@ be:
     relation_history:
       relation_history: "Гісторыя сувязі"
       relation_history_title: "Гісторыя сувязі: {{relation_name}}"
     relation_history:
       relation_history: "Гісторыя сувязі"
       relation_history_title: "Гісторыя сувязі: {{relation_name}}"

-    relation_member:
-      as: "як"

     relation:
       relation: "Сувязь"
       relation_title: "Сувязь: {{relation_name}}"
     relation:
       relation: "Сувязь"
       relation_title: "Сувязь: {{relation_name}}"

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 3440e84b647c1bceb3a0c0f52424f15e27510ca8..26a31456e45901fd16f6808dbe202575b0f40e09 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -129,8 +129,6 @@ ca:
     relation_history:
       relation_history: "Historial de la relació"
       relation_history_title: "Historial de la relació: {{relation_name}}"
     relation_history:
       relation_history: "Historial de la relació"
       relation_history_title: "Historial de la relació: {{relation_name}}"

-    relation_member:
-      as: "com a"

     relation:
       relation: "Relació"
       relation_title: "Relació: {{relation_name}}"
     relation:
       relation: "Relació"
       relation_title: "Relació: {{relation_name}}"

diff --git a/config/locales/de.yml b/config/locales/de.yml
index ecb9de47b4e88018748a9f86213ddccaf6ea7fb6..5a19ccd6d0b62b44d78dbaffdc9589c26c1d3f97 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -135,8 +135,6 @@ de:
     relation_history:
       relation_history: "Relations-Chronik"
       relation_history_title: "Relations-Chronik: {{relation_name}}"
     relation_history:
       relation_history: "Relations-Chronik"
       relation_history_title: "Relations-Chronik: {{relation_name}}"

-    relation_member:
-      as: "des Typs"

     relation:
       relation: "Relation"
       relation_title: "Relation: {{relation_name}}"
     relation:
       relation: "Relation"
       relation_title: "Relation: {{relation_name}}"

diff --git a/config/locales/el.yml b/config/locales/el.yml
index 5b1e986fa54aa55234aec59030d9436bb1ff361f..0e98f4f558c5b6a404dae3f5d65f0f82e4863b8e 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -134,8 +134,6 @@ el:
    relation_history:
      relation_history: "Ιστορια σχέσης"
      relation_history_title: "Ιστορια σχέσης: {{relation_name}}"
    relation_history:
      relation_history: "Ιστορια σχέσης"
      relation_history_title: "Ιστορια σχέσης: {{relation_name}}"

-   relation_member:
-     as: "as"

    relation:
      relation: "Σχέση"
      relation_title: "Σχέση: {{relation_name}}"
    relation:
      relation: "Σχέση"
      relation_title: "Σχέση: {{relation_name}}"

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1bd6ab5321febc094a20a726bfc5c987b798a6f6..0c77fd6c7ce3af37e0dd8cec21933905ad4b22cf 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -142,7 +142,12 @@ en:
       relation_history: "Relation History"
       relation_history_title: "Relation History: {{relation_name}}"
     relation_member:
       relation_history: "Relation History"
       relation_history_title: "Relation History: {{relation_name}}"
     relation_member:

-      as: "as"
+      entry: "{{type}} {{name}}"
+      entry_role: "{{type}} {{name}} as {{role}}"
+      type:
+        node: "Node"
+        way: "Way"
+        relation: "Relation"

     relation:
       relation: "Relation"
       relation_title: "Relation: {{relation_name}}"
     relation:
       relation: "Relation"
       relation_title: "Relation: {{relation_name}}"

diff --git a/config/locales/es.yml b/config/locales/es.yml
index b3928cfa0aaf4f00874764549351033c86108770..e8b5f63d500d9d26a9d2284c73d1fe0b7b14493b 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -130,8 +130,6 @@ es:
     relation_history:
       relation_history: "Historial de la relación"
       relation_history_title: "Historial de la relación {{relation_name}}:"
     relation_history:
       relation_history: "Historial de la relación"
       relation_history_title: "Historial de la relación {{relation_name}}:"

-    relation_member:
-      as: "como"

     relation:
       relation: "Relación"
       relation_title: "Relación {{relation_name}}:"
     relation:
       relation: "Relación"
       relation_title: "Relación {{relation_name}}:"

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 055f050bb1bd25ecbb92fe131fc41cb293484e59..1bb4b8e80708c0e21f1ec65627b96846f3700c7c 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -128,8 +128,6 @@ he:
     relation_history:
       relation_history: "Relation History"
       relation_history_title: "Relation History: {{relation_name}}"
     relation_history:
       relation_history: "Relation History"
       relation_history_title: "Relation History: {{relation_name}}"

-    relation_member:
-      as: "as"

     relation:
       relation: "Relation"
       relation_title: "Relation: {{relation_name}}"
     relation:
       relation: "Relation"
       relation_title: "Relation: {{relation_name}}"

diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 458633a447f5e4b920887ae81634a113a9a10143..33f937b5f14a72381cb4eb594bfbce6e720e1135 100644 (file)
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -132,8 +132,6 @@ hi:
     relation_history:
       relation_history: "संबंध का इतिहास"
       relation_history_title: "इस संबंध का इतिहास: {{relation_name}}"
     relation_history:
       relation_history: "संबंध का इतिहास"
       relation_history_title: "इस संबंध का इतिहास: {{relation_name}}"

-    relation_member:
-      as: "जैसे"

     relation:
       relation: "संबंध"
       relation_title: "संबंध: {{relation_name}}"
     relation:
       relation: "संबंध"
       relation_title: "संबंध: {{relation_name}}"

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 677b769393d6a13b7cb103f7f36058175ea295f9..239d53578513adc80088f3f214dc66742a07fae6 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -141,7 +141,12 @@ is:
       relation_history: "Breytingarskrá vensla "
       relation_history_title: "Breytingarskrá vensla: {{relation_name}}"
     relation_member:
       relation_history: "Breytingarskrá vensla "
       relation_history_title: "Breytingarskrá vensla: {{relation_name}}"
     relation_member:

-      as: "sem"
+      entry: "{{type}} {{name}}"
+      entry_role: "{{type}} {{name}} sem „{{role}}“"
+      type:
+        node: "Hnúturinn"
+        way: "Vegurinn"
+        relation: "Venslin"

     relation:
       relation: "Vensl"
       relation_title: "Vensl: {{relation_name}}"
     relation:
       relation: "Vensl"
       relation_title: "Vensl: {{relation_name}}"

diff --git a/config/locales/it.yml b/config/locales/it.yml
index b48f37848727cb8a6d28a89a27d55325babdfc82..dafcc628b5f4c79b6d9cda88d5946c2c6414d9d8 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -128,8 +128,6 @@ it:
     relation_history:
       relation_history: "Storico della relazione"
       relation_history_title: "Storico della relazione: {{relation_name}}"
     relation_history:
       relation_history: "Storico della relazione"
       relation_history_title: "Storico della relazione: {{relation_name}}"

-    relation_member:
-      as: "come"

     relation:
       relation: "Relazione"
       relation_title: "Relazione: {{relation_name}}"
     relation:
       relation: "Relazione"
       relation_title: "Relazione: {{relation_name}}"

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 3914d06a9a0e47244de1cab9959c7fab8b6615f2..90ecb6f576c3c8eb5a4b1e4000bc6541580bac6f 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -134,8 +134,6 @@ ja:
     relation_history:
       relation_history: "関連の履歴"
       relation_history_title: "関連の履歴: {{relation_name}}"
     relation_history:
       relation_history: "関連の履歴"
       relation_history_title: "関連の履歴: {{relation_name}}"

-    relation_member:
-      as: "as"

     relation:
       relation: "関連"
       relation_title: "関連: {{relation_name}}"
     relation:
       relation: "関連"
       relation_title: "関連: {{relation_name}}"

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 5130c006ec4a2898b8cdaaba2c570bdefefa3a77..803a8915d8a0ed2839f41bcfac0ce201053c6efd 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -134,8 +134,6 @@ ko:
     relation_history:
       relation_history: "관계 이력"
       relation_history_title: "관계 이력: {{relation_name}}"
     relation_history:
       relation_history: "관계 이력"
       relation_history_title: "관계 이력: {{relation_name}}"

-    relation_member:
-      as: "as"

     relation:
       relation: "관계"
       relation_title: "관계: {{relation_name}}"
     relation:
       relation: "관계"
       relation_title: "관계: {{relation_name}}"

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index e32d3820300e2455624fa04f18c798cdbb1cd2f9..7df253dc1293226b6db65a7a770f433c6521ac6f 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -128,8 +128,6 @@ nl:
     relation_history:
       relation_history: "Relatie-geschiedenis"
       relation_history_title: "Relatie-geschiedenis: {{relation_name}}"
     relation_history:
       relation_history: "Relatie-geschiedenis"
       relation_history_title: "Relatie-geschiedenis: {{relation_name}}"

-    relation_member:
-      as: "als"

     relation:
       relation: "Relatie"
       relation_title: "Relatie: {{relation_name}}"
     relation:
       relation: "Relatie"
       relation_title: "Relatie: {{relation_name}}"

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 1cf36ab7e4e9fb54518c61e2a77b95f1a2bb37d6..5958a4dccd1c9e2c7e46d29bec1d26012e5dc27b 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -128,8 +128,6 @@ pl:
     relation_history:
       relation_history: "Historia zmian relacji"
       relation_history_title: "Historia relacji: {{relation_name}}"
     relation_history:
       relation_history: "Historia zmian relacji"
       relation_history_title: "Historia relacji: {{relation_name}}"

-    relation_member:
-      as: "jako"

     relation:
       relation: "Relacja"
       relation_title: "Relacja: {{relation_name}}"
     relation:
       relation: "Relacja"
       relation_title: "Relacja: {{relation_name}}"

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 6c5590df7fcf133ef69456b10de391969835062f..eeb4fa1a0e687945514327f5e83382262d3e1ca3 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -134,8 +134,6 @@ pt-BR:
     relation_history:
       relation_history: "Histórico de Relação"
       relation_history_title: "Histórico da Relação: {{relation_name}}"
     relation_history:
       relation_history: "Histórico de Relação"
       relation_history_title: "Histórico da Relação: {{relation_name}}"

-    relation_member:
-      as: "como"

     relation:
       relation: "Relação"
       relation_title: "Relação: {{relation_name}}"
     relation:
       relation: "Relação"
       relation_title: "Relação: {{relation_name}}"

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 5aeb63806ae93a67a29f6d6a32a1b409e0518b22..1e56b1411441a1000fb0f5561c89ab6839b0bde4 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -128,8 +128,6 @@ ru:
     relation_history:
       relation_history: "История отношения"
       relation_history_title: "История отношения {{relation_name}}"
     relation_history:
       relation_history: "История отношения"
       relation_history_title: "История отношения {{relation_name}}"

-    relation_member:
-      as: "в роли"

     relation:
       relation: "Отношение"
       relation_title: "Отношение: {{relation_name}}"
     relation:
       relation: "Отношение"
       relation_title: "Отношение: {{relation_name}}"

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index cafa4c2220181ae8176146feb8ddf0142fffcb8d..6516938fc04bea1af94feeb3ea682fcfc8457393 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -141,8 +141,6 @@ sl:
     relation_history:
       relation_history: "Zgodovina relacije"
       relation_history_title: "Zgodovina relacije: {{relation_name}}"
     relation_history:
       relation_history: "Zgodovina relacije"
       relation_history_title: "Zgodovina relacije: {{relation_name}}"

-    relation_member:
-      as: "kot"

     relation:
       relation: "Relacija"
       relation_title: "Relacija: {{relation_name}}"
     relation:
       relation: "Relacija"
       relation_title: "Relacija: {{relation_name}}"

diff --git a/config/locales/yo.yml b/config/locales/yo.yml
index 9a0e7019ea4decd28b7f95c6c98ef614834cbd90..cc08c38078123432279efc257a27d405fac892f9 100644 (file)
--- a/config/locales/yo.yml
+++ b/config/locales/yo.yml
@@ -134,8 +134,6 @@ yo:
     relation_history:
       relation_history: "Relation History"
       relation_history_title: "Relation History: {{relation_name}}"
     relation_history:
       relation_history: "Relation History"
       relation_history_title: "Relation History: {{relation_name}}"

-    relation_member:
-      as: "as"

     relation:
       relation: "Relation"
       relation_title: "Relation: {{relation_name}}"
     relation:
       relation: "Relation"
       relation_title: "Relation: {{relation_name}}"

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index e13ebcbe9ba5d99d03619d61510b491af9e23be7..be0c7bca6f0a3bd09e5be7ce3594b3c2611b9a00 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -132,8 +132,6 @@ zh-CN:
     relation_history:
       relation_history: "关系历史"
       relation_history_title: "关系历史: {{relation_name}}"
     relation_history:
       relation_history: "关系历史"
       relation_history_title: "关系历史: {{relation_name}}"

-    relation_member:
-      as: "as"

     relation:
       relation: "关系"
       relation_title: "关系: {{relation_name}}"
     relation:
       relation: "关系"
       relation_title: "关系: {{relation_name}}"

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 39f79a9357d07cbce6eef59e39108783ed037bbb..cbbbc6825eb79a775590f9fc3c173aa5efad62a7 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -134,8 +134,6 @@ zh-TW:
     relation_history:
       relation_history: "關係歷史紀錄"
       relation_history_title: "關係歷史紀錄： {{relation_name}}"
     relation_history:
       relation_history: "關係歷史紀錄"
       relation_history_title: "關係歷史紀錄： {{relation_name}}"

-    relation_member:
-      as: "為"

     relation:
       relation: "關係"
       relation_title: "關係： {{relation_name}}"
     relation:
       relation: "關係"
       relation_title: "關係： {{relation_name}}"