Use model attributes and attribute help for the registration fields

The disply name keeps its specific help, since it is different on the account settings page

diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index f8d3a7e8ec5ea29fd2d5a99d4178c1fe5065505c..7f640c708622d2a64de87cb0993078c93776d1d0 100644 (file)
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -18,10 +18,10 @@
     <%= bootstrap_form_for current_user, :url => { :action => "create" } do |f| %>
       <%= hidden_field_tag("referer", h(@referer)) unless @referer.nil? %>
 
     <%= bootstrap_form_for current_user, :url => { :action => "create" } do |f| %>
       <%= hidden_field_tag("referer", h(@referer)) unless @referer.nil? %>
 

-      <%= f.email_field :email, :label => t(".email address"), :tabindex => 1 %>
-      <%= f.email_field :email_confirmation, :label => t(".confirm email address"), :help => t(".not_displayed_publicly_html"), :tabindex => 2 %>
+      <%= f.email_field :email, :tabindex => 1 %>
+      <%= f.email_field :email_confirmation, :tabindex => 2 %>

 
 

-      <%= f.text_field :display_name, :label => t(".display name"), :help => t(".display name description"), :tabindex => 3 %>
+      <%= f.text_field :display_name, :help => t(".display name description"), :tabindex => 3 %>

 
       <fieldset class="form-group" id="auth_field">
         <label for="user_auth_provider"><%= t(".external auth") %></label>
 
       <fieldset class="form-group" id="auth_field">
         <label for="user_auth_provider"><%= t(".external auth") %></label>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index ea24854c66db2c3d51c5cf8e4719243fac079c52..c28492a27bec5e9dcb2df0ffc14201806eded5d0 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -121,6 +121,7 @@ en:
         details: Please provide some more details about the problem (required).
       user:
         email: "Email"
         details: Please provide some more details about the problem (required).
       user:
         email: "Email"

+        email_confirmation: "Email Confirmation"

         active: "Active"
         display_name: "Display Name"
         description: "Description"
         active: "Active"
         display_name: "Display Name"
         description: "Description"


@@ -133,6 +134,8 @@ en:
       user_block:
         reason: The reason why the user is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use laymans terms.
         needs_view: Does the user need to log in before this block will be cleared?
       user_block:
         reason: The reason why the user is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use laymans terms.
         needs_view: Does the user need to log in before this block will be cleared?

+      user:
+        email_confirmation: 'Your address is not displayed publicly, see our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information.'

   datetime:
     distance_in_words_ago:
       about_x_hours:
   datetime:
     distance_in_words_ago:
       about_x_hours:


@@ -2302,7 +2305,6 @@ en:
           <p>Sign up to get started contributing. We'll send an email to confirm your account.</p>
       email address: "Email Address:"
       confirm email address: "Confirm Email Address:"
           <p>Sign up to get started contributing. We'll send an email to confirm your account.</p>
       email address: "Email Address:"
       confirm email address: "Confirm Email Address:"

-      not_displayed_publicly_html: 'Your address is not displayed publicly, see our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information'

       display name: "Display Name:"
       display name description: "Your publicly displayed username. You can change this later in the preferences."
       external auth: "Third Party Authentication:"
       display name: "Display Name:"
       display name description: "Your publicly displayed username. You can change this later in the preferences."
       external auth: "Third Party Authentication:"