X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/083500f056f5b995f1979f88b37793046d9e4d37..697e36f364506037efb198f454226ca1eb956bed:/app/views/users/account.html.erb?ds=sidebyside diff --git a/app/views/users/account.html.erb b/app/views/users/account.html.erb index 7638b7a77..394e81cd1 100644 --- a/app/views/users/account.html.erb +++ b/app/views/users/account.html.erb @@ -3,143 +3,143 @@ <% end %> <% content_for :heading do %> -

<%= t '.my settings' %>

+

<%= t ".my settings" %>

<% end %> <%= error_messages_for current_user %> -<%= form_for current_user, :url => { :action => :account }, :method => :post, :html => { :multipart => true, :id => 'accountForm', :class => 'standard-form', :autocomplete => :off } do |f| %> +<%= form_for current_user, :url => { :action => :account }, :method => :post, :html => { :multipart => true, :id => "accountForm", :class => "standard-form", :autocomplete => :off } do |f| %>
-
- +
+ <%= f.text_field :display_name %>
-
- +
+ - <%= t '.email never displayed publicly' %> + <%= t ".email never displayed publicly" %>
-
- +
+ <%= f.email_field :new_email, :autocomplete => :off %> - <%= t '.email never displayed publicly' %> + <%= t ".email never displayed publicly" %>
-
- - <%= f.password_field :pass_crypt, {:value => '', :autocomplete => :off} %> +
+ + <%= f.password_field :pass_crypt, :value => "", :autocomplete => :off %>
-
- - <%= f.password_field :pass_crypt_confirmation, {:value => '', :autocomplete => :off} %> +
+ + <%= f.password_field :pass_crypt_confirmation, :value => "", :autocomplete => :off %>
-
- - <%= f.select :auth_provider, Auth::PROVIDERS %> +
+ + <%= f.select :auth_provider, Auth.providers %> <%= f.text_field :auth_uid %> - (<%= t '.openid.link text' %>) -
+ (" target="_new"><%= t ".openid.link text" %>) +
-
- +
+ <% if current_user.data_public? %> - <%= t '.public editing.enabled' %> - (<%= t '.public editing.enabled link text' %>) + <%= t ".public editing.enabled" %> + (" target="_new"><%= t ".public editing.enabled link text" %>) <% else %> - <%= t '.public editing.disabled' %> - (<%= t '.public editing.disabled link text' %>) + <%= t ".public editing.disabled" %> + (<%= t ".public editing.disabled link text" %>) <% end %>
-
- +
+ <% if current_user.terms_agreed? %> - <%= t '.contributor terms.agreed' %> - (<%= t '.contributor terms.link text' %>) + <%= t ".contributor terms.agreed" %> + (" target="_new"><%= t ".contributor terms.link text" %>) <% if current_user.consider_pd? %> - <%= t '.contributor terms.agreed_with_pd' %> + <%= t ".contributor terms.agreed_with_pd" %> <% end %> <% else %> - <%= t '.contributor terms.not yet agreed' %> - <%= link_to t('.contributor terms.review link text'), :controller => 'users', :action => 'terms' %> + <%= t ".contributor terms.not yet agreed" %> + <%= link_to t(".contributor terms.review link text"), :controller => "users", :action => "terms" %> <% end %>
-
- - <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{DEFAULT_EDITOR}.name")), 'default']] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %> +
+ + <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{Settings.default_editor}.name")), "default"]] + Editors::AVAILABLE_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %>
-
- +
+ <%= richtext_area :user, :description, :object => current_user, :cols => 80, :rows => 20 %>
-
- +
+ <%= f.text_field :languages %>
-
- +
+ <%= user_image current_user %>
    - <% if current_user.image.file? %> + <% if current_user.avatar.attached? %>
  • - <%= radio_button_tag "image_action", "keep", !current_user.image_use_gravatar %> - + <%= radio_button_tag "avatar_action", "keep", !current_user.image_use_gravatar %> +
    • <% end %> - <% if current_user.image.file? || current_user.image_use_gravatar? %> + <% if current_user.avatar.attached? || current_user.image_use_gravatar? %>
  • - <%= radio_button_tag "image_action", "delete" %> - + <%= radio_button_tag "avatar_action", "delete" %> +
    • <% end %> - <% if current_user.image.file? %> + <% if current_user.avatar.attached? %>
  • - <%= radio_button_tag "image_action", "new" %> -
    • <% else %>
  • - <%= radio_button_tag "image_action", "new" %> -
    • <% end %>
  • - <%= radio_button_tag "image_action", "gravatar", current_user.image_use_gravatar %> -
@@ -147,34 +147,34 @@
-
- -
class="nohome"<%end%> > -

<%= t '.no home location' %>

+
+ +
class="nohome"<% end %>> +

<%= t ".no home location" %>

- + <%= f.text_field :home_lat, :id => "home_lat" %>
- + <%= f.text_field :home_lon, :id => "home_lon" %>
-
+
checked="checked" <% end %> id="updatehome" /> - +
- <%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %> + <%= tag.div "", :id => "map", :class => "content_map set_location" %>
- <%= submit_tag t('.save changes button') %> + <%= submit_tag t(".save changes button") %> <% end %> <% unless current_user.data_public? %> -

<%= t '.public editing note.heading' %>

-<%= raw t '.public editing note.text' %> - <%= button_to t('.make edits public button'), :action => :go_public %> +

<%= t ".public editing note.heading" %>

+<%= t ".public editing note.html" %> + <%= button_to t(".make edits public button"), :action => :go_public %> <% end %>