From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Sun, 28 Jun 2009 19:47:57 +0000 (+0000)
Subject: Another commit in the spirit of [16199]: Don't enforce word order for translations.
X-Git-Tag: live~6918
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/91a6ed60c1004f2d88cd49e1b3f2e9ef75dabc07

Another commit in the spirit of [16199]: Don't enforce word order for translations.
---

diff --git a/app/views/browse/_containing_relation.html.erb b/app/views/browse/_containing_relation.html.erb
index ee704acc8..474e80f78 100644
--- a/app/views/browse/_containing_relation.html.erb
+++ b/app/views/browse/_containing_relation.html.erb
@@ -1,8 +1,11 @@
 <tr>
-  <td>
-    <%= link_to t('browse.containing_relation.relation', :relation_name => h(printable_name(containing_relation.relation))), :action => "relation", :id => containing_relation.relation.id.to_s %>
-    <% unless containing_relation.member_role.blank? %>
-      <%= t 'browse.containing_relation.relation_as', :relation_role => h(containing_relation.member_role) %>
-    <% end %>
-  </td>
+  <td><%=
+    linked_name = link_to h(printable_name(containing_relation.relation)), :action => "relation", :id => containing_relation.relation.id.to_s
+
+    if containing_relation.member_role.blank?
+      t 'browse.containing_relation.entry', :relation_name => linked_name
+    else
+      t 'browse.containing_relation.entry_role', :relation_name => linked_name, :relation_role => h(containing_relation.member_role)
+    end
+  %></td>
 </tr>
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 88b6047e2..4eba9b432 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -98,8 +98,8 @@ be:
       version: "Версія:"
       in_changeset: "У наборы зменаў:"
     containing_relation:
-      relation: "Сувязь {{relation_name}}"
-      relation_as: "(як {{relation_role}})"
+      entry: "Сувязь {{relation_name}}"
+      entry_role: "Сувязь {{relation_name}} (як {{relation_role}})"
     map:
       loading: "Загрузка..."
       deleted: "Выдалены"
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 26a31456e..e9c2be56e 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -95,8 +95,8 @@ ca:
       version: "Versió"
       in_changeset: "Al conjunt de canvis:"
     containing_relation:
-      relation: "Relació {{relation_name}}"
-      relation_as: "(com a  {{relation_role}})"
+      entry: "Relació {{relation_name}}"
+      entry_role: "Relació {{relation_name}} (com a  {{relation_role}})"
     map:
       loading: "Carregant..."
       deleted: "Esborrat"
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 5a19ccd6d..7a751f806 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -100,8 +100,8 @@ de:
       version: "Version:"
       in_changeset: "Im Changeset:"
     containing_relation:
-      relation: "Relation {{relation_name}}"
-      relation_as: "(als {{relation_role}})"
+      entry: "Relation {{relation_name}}"
+      entry_role: "Relation {{relation_name}} (als {{relation_role}})"
     map:
       loading: "Laden..."
       deleted: "Gelöscht"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e7e2e5637..077af5011 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -100,8 +100,8 @@ en:
       version: "Version:"
       in_changeset: "In changeset:"
     containing_relation:
-      relation: "Relation {{relation_name}}"
-      relation_as: "(as {{relation_role}})"
+      entry: "Relation {{relation_name}}"
+      entry_role: "Relation {{relation_name}} (as {{relation_role}})"
     map:
       loading: "Loading..."
       deleted: "Deleted"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index e8b5f63d5..e36a7d9d5 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -96,8 +96,8 @@ es:
       version: "Versión:"
       in_changeset: "En el conjunto de cambios:"
     containing_relation:
-      relation: "Relación {{relation_name}}"
-      relation_as: "(como {{relation_role}})"
+      entry: "Relación {{relation_name}}"
+      entry_role: "Relación {{relation_name}} (como {{relation_role}})"
     map:
       loading: "Cargando..."
       deleted: "Borrado"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index a7f651734..521ebe59b 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -26,8 +26,8 @@ fr:
       version: "Version :"
       in_changeset: "Dans le changeset :"
     containing_relation:
-      relation: "Relation {{relation_name}}"
-      relation_as: "(en tant que {{relation_role}})"
+      entry: "Relation {{relation_name}}"
+      entry_role: "Relation {{relation_name}} (en tant que {{relation_role}})"
     map:
       loading: "Chargement..."
       deleted: "Effacé"
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 1bb4b8e80..3f7f38b09 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -98,8 +98,8 @@ he:
       version: "Version:"
       in_changeset: "In changeset:"
     containing_relation:
-      relation: "Relation {{relation_name}}"
-      relation_as: "(as {{relation_role}})"
+      entry: "Relation {{relation_name}}"
+      entry_role: "Relation {{relation_name}} (as {{relation_role}})"
     map:
       loading: "Loading..."
       deleted: "Deleted"
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 33f937b5f..e9f1b6611 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -98,8 +98,8 @@ hi:
       version: "संस्करण:"
       in_changeset: "इस changeset का अंग:"
     containing_relation:
-      relation: "संबंध {{relation_name}}"
-      relation_as: "(as {{relation_role}})"
+      entry: "संबंध {{relation_name}}"
+      entry_role: "संबंध {{relation_name}} (as {{relation_role}})"
     map:
       loading: "Loading..."
       deleted: "मिटा दिया गया है"
diff --git a/config/locales/is.yml b/config/locales/is.yml
index c5d7e626c..7fac2fcd6 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -104,8 +104,8 @@ is:
       version: "Útgáfa:"
       in_changeset: "Í breytingarsetti:"
     containing_relation:
-      relation: "Venslunum „{{relation_name}}“"
-      relation_as: "(sem {{relation_role}})"
+      entry: "Venslunum {{relation_name}}"
+      entry_role: "Venslunum {{relation_name}} (sem „{{relation_role}}“)"
     map:
       loading: "Hleð..."
       deleted: "Eytt"
diff --git a/config/locales/it.yml b/config/locales/it.yml
index dafcc628b..a35ff34a1 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -98,8 +98,8 @@ it:
       version: "Versione:"
       in_changeset: "Nel gruppo di modifiche:"
     containing_relation:
-      relation: "Relazione {{relation_name}}"
-      relation_as: "(come {{relation_role}})"
+      entry: "Relazione {{relation_name}}"
+      entry_role: "Relazione {{relation_name}} (come {{relation_role}})"
     map:
       loading: "Caricamento in corso..."
       deleted: "Eliminato"
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 90ecb6f57..2864de141 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -100,8 +100,8 @@ ja:
       version: "バージョン:"
       in_changeset: "変更セット:"
     containing_relation:
-      relation: "関連 {{relation_name}}"
-      relation_as: "(as {{relation_role}})"
+      entry: "関連 {{relation_name}}"
+      entry_role: "関連 {{relation_name}} (as {{relation_role}})"
     map:
       loading: "ロード中..."
       deleted: "削除済み"
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 803a8915d..96634658d 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -100,8 +100,8 @@ ko:
       version: "버젼:"
       in_changeset: "In changeset:"
     containing_relation:
-      relation: "관계 {{relation_name}}"
-      relation_as: "(as {{relation_role}})"
+      entry: "관계 {{relation_name}}"
+      entry_role: "관계 {{relation_name}} (as {{relation_role}})"
     map:
       loading: "불러 오는 중..."
       deleted: "삭제됨"
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 7df253dc1..5110be2b9 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -98,8 +98,8 @@ nl:
       version: "Versie:"
       in_changeset: "In changeset:"
     containing_relation:
-      relation: "Relatie {{relation_name}}"
-      relation_as: "(als {{relation_role}})"
+      entry: "Relatie {{relation_name}}"
+      entry_role: "Relatie {{relation_name}} (als {{relation_role}})"
     map:
       loading: "Laden..."
       deleted: "Verwijderd"
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 5958a4dcc..859c26e1a 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -98,8 +98,8 @@ pl:
       version: "Wersja:"
       in_changeset: "W changesecie:"
     containing_relation:
-      relation: "Relacja {{relation_name}}"
-      relation_as: "(jako {{relation_role}})"
+      entry: "Relacja {{relation_name}}"
+      entry_role: "Relacja {{relation_name}} (jako {{relation_role}})"
     map:
       loading: "Wczytywanie..."
       deleted: "Skasowano"
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index eeb4fa1a0..a5f1961b8 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -100,8 +100,8 @@ pt-BR:
       version: "Versão:"
       in_changeset: "No conjunto de modificações:"
     containing_relation:
-      relation: "Relação {{relation_name}}"
-      relation_as: "(como {{relation_role}})"
+      entry: "Relação {{relation_name}}"
+      entry_role: "Relação {{relation_name}} (como {{relation_role}})"
     map:
       loading: "Carregando..."
       deleted: "Apagado"
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 1e56b1411..24910c0f9 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -98,8 +98,8 @@ ru:
       version: "Версия:"
       in_changeset: "Сеанс:"
     containing_relation:
-      relation: "Отношение {{relation_name}}"
-      relation_as: "(в роли {{relation_role}})"
+      entry: "Отношение {{relation_name}}"
+      entry_role: "Отношение {{relation_name}} (в роли {{relation_role}})"
     map:
       loading: "Загрузка..."
       deleted: "Удалено"
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 07d42433a..0f5f41ef3 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -100,8 +100,8 @@ sl:
       version: "Različica:"
       in_changeset: "V paketu sprememb:"
     containing_relation:
-      relation: "Relacija {{relation_name}}"
-      relation_as: "(kot {{relation_role}})"
+      entry: "Relacija {{relation_name}}"
+      entry_role: "Relacija {{relation_name}} (kot {{relation_role}})"
     map:
       loading: "Nalaganje..."
       deleted: "Izbrisano"
diff --git a/config/locales/yo.yml b/config/locales/yo.yml
index cc08c3807..f33d41704 100644
--- a/config/locales/yo.yml
+++ b/config/locales/yo.yml
@@ -100,8 +100,8 @@ yo:
       version: "Version:"
       in_changeset: "In changeset:"
     containing_relation:
-      relation: "Relation {{relation_name}}"
-      relation_as: "(as {{relation_role}})"
+      entry: "Relation {{relation_name}}"
+      entry_role: "Relation {{relation_name}} (as {{relation_role}})"
     map:
       loading: "Loading..."
       deleted: "Deleted"
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index be0c7bca6..9c69010df 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -98,8 +98,8 @@ zh-CN:
       version: "版本:"
       in_changeset: "在修改集合中:"
     containing_relation:
-      relation: "关系 {{relation_name}}"
-      relation_as: "(as {{relation_role}})"
+      entry: "关系 {{relation_name}}"
+      entry_role: "关系 {{relation_name}} (as {{relation_role}})"
     map:
       loading: "读取中..."
       deleted: "删除"
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index cbbbc6825..57b90c589 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -100,8 +100,8 @@ zh-TW:
       version: "版本："
       in_changeset: "於變更組合："
     containing_relation:
-      relation: "關係 {{relation_name}}"
-      relation_as: "(as {{relation_role}})"
+      entry: "關係 {{relation_name}}"
+      entry_role: "關係 {{relation_name}} (as {{relation_role}})"
     map:
       loading: "正在載入..."
       deleted: "已刪除"