From e9bccb8afe5bedd68626447e4b63a77b4f293c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 18 Nov 2012 17:24:43 +0100 Subject: [PATCH] get rid of string concat of translatable strings in getting started --- app/views/users/getting_started.haml | 4 +--- config/locales/diaspora/en.yml | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/views/users/getting_started.haml b/app/views/users/getting_started.haml index 54a511ac8..63b0a728a 100644 --- a/app/views/users/getting_started.haml +++ b/app/views/users/getting_started.haml @@ -29,9 +29,7 @@ .row %p - = t('.we_can_speed_things_up') - = link_to t('.hooking_up_fb'), "auth/facebook?callback_url=#{getting_started_url}" - = t('.what_facebook_does') + != t('.connect_to_facebook', :link => link_to(t('.connect_to_facebook_link'), "auth/facebook?callback_url=#{getting_started_url}")) .row .span6 diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 664646800..8bb171971 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -1011,9 +1011,8 @@ en: awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*" who_are_you: "Who are you?" - we_can_speed_things_up: "We can speed things up a bit by" - hooking_up_fb: "hooking up your Facebook account" - what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-posting." + connect_to_facebook: "We can speed things up a bit by %{link} to Diaspora. This will pull your name and photo, and enable cross-posting." + connect_to_facebook_link: "hooking up your Facebook account" what_are_you_in_to: "What are you into?" hashtag_explanation: "Hashtags allow you to talk about and follow your interests. They're also a great way to find new people on Diaspora."