From 421b6113898ed5d80fd00a7f953cdbb9dbf2d4c5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Sun, 20 Sep 2009 10:41:57 +0000 Subject: [PATCH] Use i18n() parameters for this JavaScript message instead of ad-hoc string concatenation. See [17712] for why I'm changing this. --- app/views/user/_friend_map.html.erb | 2 +- config/locales/be.yml | 2 +- config/locales/de.yml | 2 +- config/locales/en.yml | 2 +- config/locales/fr.yml | 2 +- config/locales/gcf.yml | 2 +- config/locales/he.yml | 2 +- config/locales/hi.yml | 2 +- config/locales/hu.yml | 2 +- config/locales/is.yml | 2 +- config/locales/it.yml | 2 +- config/locales/ja.yml | 2 +- config/locales/ko.yml | 2 +- config/locales/nl.yml | 2 +- config/locales/pl.yml | 2 +- config/locales/pt-BR.yml | 2 +- config/locales/ro.yml | 2 +- config/locales/ru.yml | 2 +- config/locales/sl.yml | 2 +- config/locales/vi.yml | 2 +- config/locales/yo.yml | 2 +- config/locales/zh-CN.yml | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/views/user/_friend_map.html.erb b/app/views/user/_friend_map.html.erb index 75303f10d..a73bb53b8 100644 --- 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'%>'+nearest[i].display_name+'' + var description = i18n('<%= t 'user.friend_map.nearby mapper'%>', { nearby_user: ''+nearest[i].display_name+'' }); 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 03620dba4..b380eff51 100644 --- 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 0b5cd056b..fc730576a 100644 --- 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 55f452fa7..560f9e3d8 100644 --- 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 2b703dd70..d8e362930 100644 --- 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 6b6091396..446fb87eb 100644 --- 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 da4d9580d..c647ff807 100644 --- 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 152061e2b..b4f5100cb 100644 --- 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 57f602f9c..487124234 100644 --- 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 ef6922c3a..8a1780f78 100644 --- 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 77e7f7578..c5ef4c18a 100644 --- 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 8b9cfd2f6..4b477ab5b 100644 --- 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 2014b4465..a5e0ac67b 100644 --- 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 96f08a927..9e10a4e16 100644 --- 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 32d8740ff..f7d5ffb8f 100644 --- 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 a1065172c..19671607d 100644 --- 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 558cec17f..29a3f2e5d 100644 --- 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 94bc5b6a7..2aca72384 100644 --- 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 fe1a5eb6d..42f36fd1c 100644 --- 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 c80e1a434..a30acc414 100644 --- 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 fe466976f..29b3d8ed7 100644 --- 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 dc75ea204..dd59e7027 100644 --- 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: 我的设置 -- 2.43.2