nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

eliminated senseless duplicates in en.yml

Browse source
This commit is contained in:
MrZYX 2010-11-07 14:44:56 +01:00 committed by Jonne Hass
parent a957ba3aed
commit 748efb1860
4 changed files with 18 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/views/users/getting_started/_step_1.html.haml
View file

@ -7,42 +7,42 @@
%h3
= t('.your_profile')
.description
= t('.info')
= t('people.edit.info_available_to')
= person.error_messages
= person.fields_for :profile do |profile|
%h4
= t('.your_name')
= profile.text_field :first_name, :value => @profile.first_name, :placeholder => t('.first_name')
= profile.text_field :last_name, :value => @profile.last_name, :placeholder => t('.last_name')
= t('people.edit.your_name')
= profile.text_field :first_name, :value => @profile.first_name, :placeholder => t('people.edit.first_name')
= profile.text_field :last_name, :value => @profile.last_name, :placeholder => t('people.edit.last_name')
%h4
= t('.your_gender')
= t('people.edit.your_gender')
%br
= profile.text_field :gender, :value => @profile.gender, :placeholder => t("fill_me_out")
%h4
= t('.your_birthday')
= t('people.edit.your_birthday')
%br
= select_date @person.profile.birthday, :prompt => true, :default => true, :order => t('date.order'), :start_year => 2000, :end_year => 1930
%h4
= t('.your_bio')
= t('people.edit.your_bio')
= profile.text_area :bio, :value => @profile.bio, :rows => 5, :placeholder => t('fill_me_out')
%h4
= t('.your_photo')
= t('people.edit.your_photo')
= render 'people/profile_photo_upload', :form => profile
%h4
= t('search')
%p{:class=>"checkbox_select"}
= profile.label :searchable, t('.allow_searchable')
= profile.label :searchable, t('people.edit.allow_search')
= profile.check_box :searchable, {:checked => @person.profile.searchable}, true, false
= hidden_field_tag :getting_started, @step
.submit_block
= person.submit "#{t('.save_and_continue')} →"
= person.submit "#{t('users.getting_started.save_and_continue')} →"

4
app/views/users/getting_started/_step_2.html.haml
View file

@ -22,7 +22,7 @@
- for friend in aspect.person_objects
= person_image_link(friend)
= link_to (image_tag('add_friend_button.png', :title => t('.add_to', :aspect => aspect))), '#manage_aspect_contacts_pane', :class => 'manage_aspect_contacts_button'
= link_to (image_tag('add_friend_button.png', :title => t('shared.aspect_friends.add_to', :aspect => aspect))), '#manage_aspect_contacts_pane', :class => 'manage_aspect_contacts_button'
.fancybox_content
#manage_aspect_contacts_pane
@ -34,5 +34,5 @@
%br
.submit_block
= link_to "#{t('.save_and_continue')} →", getting_started_path(:step => 3), :class => "button"
= link_to "#{t('users.getting_started.save_and_continue')} →", getting_started_path(:step => 3), :class => "button"

10
app/views/users/getting_started/_step_3.html.haml
View file

@ -11,13 +11,13 @@
- for service in @services
%h3
%b= service.provider
= t('.logged_in_as')
= t('services.index.logged_in_as')
%b= service.nickname
= link_to t('.disconnect'), service, :confirm => t('.disconnect_from', :service => service.provider), :method => :delete
= link_to t('services.index.disconnect'), service, :confirm => t('services.index.really_disconnect', :service => service.provider), :method => :delete
%h4= link_to t('.connect_to_twitter'), "/auth/twitter" if SERVICES['twitter']['consumer_key']!= ""
%h4= link_to t('.connect_to_facebook'), "/auth/facebook" if SERVICES['facebook']['app_id'] !=""
%h4= link_to t('services.index.connect_to_twitter'), "/auth/twitter" if SERVICES['twitter']['consumer_key']!= ""
%h4= link_to t('services.index.connect_to_facebook'), "/auth/facebook" if SERVICES['facebook']['app_id'] !=""
.submit_block
= link_to "#{t('.save_and_continue')} →", getting_started_path(:step => 4), :class => "button"
= link_to "#{t('users.getting_started.save_and_continue')} →", getting_started_path(:step => 4), :class => "button"

22
config/locales/diaspora/en.yml
View file

@ -84,8 +84,6 @@ en:
view_profile: "View profile"
status_messages: "status messages"
viewing: "viewing"
add_friend_dropdown:
add_to: "add to %{aspect}"
public_explain:
title: "You are about to post a public message!"
outside: "Public messages will be available for others outside of Diaspora to see."
@ -151,34 +149,17 @@ en:
define_aspects: "Define your aspects"
connect_services: "Connect your services"
skip: "skip getting started"
save_and_continue: "Save and continue"
step_1:
your_profile: "Your Profile"
info: "This info will be available to whomever you connect with on Diaspora."
your_name: "Your name"
first_name: "First name"
last_name: "Last name"
your_gender: "Your gender"
your_birthday: "Your birthday"
your_bio: "Your bio"
your_photo: "Your photo"
allow_searchable: "Allow for people to search for you"
save_and_continue: "Save and continue"
step_2:
your_aspects: "Your aspects"
description: "Tell Diaspora what different aspects of you are seen by different friends. You can manage these later by clicking the manage tab on the top right. Your aspects are unique to you, and not visible by others."
aspect_name: "Aspect name"
add: "Add"
add_to: "add to %{aspect}"
save_and_continue: "Save and continue"
step_3:
your_services: "Your services"
description: 'Connect your existing social networks to your Diaspora account. You will be able to post publically through your Everyone tab when you select "public."'
logged_in_as: "logged in as"
disconnect: "disconnect"
disconnect_from: "disconnect %{service}?"
connect_to_twitter: "Connect to twitter"
connect_to_facebook: "Connect to facebook"
save_and_continue: "Save and continue"
step_4:
set_up: "You're all set up, %{name}!"
ready_to_share: "You're now ready to start sharing with "
@ -261,7 +242,6 @@ en:
status_messages: "status messages"
people:
person:
add_friend: "add friend"
pending_request: "pending request"
already_friends: "Already friends"
thats_you: "thats you!"