cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

The relation browser used the translated nominative model names of

Browse source 
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.
This commit is contained in:
Ævar Arnfjörð Bjarmason 2009-06-28 18:25:21 +00:00
parent 050393c613
commit 1fea79bbbd
21 changed files with 22 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/views/browse/_relation_member.html.erb
View file

@ -1,10 +1,12 @@
<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>

2
config/locales/be.yml
View file

@ -128,8 +128,6 @@ be:
relation_history:
relation_history: "Гісторыя сувязі"
relation_history_title: "Гісторыя сувязі: {{relation_name}}"
relation_member:
as: "як"
relation:
relation: "Сувязь"
relation_title: "Сувязь: {{relation_name}}"

2
config/locales/ca.yml
View file

@ -129,8 +129,6 @@ ca:
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}}"

2
config/locales/de.yml
View file

@ -135,8 +135,6 @@ de:
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}}"

2
config/locales/el.yml
View file

@ -134,8 +134,6 @@ el:
relation_history:
relation_history: "Ιστορια σχέσης"
relation_history_title: "Ιστορια σχέσης: {{relation_name}}"
relation_member:
as: "as"
relation:
relation: "Σχέση"
relation_title: "Σχέση: {{relation_name}}"

7
config/locales/en.yml
View file

@ -142,7 +142,12 @@ en:
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}}"

2
config/locales/es.yml
View file

@ -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_member:
as: "como"
relation:
relation: "Relación"
relation_title: "Relación {{relation_name}}:"

2
config/locales/he.yml
View file

@ -128,8 +128,6 @@ he:
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}}"

2
config/locales/hi.yml
View file

@ -132,8 +132,6 @@ hi:
relation_history:
relation_history: "संबंध का इतिहास"
relation_history_title: "इस संबंध का इतिहास: {{relation_name}}"
relation_member:
as: "जैसे"
relation:
relation: "संबंध"
relation_title: "संबंध: {{relation_name}}"

7
config/locales/is.yml
View file

@ -141,7 +141,12 @@ is:
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}}"

2
config/locales/it.yml
View file

@ -128,8 +128,6 @@ it:
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}}"

2
config/locales/ja.yml
View file

@ -134,8 +134,6 @@ ja:
relation_history:
relation_history: "関連の履歴"
relation_history_title: "関連の履歴: {{relation_name}}"
relation_member:
as: "as"
relation:
relation: "関連"
relation_title: "関連: {{relation_name}}"

2
config/locales/ko.yml
View file

@ -134,8 +134,6 @@ ko:
relation_history:
relation_history: "관계 이력"
relation_history_title: "관계 이력: {{relation_name}}"
relation_member:
as: "as"
relation:
relation: "관계"
relation_title: "관계: {{relation_name}}"

2
config/locales/nl.yml
View file

@ -128,8 +128,6 @@ nl:
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}}"

2
config/locales/pl.yml
View file

@ -128,8 +128,6 @@ pl:
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}}"

2
config/locales/pt-BR.yml
View file

@ -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_member:
as: "como"
relation:
relation: "Relação"
relation_title: "Relação: {{relation_name}}"

2
config/locales/ru.yml
View file

@ -128,8 +128,6 @@ ru:
relation_history:
relation_history: "История отношения"
relation_history_title: "История отношения {{relation_name}}"
relation_member:
as: "в роли"
relation:
relation: "Отношение"
relation_title: "Отношение: {{relation_name}}"

2
config/locales/sl.yml
View file

@ -141,8 +141,6 @@ sl:
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}}"

2
config/locales/yo.yml
View file

@ -134,8 +134,6 @@ yo:
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}}"

2
config/locales/zh-CN.yml
View file

@ -132,8 +132,6 @@ zh-CN:
relation_history:
relation_history: "关系历史"
relation_history_title: "关系历史: {{relation_name}}"
relation_member:
as: "as"
relation:
relation: "关系"
relation_title: "关系: {{relation_name}}"

2
config/locales/zh-TW.yml
View file

@ -134,8 +134,6 @@ zh-TW:
relation_history:
relation_history: "關係歷史紀錄"
relation_history_title: "關係歷史紀錄： {{relation_name}}"
relation_member:
as: "為"
relation:
relation: "關係"
relation_title: "關係： {{relation_name}}"