From 49d905c719ffbacb51fad3f3c33e9dfbcebe7c71 Mon Sep 17 00:00:00 2001
From: Raphael Sofaer <raphael@joindiaspora.com>
Date: Fri, 1 Jul 2011 23:27:53 -0700
Subject: [PATCH] Some more translation stuff. @MrZYX the content thing in the
Diaspora ID explanation is messed up, what's the best way to get bold text
into the translation string?
---
app/views/aspects/_aspect_listings.haml | 4 ++--
app/views/aspects/index.html.haml | 6 +++---
config/locales/diaspora/en.yml | 6 ++++++
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/app/views/aspects/_aspect_listings.haml b/app/views/aspects/_aspect_listings.haml
index 43d7eda10a..82219dcc82 100644
--- a/app/views/aspects/_aspect_listings.haml
+++ b/app/views/aspects/_aspect_listings.haml
@@ -21,8 +21,8 @@
= aspect
%li
- = link_to "+ Add an aspect", "#add_aspect_pane", :class => "new_aspect", :rel => "facebox"
-
+ = link_to t('.add_an_aspect'), "#add_aspect_pane", :class => "new_aspect", :rel => "facebox"
+
%li.all_contacts{:class => ("active" if params["set"] == "all" || params["set"] == "only_sharing")}
%a.aspect_selector{:href => contacts_path(:set => "all"), :class => ("sub_selected" if params["set"] == "only_sharing")}
.contact_count
diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml
index 0332bb119e..4573e5635d 100644
--- a/app/views/aspects/index.html.haml
+++ b/app/views/aspects/index.html.haml
@@ -29,13 +29,13 @@
.title
= image_tag('/images/icons/bookmark.png')
%h5
- Diaspora ID
+ = t(".diaspora_id.heading")
.content
- Your Diaspora ID is:
+ = t(".diaspora_id.content_1")
%b
= current_user.diaspora_handle
%br
- Give it to anyone and they'll be able to find you on Diaspora.
+ = t(".diaspora_id.content_2")
.section
.title
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index dd262bfd60..9c7fb6229a 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -109,6 +109,8 @@ en:
no_posts_message:
start_talking: "Nobody has said anything yet!"
try_adding_some_more_contacts: "Try adding some more contacts."
+ aspect_listings:
+ add_an_aspect: "+ Add an aspect"
selected_contacts:
view_all_contacts: "View all contacts"
@@ -151,6 +153,10 @@ en:
heading: "Connect to Cubbi.es"
explanation: "Cubbi.es is the first Diaspora application under development."
learn_more: "Learn more"
+ diaspora_id:
+ heading: "Diaspora ID"
+ content_1: "Your Diaspora ID is:"
+ content_2: "Give it to anyone and they'll be able to find you on Diaspora."
aspect_memberships:
destroy:
--
GitLab