X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cd66a5db99fda4920ed559ec71163d5d01ba1f4a..85e99d3127e5febcf4698c9d2576f653775af787:/app/views/user/account.html.erb?ds=sidebyside diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb index f4523c577..abece879f 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -68,7 +68,7 @@ <%= t 'user.account.preferred editor' %> - <%= f.select :preferred_editor, Editors::ALL_EDITORS.collect { |e| [t('user.account.editor.'+e), e] } %> + <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{DEFAULT_EDITOR}.name")), 'default']] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %> @@ -101,7 +101,7 @@ class="nohome" <%end%> > <%= 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" %> + <%= 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" %> @@ -119,7 +119,7 @@ <% end %> -<%= render :partial => 'map' %> +<%= render :partial => 'map', :locals => { :setting_location => true, :show_other_users => false } %> <% unless @user.data_public? %>