Make the printable_name() function call i18n.t to translate its

output. Makes e.g. "#{name}, v#{object.version.to_s}" which is used in
the changeset browser translatable.

I'm still not happy with how the anchor is constructed. we're linking
from /browse/changeset/1234 to e.g. node "[[366672999, v1]]" even
though the page we're linking to might take us to that node at version
2. The link should be "[[366672999]], v1" instead.

But that's something to solve later.
This commit is contained in:
Ævar Arnfjörð Bjarmason 2009-06-28 21:13:27 +00:00
parent 91a6ed60c1
commit bc66c8adeb
3 changed files with 11 additions and 3 deletions

View file

@ -4,12 +4,12 @@ module BrowseHelper
end
def printable_name(object, version=false)
name = object.id.to_s
name = t 'printable_name.with_id', :id => object.id.to_s
if version
name = "#{name}, v#{object.version.to_s}"
name = t 'printable_name.with_version', :id => name, :version => object.version.to_s
end
if object.tags.include? 'name'
name = "#{object.tags['name'].to_s} (#{name})"
name = t 'printable_name.with_name', :name => object.tags['name'].to_s, :id => name
end
return name
end

View file

@ -72,6 +72,10 @@ en:
description: "Description"
languages: "Languages"
pass_crypt: "Password"
printable_name:
with_id: "{{id}}"
with_version: "{{id}}, v{{version}}"
with_name: "{{name}} ({{id}})"
map:
view: View
edit: Edit

View file

@ -72,6 +72,10 @@ is:
description: "Lýsing"
languages: "Tungumál"
pass_crypt: "Lykilorð"
printable_name:
with_id: "{{id}}"
with_version: "{{id}}, útgáfa {{version}}"
with_name: "{{name}} ({{id}})"
map:
view: "Kort"
edit: "Breyta"