Merge remote-tracking branch 'upstream/pull/1809'

[rails.git] / app / views / user / new.html.erb

diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb
index 5a207060eeaf101548c6400f4f5b4808caf09ec3..7fd537d14101bcea6cd0487513e3be2a376b2798 100644 (file)
--- a/app/views/user/new.html.erb
+++ b/app/views/user/new.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :heading do %>
 <% end %>
 
 <% content_for :heading do %>

-  <h1><%= t 'user.new.title' %></h1>
+  <h1><%= t '.title' %></h1>

   <div class='header-illustration new-user-main'></div>
   <div class='header-illustration new-user-arm'></div>
 <% end %>
   <div class='header-illustration new-user-main'></div>
   <div class='header-illustration new-user-arm'></div>
 <% end %>


@@ -14,55 +14,55 @@
   <fieldset>
     <div class="form-row">
       <label for="email" class="standard-label">
   <fieldset>
     <div class="form-row">
       <label for="email" class="standard-label">

-        <%= t 'user.new.email address' %>
+        <%= t '.email address' %>

       </label>
       <%= f.email_field(:email, { :tabindex => 1 }) %>
       <%= f.error_message_on(:email) %>
     </div>
     <div class="form-row">
       <label for="email_confirmation" class="standard-label">
       </label>
       <%= f.email_field(:email, { :tabindex => 1 }) %>
       <%= f.error_message_on(:email) %>
     </div>
     <div class="form-row">
       <label for="email_confirmation" class="standard-label">

-        <%= t 'user.new.confirm email address' %>
+        <%= t '.confirm email address' %>

       </label>
       <%= f.email_field(:email_confirmation, { :tabindex => 2 }) %>
       <%= f.error_message_on(:email_confirmation) %>
     </div>
       </label>
       <%= f.email_field(:email_confirmation, { :tabindex => 2 }) %>
       <%= f.error_message_on(:email_confirmation) %>
     </div>

-    <span class="form-help deemphasize"><%= raw(t 'user.new.not displayed publicly') %></span>
+    <span class="form-help deemphasize"><%= raw(t '.not displayed publicly') %></span>

   </fieldset>
 
   <fieldset>
     <div class="form-row">
       <label for="display_name" class="standard-label">
   </fieldset>
 
   <fieldset>
     <div class="form-row">
       <label for="display_name" class="standard-label">

-        <%= t 'user.new.display name' %>
+        <%= t '.display name' %>

       </label>
       <%= f.text_field(:display_name, { :tabindex => 3 }) %>
       <%= f.error_message_on(:display_name) %>
     </div>
       </label>
       <%= f.text_field(:display_name, { :tabindex => 3 }) %>
       <%= f.error_message_on(:display_name) %>
     </div>

-    <span class="form-help deemphasize"><%= t 'user.new.display name description' %></span>
+    <span class="form-help deemphasize"><%= t '.display name description' %></span>

   </fieldset>
 
   <fieldset class="form-divider" id="auth_field">
     <div class="form-row">
       <label for="openid_url" class="standard-label">
   </fieldset>
 
   <fieldset class="form-divider" id="auth_field">
     <div class="form-row">
       <label for="openid_url" class="standard-label">

-        <%= raw t 'user.new.external auth' %>
+        <%= raw t '.external auth' %>

       </label>
       <%= f.select(:auth_provider, Auth::PROVIDERS, { :default => "", :tabindex => 4 }) %>
       <%= f.text_field(:auth_uid, { :tabindex => 5 }) %>
       <%= f.error_message_on(:auth_uid) %>
     </div>
       </label>
       <%= f.select(:auth_provider, Auth::PROVIDERS, { :default => "", :tabindex => 4 }) %>
       <%= f.text_field(:auth_uid, { :tabindex => 5 }) %>
       <%= f.error_message_on(:auth_uid) %>
     </div>

-    <span class="form-help deemphasize"><%= t 'user.new.auth no password' %></span>
+    <span class="form-help deemphasize"><%= t '.auth no password' %></span>

   </fieldset>
 
   <fieldset>
     <div class="form-row">
       <label for='user[pass_crypt]' class="standard-label">
   </fieldset>
 
   <fieldset>
     <div class="form-row">
       <label for='user[pass_crypt]' class="standard-label">

-        <%= t 'user.new.password' %>
+        <%= t '.password' %>

       </label>
       <%= f.password_field(:pass_crypt, { :tabindex => 6 }) %>
       <%= f.error_message_on(:pass_crypt) %>
     </div>
     <div class="form-row">
       <label class="standard-label">
       </label>
       <%= f.password_field(:pass_crypt, { :tabindex => 6 }) %>
       <%= f.error_message_on(:pass_crypt) %>
     </div>
     <div class="form-row">
       <label class="standard-label">

-        <%= t 'user.new.confirm password' %>
+        <%= t '.confirm password' %>

       </label>
       <%= f.password_field(:pass_crypt_confirmation, { :tabindex => 7 }) %>
       <%= f.error_message_on(:pass_crypt_confirmation) %>
       </label>
       <%= f.password_field(:pass_crypt_confirmation, { :tabindex => 7 }) %>
       <%= f.error_message_on(:pass_crypt_confirmation) %>


@@ -70,13 +70,13 @@
   </fieldset>
 
   <div id="auth_prompt" class="form-row">
   </fieldset>
 
   <div id="auth_prompt" class="form-row">

-    <%= link_to raw(t("user.new.use external auth")), "#", :id => "auth_enable" %>
+    <%= link_to raw(t(".use external auth")), "#", :id => "auth_enable" %>

   </div>
 
   </div>
 

-  <%= submit_tag t('user.new.continue'), :tabindex => 8 %>
+  <%= submit_tag t('.continue'), :tabindex => 8 %>

 <% end %>
 
 <div class='aside col6 deemphasize inner22'>
 <% end %>
 
 <div class='aside col6 deemphasize inner22'>

-  <h4><%= t 'user.new.about.header' %></h4>
-  <%= t 'user.new.about.html' %>
+  <h4><%= t '.about.header' %></h4>
+  <%= t '.about.html' %>

 </div>
 </div>