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

some more fixes I overlooked. Sorry

Browse source
This commit is contained in:
MrZYX 2010-11-10 22:07:40 +01:00 committed by Jonne Hass
parent f55a973685
commit 5ae4248b30
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/layouts/application.mobile.haml
View file

@ -30,4 +30,4 @@
%div{:data => {:role => 'fieldcontain'}} %div{:data => {:role => 'fieldcontain'}}
= form_tag(people_path, :method => 'get') do = form_tag(people_path, :method => 'get') do
= text_field_tag 'q', nil, :placeholder => t('.search'), :type => 'search' = text_field_tag 'q', nil, :placeholder => t('search'), :type => 'search'

8
app/views/registrations/edit.html.haml
View file

@ -1,5 +1,5 @@
%h2 %h2
Edit #{resource_name.to_s.humanize} = t('.edit', :name => resource_name.to_s.humanize)
= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| = form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f|
= devise_error_messages! = devise_error_messages!
%p %p
@ -8,7 +8,7 @@
= f.text_field :email = f.text_field :email
%p %p
= f.label :password = f.label :password
%i (leave blank if you don't want to change it) %i = t('.leave_blank')
%br/ %br/
= f.password_field :password = f.password_field :password
%p %p
@ -17,12 +17,12 @@
= f.password_field :password_confirmation = f.password_field :password_confirmation
%p %p
= f.label :current_password = f.label :current_password
%i (we need your current password to confirm your changes) %i = t('.password_to_confirm')
%br/ %br/
= f.password_field :current_password = f.password_field :current_password
%p %p
= f.submit t('.update') = f.submit t('.update')
%h3 t('.cancel_my_account') %h3 t('.cancel_my_account')
%p %p
Unhappy? #{link_to t('.cancel_my_account'), registration_path(resource_name), :confirm => t('are_you_sure'), :method => :delete}. = t('.unhappy') #{link_to t('.cancel_my_account'), registration_path(resource_name), :confirm => t('are_you_sure'), :method => :delete}.
= link_to t('.back'), :back = link_to t('.back'), :back

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

@ -218,6 +218,14 @@ en:
sign_up_for_diaspora: "Sign up for Diaspora" sign_up_for_diaspora: "Sign up for Diaspora"
create: create:
success: "You've joined Diaspora!" success: "You've joined Diaspora!"
edit:
edit: "Edit %{name}"
leave_blank: "(leave blank if you don't want to change it)"
password_to_confirm: "(we need your current password to confirm your changes)"
unhappy: "Unhappy?"
back: "Back"
update: "Update"
cancel_my_account: "Cancel my account"
invitations: invitations:
create: create:
sent: "Your invitation has been sent." sent: "Your invitation has been sent."