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

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

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

-  <h1><%= t '.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 %>
 

-<%= 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? %>
+<%= 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">
 
   <fieldset>
     <div class="form-row">
       <label for="email" class="standard-label">

-        <%= t '.email address' %>
+        <%= t ".email address" %>

       </label>
       </label>

-      <%= f.email_field(:email, { :tabindex => 1 }) %>
+      <%= f.email_field(:email, :tabindex => 1) %>

       <%= f.error_message_on(:email) %>
     </div>
     <div class="form-row">
       <label for="email_confirmation" class="standard-label">
       <%= f.error_message_on(:email) %>
     </div>
     <div class="form-row">
       <label for="email_confirmation" class="standard-label">

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

       </label>
       </label>

-      <%= f.email_field(:email_confirmation, { :tabindex => 2 }) %>
+      <%= f.email_field(:email_confirmation, :tabindex => 2) %>

       <%= f.error_message_on(:email_confirmation) %>
     </div>
       <%= f.error_message_on(:email_confirmation) %>
     </div>

-    <span class="form-help deemphasize"><%= raw(t '.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 '.display name' %>
+        <%= t ".display name" %>

       </label>
       </label>

-      <%= f.text_field(:display_name, { :tabindex => 3 }) %>
+      <%= f.text_field(:display_name, :tabindex => 3) %>

       <%= f.error_message_on(:display_name) %>
     </div>
       <%= f.error_message_on(:display_name) %>
     </div>

-    <span class="form-help deemphasize"><%= t '.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 '.external auth' %>
+        <%= raw t ".external auth" %>

       </label>
       </label>

-      <%= f.select(:auth_provider, Auth::PROVIDERS, { :default => "", :tabindex => 4 }) %>
-      <%= f.text_field(:auth_uid, { :tabindex => 5 }) %>
+      <%= f.select(:auth_provider, Auth::PROVIDERS, :default => "", :tabindex => 4) %>
+      <%= f.text_field(:auth_uid, :tabindex => 5) %>

       <%= f.error_message_on(:auth_uid) %>
     </div>
       <%= f.error_message_on(:auth_uid) %>
     </div>

-    <span class="form-help deemphasize"><%= t '.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 '.password' %>
+        <%= t ".password" %>

       </label>
       </label>

-      <%= f.password_field(:pass_crypt, { :tabindex => 6 }) %>
+      <%= f.password_field(:pass_crypt, :tabindex => 6) %>

       <%= f.error_message_on(:pass_crypt) %>
     </div>
     <div class="form-row">
       <label class="standard-label">
       <%= f.error_message_on(:pass_crypt) %>
     </div>
     <div class="form-row">
       <label class="standard-label">

-        <%= t '.confirm password' %>
+        <%= t ".confirm password" %>

       </label>
       </label>

-      <%= f.password_field(:pass_crypt_confirmation, { :tabindex => 7 }) %>
+      <%= f.password_field(:pass_crypt_confirmation, :tabindex => 7) %>

       <%= f.error_message_on(:pass_crypt_confirmation) %>
     </div>
   </fieldset>
       <%= f.error_message_on(:pass_crypt_confirmation) %>
     </div>
   </fieldset>


@@ -73,10 +73,10 @@
     <%= link_to raw(t(".use external auth")), "#", :id => "auth_enable" %>
   </div>
 
     <%= link_to raw(t(".use external auth")), "#", :id => "auth_enable" %>
   </div>
 

-  <%= submit_tag t('.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 '.about.header' %></h4>
-  <%= t '.about.html' %>
+  <h4><%= t ".about.header" %></h4>
+  <%= t ".about.html" %>

 </div>
 </div>