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 ee704acc87cd52e48db190fc7cce453e5d5e295f..474e80f788f316800f54b7b6c67ce9ee3b96a3d6 100644 (file)
--- 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 88b6047e2b3e57357b44ad81d25c3149f8eade3f..4eba9b4328c287d06ce2c3cf3f3f28caf8b3e728 100644 (file)
--- 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 26a31456e45901fd16f6808dbe202575b0f40e09..e9c2be56ec1ba7ef55d05e39d5a495265d2d3b24 100644 (file)
--- 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 5a19ccd6d0b62b44d78dbaffdc9589c26c1d3f97..7a751f806732a6309e09c69e245d7cac327911c4 100644 (file)
--- 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 e7e2e56378a31e57c57270cab6d7841243d3cf54..077af5011db055c30c92e05eed2f234eb0aa89cc 100644 (file)
--- 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 e8b5f63d500d9d26a9d2284c73d1fe0b7b14493b..e36a7d9d5a5e93462eaeb59a5b9475e4e588592b 100644 (file)
--- 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 a7f6517347b7c11560d6d5e9479311d599988495..521ebe59b3a03d70f42ad084d0ec307f6c7ce049 100644 (file)
--- 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 1bb4b8e80708c0e21f1ec65627b96846f3700c7c..3f7f38b09ad83bbbc13f4c3f8a3bcb26faf6b82c 100644 (file)
--- 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 33f937b5f14a72381cb4eb594bfbce6e720e1135..e9f1b66111cc632dd2f2ab01b277d606b8615314 100644 (file)
--- 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 c5d7e626c8781b671a70b8ac3656adbefe098d38..7fac2fcd68645a6f68cdd74c05de67f5f05a8950 100644 (file)
--- 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 dafcc628b5f4c79b6d9cda88d5946c2c6414d9d8..a35ff34a1e96148cf8267ee4979d68547cdee9f8 100644 (file)
--- 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 90ecb6f576c3c8eb5a4b1e4000bc6541580bac6f..2864de141c0678f1bc25958b19dc0601c212ef5a 100644 (file)
--- 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 803a8915d8a0ed2839f41bcfac0ce201053c6efd..96634658de6c3474195d36f32a17b579fd15ec0a 100644 (file)
--- 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 7df253dc1293226b6db65a7a770f433c6521ac6f..5110be2b9dd47df890530e0da460894b00d2f59d 100644 (file)
--- 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 5958a4dccd1c9e2c7e46d29bec1d26012e5dc27b..859c26e1ae8396cfecc62145206ba33300929a39 100644 (file)
--- 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 eeb4fa1a0e687945514327f5e83382262d3e1ca3..a5f1961b826fbeb22253cc7618aded95d2776e3a 100644 (file)
--- 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 1e56b1411441a1000fb0f5561c89ab6839b0bde4..24910c0f9389d5d3794ebab71ec84c6c89986040 100644 (file)
--- 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 07d42433aabe0d505d51ea65cc909e446f76e447..0f5f41ef36603b70e40e2b415fd9b7e4719f65d3 100644 (file)
--- 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 cc08c38078123432279efc257a27d405fac892f9..f33d41704fcec89405ac722d51af3cbf81958ddd 100644 (file)
--- 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 be0c7bca6f0a3bd09e5be7ce3594b3c2611b9a00..9c69010dfe9bff6e6361dd03e1a3d40d10a0986e 100644 (file)
--- 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 cbbbc6825eb79a775590f9fc3c173aa5efad62a7..57b90c589a4ca45ad4daeacc9344cf7a9efbf6cd 100644 (file)
--- 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: "已刪除"