X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5449cf4adcc1fad4b9f43426e6d3e4a8f65e6fbb..e9bea64bf6806be1b0a951fd684fa13314cb8b67:/app/views/user/account.rhtml diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml index 178a0e8dc..4552c22a1 100644 --- a/app/views/user/account.rhtml +++ b/app/views/user/account.rhtml @@ -1,33 +1,33 @@ -

My settings

+

<%= t 'user.account.my settings' %>

<%= error_messages_for 'user' %> <% form_for :user, @user do |f| %> - - - - + + + + - + - + - class="nohome" <%end%> > + class="nohome" <%end%> > - +
Display Name : <%= f.text_field :display_name %>
Email : <%= f.text_field :email, {:size => 50, :maxlength => 255} %> (never displayed publicly)
Password : <%= f.password_field :pass_crypt, {:value => '', :size => 30, :maxlength => 255} %>
Confirm Password : <%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255} %>
<%= t 'user.new.display name' %><%= f.text_field :display_name %>
<%= t 'user.new.email address' %><%= f.text_field :email, {:size => 50, :maxlength => 255} %> <%= t 'user.account.email never displayed publicly' %>
<%= t 'user.new.password' %><%= f.password_field :pass_crypt, {:value => '', :size => 30, :maxlength => 255} %>
<%= t 'user.new.confirm password' %><%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255} %>
Public editing :<%= t 'user.account.public editing.heading' %> <% if @user.data_public? %> - Enabled. Not anonymous (what's this?) + <%= t 'user.account.public editing.enabled' %> (<%= t 'user.account.public editing.enabled link text' %>) <% else %> - Disabled and anonymous. (why's this bad?) + <%= t 'user.account.public editing.disabled' %>(<%= t 'user.account.public editing.disabled link text' %>) <% end %>
Profile Description : <%= f.text_area :description, :rows => '5', :cols => '60' %>

<%= t 'user.account.profile description' %><%= f.text_area :description, :rows => '5', :cols => '60' %>

Home Location : You have not entered your home location.Latitude: <%= f.text_field :home_lat, :size => 20, :id => "home_lat" %> Longitude <%= f.text_field :home_lon, :size => 20, :id => "home_lon" %>
<%= t 'user.account.home location' %><%= t 'user.account.no home location' %><%= t 'user.account.latitude' %> <%= f.text_field :home_lat, :size => 20, :id => "home_lat" %><%= t 'user.account.longitude' %><%= f.text_field :home_lon, :size => 20, :id => "home_lon" %>
-

Update home location when I click on the map? checked="checked" <% end %> id="updatehome" />

+

<%= t 'user.account.update home location on click' %> checked="checked" <% end %> id="updatehome" />



<%= submit_tag 'Save Changes' %>


<%= submit_tag t('user.account.save changes button') %>

@@ -38,14 +38,14 @@

Public editing

Currently your edits are anonymous and people can't send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. - You will need to do this if you want to use the online editor and it is encouraged to do so (find out why).
+ Since the 0.6 API changeover, only public users can edit map data. (find out why).
Your email address will not be revealed by becoming public.
This action cannot be reversed and all new users are now public by default.


- <%= button_to "Make all my edits public", :action => :go_public %> + <%= button_to t('user.account.make all my edits public button'), :action => :go_public %> <% end %>

-<%= link_to 'return to profile', :controller => 'user', :action => @user.display_name %> +<%= link_to t('user.account.return to profile'), :controller => 'user', :action => @user.display_name %>