added community welcome and a non-mandatory wording

This commit is contained in:
Ilya Zhitomirskiy 2011-09-23 14:56:33 -07:00
parent faa0451380
commit 494ab8b13b
2 changed files with 19 additions and 12 deletions

View file

@ -24,6 +24,10 @@
.stream_container .stream_container
%h2 %h2
= welcome_text = welcome_text
%h4
= t(".community_welcome")
%p
= t(".not_mandatory")
%ul#getting_started %ul#getting_started
%li.profile{:class => ("completed" if has_completed_profile?)} %li.profile{:class => ("completed" if has_completed_profile?)}
@ -71,21 +75,22 @@
= t('.connect_with_people_explanation_pt1', :bold => content_tag(:b, t('.bold'))).html_safe = t('.connect_with_people_explanation_pt1', :bold => content_tag(:b, t('.bold'))).html_safe
= t('.connect_with_people_explanation_pt2') = t('.connect_with_people_explanation_pt2')
#diaspora_hq_pane -unless AppConfig[:no_follow_diasporahq]
- if diasporahq = Person.find_by_diaspora_handle("diasporahq@joindiaspora.com") #diaspora_hq_pane
= person_image_link(diasporahq, :size => :thumb_medium) - if diasporahq = Person.find_by_diaspora_handle("diasporahq@joindiaspora.com")
= person_image_link(diasporahq, :size => :thumb_medium)
.name .name
= person_link(diasporahq) = person_link(diasporahq)
.info .info
= t('.get_updates_from_core') = t('.get_updates_from_core')
.add_to_aspect .add_to_aspect
= render :partial => 'people/relationship_action', = render :partial => 'people/relationship_action',
:locals => { :person => diasporahq, :locals => { :person => diasporahq,
:contact => current_user.contact_for(diasporahq), :contact => current_user.contact_for(diasporahq),
:current_user => current_user } :current_user => current_user }
#featured_users_pane #featured_users_pane
%h4 %h4

View file

@ -841,6 +841,8 @@ en:
getting_started: getting_started:
welcome: "Welcome!" welcome: "Welcome!"
welcome_with_name: "Welcome, %{name}!" welcome_with_name: "Welcome, %{name}!"
community_welcome: "Diaspora's community is happy to have you aboard!"
not_mandatory: "Completing the following steps will improve your Diaspora experience, but they are not mandatory."
finished: "Finished" finished: "Finished"