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

[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 fcd775a484eca5046710e344a2ecdc92dce5fe3c..7fd537d14101bcea6cd0487513e3be2a376b2798 100644 (file)
--- a/app/views/user/new.html.erb
+++ b/app/views/user/new.html.erb
@@ -3,80 +3,80 @@
 <% 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 %>
 
-<%= form_for :user, :url => { :action => 'create' }, :html => { :class => 'standard-form fillL col6 inner22' } do %>
+<%= form_for current_user, :url => { :action => 'create' }, :html => { :class => 'standard-form fillL col6 inner22' } do |f| %>
   <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>
 
   <fieldset>
     <div class="form-row">
       <label for="email" class="standard-label">
-        <%= t 'user.new.email address' %>
+        <%= t '.email address' %>
       </label>
-      <%= email_field(:user, :email, { :tabindex => 1 }) %>
-      <%= error_message_on(:user, :email) %>
+      <%= 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>
-      <%= email_field(:user, :email_confirmation, { :tabindex => 2 }) %>
-      <%= error_message_on(:user, :email_confirmation) %>
+      <%= 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">
-        <%= t 'user.new.display name' %>
+        <%= t '.display name' %>
       </label>
-      <%= text_field(:user, :display_name, { :tabindex => 3 }) %>
-      <%= error_message_on(:user, :display_name) %>
+      <%= 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">
-        <%= raw t 'user.new.external auth' %>
+        <%= raw t '.external auth' %>
       </label>
-      <%= select(:user, :auth_provider, Auth::PROVIDERS, { :default => "", :tabindex => 4 }) %>
-      <%= text_field(:user, :auth_uid, { :tabindex => 5 }) %>
-      <%= error_message_on(:user, :auth_uid) %>
+      <%= 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">
-        <%= t 'user.new.password' %>
+        <%= t '.password' %>
       </label>
-      <%= password_field(:user, :pass_crypt, { :tabindex => 6 }) %>
-      <%= error_message_on(:user, :pass_crypt) %>
+      <%= 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>
-      <%= password_field(:user, :pass_crypt_confirmation, { :tabindex => 7 }) %>
-      <%= error_message_on(:user, :pass_crypt_confirmation) %>
+      <%= f.password_field(:pass_crypt_confirmation, { :tabindex => 7 }) %>
+      <%= f.error_message_on(:pass_crypt_confirmation) %>
     </div>
   </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>
 
-  <%= submit_tag t('user.new.continue'), :tabindex => 8 %>
+  <%= submit_tag t('.continue'), :tabindex => 8 %>
 <% 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>