Use i18n() parameters for this JavaScript message instead of ad-hoc

string concatenation.

See [17712] for why I'm changing this.

diff --git a/app/views/user/_friend_map.html.erb b/app/views/user/_friend_map.html.erb
index 75303f10d349b3e6fdd1288c2501a449114efb86..a73bb53b8250a5bad816f6e624d52b8bea8e3520 100644 (file)
--- a/app/views/user/_friend_map.html.erb
+++ b/app/views/user/_friend_map.html.erb
@@ -54,7 +54,7 @@
     near_icon.url = OpenLayers.Util.getImagesLocation() + "marker-green.png";;
     var i = nearest.length;
     while( i-- ) {
-      var description = '<%= t 'user.friend_map.nearby mapper'%><a href="/user/'+nearest[i].display_name+'">'+nearest[i].display_name+'</a>'
+      var description = i18n('<%= t 'user.friend_map.nearby mapper'%>', { nearby_user: '<a href="/user/'+nearest[i].display_name+'">'+nearest[i].display_name+'</a>' });
       var nearmarker = addMarkerToMap(new OpenLayers.LonLat(nearest[i].home_lon, nearest[i].home_lat), near_icon.clone(), description);
     }
 

diff --git a/config/locales/be.yml b/config/locales/be.yml
index 03620dba4ff2910e1a8bb5eca93e0a13f4bb7ffc..b380eff51fad5b3c5a977bc8fd6c5c47622c122b 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -700,7 +700,7 @@ be:
       change your settings: змяніць вашыя настаўленні
     friend_map:
       your location: Ваша месцазнаходжанне
-      nearby mapper: "Карыстальнік: "
+      nearby mapper: "Карыстальнік: [[nearby_user]]"
     account:
       title: "Змяніць рахунак"
       my settings: Мае настаўленні

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 0b5cd056be01f295f834aa19f5121f433a8bec29..fc730576af242838adb45ef31e2caf554bc92675 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -942,7 +942,7 @@ de:
       my_oauth_details: "View my OAuth details"
     friend_map:
       your location: "Eigener Standort"
-      nearby mapper: "Mapper in der Nähe: "
+      nearby mapper: "Mapper in der Nähe: [[nearby_user]]"
     account:
       title: "Benutzerkonto bearbeiten"
       my settings: Eigene Einstellungen

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 55f452fa77898caf0fbb9c71458eed63a25e3c13..560f9e3d87871e667ad8002f71e2cc1f495ac1c4 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -944,7 +944,7 @@ en:
       my_oauth_details: "View my OAuth details"
     friend_map:
       your location: Your location
-      nearby mapper: "Nearby mapper: "
+      nearby mapper: "Nearby mapper: [[nearby_user]]"
     account:
       title: "Edit account"
       my settings: My settings

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 2b703dd70358177222d66e6fe787b5963d00182c..d8e362930ade1fd4d3ef37dcc3f19cd9b548df47 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -225,7 +225,7 @@ fr:
       change your settings: "modifiez vos options"
     friend_map:
       your location: "Votre emplacement"
-      nearby mapper: "Mappeur dans les environs: "
+      nearby mapper: "Mappeur dans les environs: [[nearby_user]]"
     account:
       my settings: "Mes options"
       email never displayed publicly: "(jamais affiché publiquement)"

diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index 6b6091396f096c9977dd7cee05d694b19a9f7003..446fb87eb46647d524f0006a65921ebc9d93947f 100644 (file)
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -225,7 +225,7 @@ gcf:
       change your settings: "Chanjé opsion aw"
     friend_map:
       your location: "Koté ou yé"
-      nearby mapper: "Arpantè owa aw: "
+      nearby mapper: "Arpantè owa aw: [[nearby_user]]"
     account:
       my settings: "Mes options"
       email never displayed publicly: "(Pa janmen maké piblikman)"

diff --git a/config/locales/he.yml b/config/locales/he.yml
index da4d9580d4d00b4e1412d3f2ebb0eb725516ceff..c647ff807d025442ad3da1b2c6f32452dfe25508 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -580,7 +580,7 @@ he:
       change your settings: change your settings
     friend_map:
       your location: Your location
-      nearby mapper: "Nearby mapper: "
+      nearby mapper: "Nearby mapper: [[nearby_user]]"
     account:
       title: "Edit account"
       my settings: My settings

diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 152061e2b224d2c186d8ae2fdefab63d57288b60..b4f5100cbe461cf2a6e7c20c42500f01a359ac9b 100644 (file)
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -636,7 +636,7 @@ hi:
       change your settings: change your settings
     friend_map:
       your location: Your location
-      nearby mapper: "Nearby mapper: "
+      nearby mapper: "Nearby mapper: [[nearby_user]]"
     account:
       title: "Edit account"
       my settings: My settings

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 57f602f9c4b73d292a9fc6eeb0d864bcfce7215c..4871242344f71929f04c4bde01e59f9ca6c0b020 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -942,7 +942,7 @@ hu:
       my_oauth_details: "OAuth részletek megtekintése"
     friend_map:
       your location: Helyed
-      nearby mapper: "Közeli térképszerkesztők: "
+      nearby mapper: "Közeli térképszerkesztők: [[nearby_user]]"
     account:
       title: "Felhasználói fiók szerkesztése"
       my settings: Beállításaim

diff --git a/config/locales/is.yml b/config/locales/is.yml
index ef6922c3ace90b48eb074386a08c2d4f26922c06..8a1780f78e759d08cc7c00f21afabd54f40a9a6e 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -867,7 +867,7 @@ is:
       change your settings: "breyttu stillingunum þínum"
     friend_map:
       your location: Þín staðsetning
-      nearby mapper: "Nálægur notandi: "
+      nearby mapper: "Nálægur notandi: [[nearby_user]]"
     account:
       title: "Stillingar"
       my settings: Mínar stillingar

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 77e7f7578273b44d1c4b3b1e34e2fc714e320f94..c5ef4c18af0b422c51b92c543e8a2ed40f53896f 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -586,7 +586,7 @@ it:
       change your settings: modifica le impostazioni personali
     friend_map:
       your location: Propria posizione
-      nearby mapper: "Mappatore vicino: "
+      nearby mapper: "Mappatore vicino: [[nearby_user]]"
     account:
       title: "Modifica profilo"
       my settings: Impostazioni personali

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 8b9cfd2f6371973d1bbe085b17b4f20b43b8da3a..4b477ab5b61c437a7c3d034cca10bc78d1053fa3 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -714,7 +714,7 @@ href="http://creativecommons.org/licenses/by-sa/2.0/">クリエイティブコ
       change your settings: "設定を変更する"
     friend_map:
       your location: "あなたの位置"
-      nearby mapper: "周辺のマッパー: "
+      nearby mapper: "周辺のマッパー: [[nearby_user]]"
     account:
       title: "アカウントを編集"
       my settings: "私の設定"

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 2014b4465a2cf7cd3aac5d244a5fce43b87be6cc..a5e0ac67bfba6bdad3c7cc1db3579a1a3f96f7cd 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -700,7 +700,7 @@ ko:
       change your settings: change your settings
     friend_map:
       your location: Your location
-      nearby mapper: "Nearby mapper: "
+      nearby mapper: "Nearby mapper: [[nearby_user]]"
     account:
       title: "Edit account"
       my settings: My settings

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 96f08a927d07c314638caa68f0fe5849a41a4c16..9e10a4e164ae2ad29c60670a27ff90e1028a21f1 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -586,7 +586,7 @@ nl:
       change your settings: instellingen aanpassen
     friend_map:
       your location: Jouw locatie
-      nearby mapper: "Dichtbijzijnde mapper: "
+      nearby mapper: "Dichtbijzijnde mapper: [[nearby_user]]"
     account:
       title: "Account bewerken"
       my settings: Mijn instellingen

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 32d8740ffaca85da971124d7ba07fd43ddb2ec2b..f7d5ffb8f41e46a4e0c7782b7046fed192b5256f 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -602,7 +602,7 @@ pl:
       change your settings: zmień swoje ustawienia
     friend_map:
       your location: Twoje położenie
-      nearby mapper: "Mapowicz z okolicy: "
+      nearby mapper: "Mapowicz z okolicy: [[nearby_user]]"
     account:
       title: "Zmiana ustawień konta"
       my settings: Moje ustawienia

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index a1065172c0be7d9f98ac71e24bae5854ba9ce9b4..19671607d6d0170f63b5cd989667aed1df5b4197 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -849,7 +849,7 @@ pt-BR:
       change your settings: "mudar suas configurações"
     friend_map:
       your location: "Sua localização"
-      nearby mapper: "Mapeador próximo: "
+      nearby mapper: "Mapeador próximo: [[nearby_user]]"
     account:
       title: "Editar conta"
       my settings: "Minhas configurações"

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 558cec17f74d9bc8fe1b7d1b565ee8f77666e164..29a3f2e5d42dfc8b4a5233ac6e2ead4b1e7349da 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -832,7 +832,7 @@ ro:
       change your settings: change your settings
     friend_map:
       your location: Your location
-      nearby mapper: "Nearby mapper: "
+      nearby mapper: "Nearby mapper: [[nearby_user]]"
     account:
       title: "Edit account"
       my settings: My settings

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 94bc5b6a7ca211acbf8786fe4fda69b92443e429..2aca72384ce2244a23385573c397f7332b2f2753 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -703,7 +703,7 @@ ru:
       change your settings: изменить настройки
     friend_map:
       your location: Ваше местоположение
-      nearby mapper: "Ближайший пользователь: "
+      nearby mapper: "Ближайший пользователь: [[nearby_user]]"
     account:
       title: "Изменение учетной записи"
       my settings: Мои настройки

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index fe1a5eb6d5e1753e7555fa72192b9618a03ea715..42f36fd1c1d205f1065991886c9e85e86f7c0474 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -875,7 +875,7 @@ sl:
       change your settings: uredite vaše nastavitve
     friend_map:
       your location: Vaša lokacija
-      nearby mapper: "Bližnji kartograf: "
+      nearby mapper: "Bližnji kartograf: [[nearby_user]]"
     account:
       title: "Urejanje uporabniškega računa"
       my settings: Moje nastavitve

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index c80e1a4348843b3feff7845f88784466eae0765c..a30acc414a7324d0936274443454e1eedab2d1ba 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -867,7 +867,7 @@ vi:
       change your settings: "thay đổi tùy chọn của bạn"
     friend_map:
       your location: "Vị trí của bạn"
-      nearby mapper: "Người vẽ bản đồ ở gần: "
+      nearby mapper: "Người vẽ bản đồ ở gần: [[nearby_user]]"
     account:
       title: "Chỉnh sửa tài khoản"
       my settings: "Tùy chọn"

diff --git a/config/locales/yo.yml b/config/locales/yo.yml
index fe466976fb271ebc69631fde62f53d3989341b3a..29b3d8ed797ee5ac406492fa0b064c03df27db7b 100644 (file)
--- a/config/locales/yo.yml
+++ b/config/locales/yo.yml
@@ -700,7 +700,7 @@ yo:
       change your settings: change your settings
     friend_map:
       your location: Your location
-      nearby mapper: "Nearby mapper: "
+      nearby mapper: "Nearby mapper: [[nearby_user]]"
     account:
       title: "Edit account"
       my settings: My settings

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index dc75ea2048c648e778848883c7b489103c136bc6..dd59e70273e0d5104d553b1ec5d41f4eb1b4a781 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -612,7 +612,7 @@ zh-CN:
       change your settings: 更改您的设置
     friend_map:
       your location: 您的位置
-      nearby mapper: "附近用户: "
+      nearby mapper: "附近用户: [[nearby_user]]"
     account:
       title: "编辑账户"
       my settings: 我的设置