From: Ævar Arnfjörð Bjarmason Date: Sun, 20 Sep 2009 10:25:31 +0000 (+0000) Subject: See [17712] for why I'm changing this X-Git-Tag: live~6687 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/185c7c24aecd1cfb64cceb989ed13e1725c42384?hp=039a49a97b5376e8b92ea2bfe5c31ff1c0ca9f17 See [17712] for why I'm changing this The 'user.view.mapper since' message is broken. It should be done with translation parameters. But messages can't include HTML like and I don't want to experiment with making that work or changing this into a HTML table that doesn't look crappy. --- diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index 931037319..7769ffaa6 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -23,7 +23,7 @@ <% if @this_user != nil %>

-<%= t 'user.view.mapper since' %><%= l @this_user.creation_time %> <%= t 'user.view.ago', :time_in_words_ago => time_ago_in_words(@this_user.creation_time) %> +<%= t 'user.view.mapper since' %> <%= l @this_user.creation_time %> <%= t 'user.view.ago', :time_in_words_ago => time_ago_in_words(@this_user.creation_time) %>

<% end %> diff --git a/config/locales/be.yml b/config/locales/be.yml index fca226eb2..03620dba4 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -681,7 +681,7 @@ be: traces: трэкі remove as friend: выдаліць з сяброў add as friend: дадаць у сябры - mapper since: "Малюе карту з: " + mapper since: "Малюе карту з:" ago: "({{time_in_words_ago}} таму)" user image heading: Выява карыстальніка delete image: Выдаліць выяву diff --git a/config/locales/de.yml b/config/locales/de.yml index f06e986e1..0b5cd056b 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -921,7 +921,7 @@ de: traces: Tracks remove as friend: Als Freund entfernen add as friend: Als Freund hinzufügen - mapper since: "Mapper seit: " + mapper since: "Mapper seit:" ago: "({{time_in_words_ago}})" user image heading: Benutzerbild delete image: Bild löschen diff --git a/config/locales/en.yml b/config/locales/en.yml index b606566f7..55f452fa7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -923,7 +923,7 @@ en: traces: traces remove as friend: remove as friend add as friend: add as friend - mapper since: "Mapper since: " + mapper since: "Mapper since:" ago: "({{time_in_words_ago}} ago)" user image heading: User image delete image: Delete Image diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 37584329e..2b703dd70 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -207,7 +207,7 @@ fr: traces: "traces" remove as friend: "enlever en tant qu'ami" add as friend: "ajouter en tant qu'ami" - mapper since: "Mappeur depuis: " + mapper since: "Mappeur depuis:" user image heading: "Image utilisateur" delete image: "Effacer l'image" upload an image: "Envoyer une image" diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml index 0e18de903..6b6091396 100644 --- a/config/locales/gcf.yml +++ b/config/locales/gcf.yml @@ -207,7 +207,7 @@ gcf: traces: "Chimen" remove as friend: "Woté on zanmi" add as friend: "Ajouté on zanmi" - mapper since: "Arpantè dèpi: " + mapper since: "Arpantè dèpi:" user image heading: "Foto itilizatè" delete image: "Woté on imaj" upload an image: "Voyé on imaj" diff --git a/config/locales/he.yml b/config/locales/he.yml index a065b4f20..da4d9580d 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -561,7 +561,7 @@ he: traces: traces remove as friend: remove as friend add as friend: add as friend - mapper since: "Mapper since: " + mapper since: "Mapper since:" ago: "({{time_in_words_ago}} ago)" user image heading: User image delete image: Delete Image diff --git a/config/locales/hi.yml b/config/locales/hi.yml index 8f755950c..152061e2b 100644 --- a/config/locales/hi.yml +++ b/config/locales/hi.yml @@ -617,7 +617,7 @@ hi: traces: traces remove as friend: remove as friend add as friend: add as friend - mapper since: "Mapper since: " + mapper since: "Mapper since:" ago: "({{time_in_words_ago}} ago)" user image heading: User image delete image: Delete Image diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 6b521b2f7..57f602f9c 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -921,7 +921,7 @@ hu: traces: nyomvonalak remove as friend: barát eltávolítása add as friend: felvétel barátnak - mapper since: "Térképszerkesztő ezóta: " + mapper since: "Térképszerkesztő ezóta:" ago: "({{time_in_words_ago}} óta)" user image heading: Felhasználó képe delete image: Kép törlése diff --git a/config/locales/is.yml b/config/locales/is.yml index 6ca39af7b..ef6922c3a 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -847,7 +847,7 @@ is: traces: ferlar remove as friend: fjarlægja sem vin add as friend: bæta við sem vin - mapper since: "Notandi síðan: " + mapper since: "Notandi síðan:" ago: "({{time_in_words_ago}} síðan)" user image heading: Notandamynd delete image: Eyða myndinni diff --git a/config/locales/it.yml b/config/locales/it.yml index 0c313599c..77e7f7578 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -567,7 +567,7 @@ it: traces: tracciati remove as friend: rimuovi come amico add as friend: aggiungi come amico - mapper since: "Mappatore dal: " + mapper since: "Mappatore dal:" ago: "({{time_in_words_ago}} fa)" user image heading: "Immagine dell'utente" delete image: Elimina immagine diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 5ad0260d7..8b9cfd2f6 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -695,7 +695,7 @@ href="http://creativecommons.org/licenses/by-sa/2.0/">クリエイティブコ traces: "トレース" remove as friend: "友達から削除" add as friend: "友達に追加" - mapper since: "マッパー歴: " + mapper since: "マッパー歴:" ago: "（{{time_in_words_ago}} 前）" user image heading: "ユーザの画像" delete image: "画像の削除" diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 833dbbf54..2014b4465 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -681,7 +681,7 @@ ko: traces: traces remove as friend: remove as friend add as friend: add as friend - mapper since: "Mapper since: " + mapper since: "Mapper since:" ago: "({{time_in_words_ago}} ago)" user image heading: User image delete image: Delete Image diff --git a/config/locales/nl.yml b/config/locales/nl.yml index c3772cc3b..96f08a927 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -567,7 +567,7 @@ nl: traces: tracks remove as friend: vriend verwijderen add as friend: vriend toevoegen - mapper since: "Mapper sinds: " + mapper since: "Mapper sinds:" ago: "({{time_in_words_ago}} geleden)" user image heading: Gebruikersafbeelding delete image: Afbeelding verwijderen diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 7bd4b4219..32d8740ff 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -583,7 +583,7 @@ pl: traces: ślady remove as friend: usuń ze znajomych add as friend: dodaj do znajomych - mapper since: "Mapuje od: " + mapper since: "Mapuje od:" ago: "({{time_in_words_ago}} temu)" user image heading: Zdjęcie użytkownika delete image: Usuń zdjęcie diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 7b541fc90..a1065172c 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -829,7 +829,7 @@ pt-BR: traces: "trilhas" remove as friend: "remover da lista de amigos" add as friend: "adicionar como amigos" - mapper since: "Mapeador desde: " + mapper since: "Mapeador desde:" ago: "({{time_in_words_ago}} atrás)" user image heading: "Imagem do usuário" delete image: "Apagar Imagem" diff --git a/config/locales/ro.yml b/config/locales/ro.yml index d0325bd58..558cec17f 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -812,7 +812,7 @@ ro: traces: traces remove as friend: remove as friend add as friend: add as friend - mapper since: "Mapper since: " + mapper since: "Mapper since:" ago: "({{time_in_words_ago}} ago)" user image heading: User image delete image: Delete Image diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 2b8b074d5..94bc5b6a7 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -684,7 +684,7 @@ ru: traces: треки remove as friend: удалить из друзей add as friend: добавить в друзья - mapper since: "Зарегистрирован: " + mapper since: "Зарегистрирован:" ago: "({{time_in_words_ago}} назад)" user image heading: Аватар delete image: Удалить аватар diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 14ce514c4..fe1a5eb6d 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -847,7 +847,7 @@ sl: traces: sledi remove as friend: odstrani izmed prijateljev add as friend: dodaj med prijatelje - mapper since: "Kartograf od: " + mapper since: "Kartograf od:" ago: "({{time_in_words_ago}} nazaj)" user image heading: Slika uporabnika delete image: Izbriši sliko diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 5ec079afb..c80e1a434 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -847,7 +847,7 @@ vi: traces: "tuyến đường" remove as friend: "dời người bạn" add as friend: "thêm là người bạn" - mapper since: "Tham gia: " + mapper since: "Tham gia:" ago: "(cách đây {{time_in_words_ago}})" user image heading: "Hình người dùng" delete image: "Xóa Hình" diff --git a/config/locales/yo.yml b/config/locales/yo.yml index c0694b78d..fe466976f 100644 --- a/config/locales/yo.yml +++ b/config/locales/yo.yml @@ -681,7 +681,7 @@ yo: traces: traces remove as friend: remove as friend add as friend: add as friend - mapper since: "Mapper since: " + mapper since: "Mapper since:" ago: "({{time_in_words_ago}} ago)" user image heading: User image delete image: Delete Image diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 0279fd7ca..dc75ea204 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -593,7 +593,7 @@ zh-CN: traces: traces remove as friend: 删除好友 add as friend: 添加为好友 - mapper since: "Mapper since: " + mapper since: "Mapper since:" ago: "({{time_in_words_ago}} 以前)" user image heading: 用户头像 delete image: 删除头像