some more fixes I overlooked. Sorry
This commit is contained in:
parent
f55a973685
commit
5ae4248b30
3 changed files with 13 additions and 5 deletions
|
|
@ -30,4 +30,4 @@
|
|||
|
||||
%div{:data => {:role => 'fieldcontain'}}
|
||||
= 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'
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
%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|
|
||||
= devise_error_messages!
|
||||
%p
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
= f.text_field :email
|
||||
%p
|
||||
= f.label :password
|
||||
%i (leave blank if you don't want to change it)
|
||||
%i = t('.leave_blank')
|
||||
%br/
|
||||
= f.password_field :password
|
||||
%p
|
||||
|
|
@ -17,12 +17,12 @@
|
|||
= f.password_field :password_confirmation
|
||||
%p
|
||||
= f.label :current_password
|
||||
%i (we need your current password to confirm your changes)
|
||||
%i = t('.password_to_confirm')
|
||||
%br/
|
||||
= f.password_field :current_password
|
||||
%p
|
||||
= f.submit t('.update')
|
||||
%h3 t('.cancel_my_account')
|
||||
%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
|
||||
|
|
|
|||
|
|
@ -218,6 +218,14 @@ en:
|
|||
sign_up_for_diaspora: "Sign up for Diaspora"
|
||||
create:
|
||||
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:
|
||||
create:
|
||||
sent: "Your invitation has been sent."
|
||||
|
|
|
|||
Loading…
Reference in a new issue