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 <b> 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 931037319a2d909d21815efa7cb6820778a64621..7769ffaa697e66e641c97811e755e50b813fec21 100644 (file)
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -23,7 +23,7 @@
 
 <% if @this_user != nil %>
 <P>
 
 <% if @this_user != nil %>
 <P>

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

 </P>
 <% end %>
   
 </P>
 <% end %>
   

diff --git a/config/locales/be.yml b/config/locales/be.yml
index fca226eb2944da3da708321806f7f4713a8cd15a..03620dba4ff2910e1a8bb5eca93e0a13f4bb7ffc 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -681,7 +681,7 @@ be:
       traces: трэкі
       remove as friend: выдаліць з сяброў
       add as friend: дадаць у сябры
       traces: трэкі
       remove as friend: выдаліць з сяброў
       add as friend: дадаць у сябры

-      mapper since: "Малюе карту з: "
+      mapper since: "Малюе карту з:"

       ago: "({{time_in_words_ago}} таму)"
       user image heading: Выява карыстальніка
       delete image: Выдаліць выяву
       ago: "({{time_in_words_ago}} таму)"
       user image heading: Выява карыстальніка
       delete image: Выдаліць выяву

diff --git a/config/locales/de.yml b/config/locales/de.yml
index f06e986e1093701604f799e34386a03f41e02125..0b5cd056be01f295f834aa19f5121f433a8bec29 100644 (file)
--- 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
       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
       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 b606566f77efb413e19c026251c45316fe1d4676..55f452fa77898caf0fbb9c71458eed63a25e3c13 100644 (file)
--- 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
       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
       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 37584329e0a7c176acde0bfae5bfecabb98bfa6f..2b703dd70358177222d66e6fe787b5963d00182c 100644 (file)
--- 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"
       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"
       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 0e18de9030e5fcc23ffab1b1db562e318f1b3f52..6b6091396f096c9977dd7cee05d694b19a9f7003 100644 (file)
--- 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"
       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"
       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 a065b4f203c33dee3ff2e5715be0790f0b55927f..da4d9580d4d00b4e1412d3f2ebb0eb725516ceff 100644 (file)
--- 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
       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
       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 8f755950ce7c923439a8cf35534682cf9e3a0eec..152061e2b224d2c186d8ae2fdefab63d57288b60 100644 (file)
--- 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
       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
       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 6b521b2f7d29a26cfb989c1b9961559ec388e7e2..57f602f9c4b73d292a9fc6eeb0d864bcfce7215c 100644 (file)
--- 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
       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
       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 6ca39af7b30efda19dfb463d81acb7c707e1c79a..ef6922c3ace90b48eb074386a08c2d4f26922c06 100644 (file)
--- 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
       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
       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 0c313599ce28ac5f53c7490536f8b39510abef36..77e7f7578273b44d1c4b3b1e34e2fc714e320f94 100644 (file)
--- 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
       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
       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 5ad0260d780c01c196e14fe2f0fcd1fdc6a7ae56..8b9cfd2f6371973d1bbe085b17b4f20b43b8da3a 100644 (file)
--- 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: "友達に追加"
       traces: "トレース"
       remove as friend: "友達から削除"
       add as friend: "友達に追加"

-      mapper since: "マッパー歴: "
+      mapper since: "マッパー歴:"

       ago: "（{{time_in_words_ago}} 前）"
       user image heading: "ユーザの画像"
       delete image: "画像の削除"
       ago: "（{{time_in_words_ago}} 前）"
       user image heading: "ユーザの画像"
       delete image: "画像の削除"

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 833dbbf5400f5f287d8bc192010ac3191a4cb24d..2014b4465a2cf7cd3aac5d244a5fce43b87be6cc 100644 (file)
--- 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
       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
       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 c3772cc3bfc8e2499288a3dbd8ef94f7e8e8c55a..96f08a927d07c314638caa68f0fe5849a41a4c16 100644 (file)
--- 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
       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
       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 7bd4b421925246685d220850f623e775859b643d..32d8740ffaca85da971124d7ba07fd43ddb2ec2b 100644 (file)
--- 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
       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
       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 7b541fc904d4c918f89fc8d8ecf8710f40f4acea..a1065172c0be7d9f98ac71e24bae5854ba9ce9b4 100644 (file)
--- 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"
       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"
       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 d0325bd58c556c122d14b9d3ff6c8bc43500a2dd..558cec17f74d9bc8fe1b7d1b565ee8f77666e164 100644 (file)
--- 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
       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
       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 2b8b074d59e74bc32b753f05a09016be1f129c27..94bc5b6a7ca211acbf8786fe4fda69b92443e429 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -684,7 +684,7 @@ ru:
       traces: треки
       remove as friend: удалить из друзей
       add as friend: добавить в друзья
       traces: треки
       remove as friend: удалить из друзей
       add as friend: добавить в друзья

-      mapper since: "Зарегистрирован: "
+      mapper since: "Зарегистрирован:"

       ago: "({{time_in_words_ago}} назад)"
       user image heading: Аватар
       delete image: Удалить аватар
       ago: "({{time_in_words_ago}} назад)"
       user image heading: Аватар
       delete image: Удалить аватар

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 14ce514c488fd05854970fbfd2c2b0b1a76ba29d..fe1a5eb6d5e1753e7555fa72192b9618a03ea715 100644 (file)
--- 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
       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
       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 5ec079afbfc75b001d5e7c66ac2ac0ca723fd1ee..c80e1a4348843b3feff7845f88784466eae0765c 100644 (file)
--- 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"
       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"
       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 c0694b78de78e7b3cd4110da3c4d2bde8c255340..fe466976fb271ebc69631fde62f53d3989341b3a 100644 (file)
--- 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
       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
       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 0279fd7caffc7dd9a9b7910e1a4a0ba1831db166..dc75ea2048c648e778848883c7b489103c136bc6 100644 (file)
--- 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: 添加为好友
       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: 删除头像
       ago: "({{time_in_words_ago}} 以前)"
       user image heading: 用户头像
       delete image: 删除头像