fixing conflicts [#45]

app/views/devise/confirmations/new.html.erb

@@ -1,15 +1,15 @@
-<h2>Resend confirmation instructions</h2>
+<h2><%= t("devise_views.confirmations.title") %></h2>
 
 <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
   <%= devise_error_messages! %>
 
   <div class="field">
-    <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true, value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %> 
+    <%= f.label :email, t("devise_views.confirmations.email_label") %><br />
+    <%= f.email_field :email, autofocus: true, value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %>
   </div>
 
   <div class="actions">
-    <%= f.submit "Resend confirmation instructions" %>
+    <%= f.submit(t("devise_views.confirmations.submit"), class: "button radius") %>
   </div>
 <% end %>
 

app/views/devise/mailer/confirmation_instructions.html.erb

@@ -1,5 +1,5 @@
-<p>Welcome <%= @email %>!</p>
+<p><%= t("devise_views.mailer.confirmation_instructions.welcome") %> <%= @email %></p>
 
-<p>You can confirm your account email through the link below:</p>
+<p><%= t("devise_views.mailer.confirmation_instructions.text") %></p>
 
-<p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %></p>
+<p><%= link_to t("devise_views.mailer.confirmation_instructions.confirm_link"), confirmation_url(@resource, confirmation_token: @token) %></p>

app/views/devise/mailer/reset_password_instructions.html.erb

@@ -1,8 +1,8 @@
-<p>Hello <%= @resource.email %>!</p>
+<p><%= t("devise_views.mailer.reset_password_instructions.hello") %> <%= @resource.email %></p>
 
-<p>Someone has requested a link to change your password. You can do this through the link below.</p>
+<p><%= t("devise_views.mailer.reset_password_instructions.text") %></p>
 
-<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p>
+<p><%= link_to t("devise_views.mailer.reset_password_instructions.change_link"), edit_password_url(@resource, reset_password_token: @token) %></p>
 
-<p>If you didn't request this, please ignore this email.</p>
-<p>Your password won't change until you access the link above and create a new one.</p>
+<p><%= t("devise_views.mailer.reset_password_instructions.ignore_text") %></p>
+<p><%= t("devise_views.mailer.reset_password_instructions.info_text") %></p>

app/views/devise/mailer/unlock_instructions.html.erb

@@ -1,7 +1,7 @@
-<p>Hello <%= @resource.email %>!</p>
+<p><%= t("devise_views.mailer.unlock_instructions.hello") %> <%= @resource.email %></p>
 
-<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
+<p><%= t("devise_views.mailer.unlock_instructions.info_text") %></p>
 
-<p>Click the link below to unlock your account:</p>
+<p><%= t("devise_views.mailer.unlock_instructions.instructions_text") %></p>
 
-<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %></p>
+<p><%= link_to t("devise_views.mailer.unlock_instructions.unlock_link"), unlock_url(@resource, unlock_token: @token) %></p>

app/views/devise/menu/_login_items.html.erb

@@ -1,14 +1,14 @@
 <ul class="right">
 	<% if user_signed_in? %>
 		<li>
-			<%= link_to('Salir', destroy_user_session_path, method: :delete) %>
+			<%= link_to(t("devise_views.menu.login_items.logout"), destroy_user_session_path, method: :delete) %>
 		</li>
 	<% else %>
 		<li>
-			<%= link_to('Entrar', new_user_session_path)  %>
+			<%= link_to(t("devise_views.menu.login_items.login"), new_user_session_path)  %>
 		</li>
 		<li class="active">
-			<%= link_to('Registrarse', new_user_registration_path) %>
+			<%= link_to(t("devise_views.menu.login_items.signup"), new_user_registration_path) %>
 		</li>
 	<% end %>
 </ul>

app/views/devise/passwords/edit.html.erb

@@ -1,24 +1,24 @@
-<h2>Change your password</h2>
+<h2><%= t("devise_views.passwords.edit.title") %></h2>
 
 <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
   <%= devise_error_messages! %>
   <%= f.hidden_field :reset_password_token %>
 
   <div class="field">
-    <%= f.label :password, "New password" %><br />
+    <%= f.label :password, t("devise_views.passwords.edit.password_label") %><br />
     <% if @minimum_password_length %>
-    <em>(<%= @minimum_password_length %> characters minimum)</em>
+    <em><%= t("devise_views.passwords.edit.min_length", min: @minimum_password_length) %></em>
     <% end %><br />
     <%= f.password_field :password, autofocus: true, autocomplete: "off" %>
   </div>
 
   <div class="field">
-    <%= f.label :password_confirmation, "Confirm new password" %><br />
+    <%= f.label :password_confirmation, t("devise_views.passwords.edit.password_confirmation_label") %><br />
     <%= f.password_field :password_confirmation, autocomplete: "off" %>
   </div>
 
   <div class="actions">
-    <%= f.submit "Change my password" %>
+    <%= f.submit t("devise_views.passwords.edit.change_submit") %>
   </div>
 <% end %>
 

app/views/devise/passwords/new.html.erb

@@ -1,15 +1,15 @@
-<h2>Forgot your password?</h2>
+<h2><%= t("devise_views.passwords.new.title") %></h2>
 
 <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
   <%= devise_error_messages! %>
 
   <div class="field">
-    <%= f.label :email %><br />
+    <%= f.label :email, t("devise_views.passwords.new.email_label")  %><br />
     <%= f.email_field :email, autofocus: true %>
   </div>
 
   <div class="actions">
-    <%= f.submit "Send me reset password instructions" %>
+    <%= f.submit t("devise_views.passwords.new.send_submit") %>
   </div>
 <% end %>
 

app/views/devise/registrations/edit.html.erb

@@ -1,39 +1,39 @@
-<h2>Edit <%= resource_name.to_s.humanize %></h2>
+<h2><%= t("devise_views.registrations.edit.edit") %> <%= resource_name.to_s.humanize %></h2>
 
 <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
   <%= devise_error_messages! %>
 
   <div class="field">
-    <%= f.label :email %><br />
+    <%= f.label :email, t("devise_views.registrations.edit.email_label") %><br />
     <%= f.email_field :email, autofocus: true %>
   </div>
 
   <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
-    <div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div>
+    <div><%= t("devise_views.registrations.edit.waiting_for") %> <%= resource.unconfirmed_email %></div>
   <% end %>
 
   <div class="field">
-    <%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
+    <%= f.label :password, t("devise_views.registrations.edit.password_label") %> <i><%= t("devise_views.registrations.edit.leave_blank") %></i><br />
     <%= f.password_field :password, autocomplete: "off" %>
   </div>
 
   <div class="field">
-    <%= f.label :password_confirmation %><br />
+    <%= f.label :password_confirmation, t("devise_views.registrations.edit.password_confirmation_label") %><br />
     <%= f.password_field :password_confirmation, autocomplete: "off" %>
   </div>
 
   <div class="field">
-    <%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
+    <%= f.label :current_password, t("devise_views.registrations.edit.current_password_label") %> <i><%= t("devise_views.registrations.edit.need_current") %></i><br />
     <%= f.password_field :current_password, autocomplete: "off" %>
   </div>
 
   <div class="actions">
-    <%= f.submit "Update" %>
+    <%= f.submit t("devise_views.registrations.edit.update_submit") %>
   </div>
 <% end %>
 
-<h3>Cancel my account</h3>
+<h3><%= t("devise_views.registrations.edit.cancel_title") %></h3>
 
-<p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %></p>
+<p><%= t("devise_views.registrations.edit.cancel_text") %> <%= button_to t("devise_views.registrations.edit.cancel_link"), registration_path(resource_name), data: { confirm: t("devise_views.registrations.edit.cancel_confirm") }, method: :delete %></p>
 
-<%= link_to "Back", :back %>
+<%= link_to t("devise_views.registrations.edit.back_link"), :back %>

app/views/devise/registrations/new.html.erb

@@ -1,41 +1,41 @@
-<h2>Sign up</h2>
+<h2><%= t("devise_views.registrations.new.title") %></h2>
 
 <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
   <%= devise_error_messages! %>
 
 
   <div class="field">
-    <%= f.label :first_name %><br />
+    <%= f.label :first_name, t("devise_views.registrations.new.first_name_label") %><br />
     <%= f.text_field :first_name, autofocus: true %>
   </div>
 
   <div class="field">
-    <%= f.label :last_name %><br />
+    <%= f.label :last_name, t("devise_views.registrations.new.last_name_label") %><br />
     <%= f.text_field :last_name %>
   </div>
 
   <div class="field">
-    <%= f.label :email %><br />
+    <%= f.label :email, t("devise_views.registrations.new.email_label") %><br />
     <%= f.email_field :email %>
   </div>
 
   <div class="field">
-    <%= f.label :password %>
+    <%= f.label :password, t("devise_views.registrations.new.password_label") %>
     <% if @minimum_password_length %>
-    <em>(<%= @minimum_password_length %> characters minimum)</em>
+    <em><%= t("devise_views.registrations.new.min_length", min: @minimum_password_length) %></em>
     <% end %><br />
     <%= f.password_field :password, autocomplete: "off" %>
   </div>
 
   <div class="field">
-    <%= f.label :password_confirmation %><br />
+    <%= f.label :password_confirmation, t("devise_views.registrations.new.password_confirmation_label") %><br />
     <%= f.password_field :password_confirmation, autocomplete: "off" %>
   </div>
 
   <%= render 'shared/captcha', resource: resource %>
 
   <div class="actions" style="padding-top:20px">
-    <%= f.submit "Registrarse", class: 'button radius' %>
+    <%= f.submit t("devise_views.registrations.new.submit"), class: 'button radius' %>
   </div>
 <% end %>
 

app/views/devise/sessions/new.html.erb

@@ -1,25 +1,25 @@
-<h2>Log in</h2>
+<h2><%= t("devise_views.sessions.new.title") %></h2>
 
 <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
   <div class="field">
-    <%= f.label :email %><br />
+    <%= f.label :email, t("devise_views.sessions.new.email_label") %><br />
     <%= f.email_field :email, autofocus: true %>
   </div>
 
   <div class="field">
-    <%= f.label :password %><br />
+    <%= f.label :password, t("devise_views.sessions.new.password_label") %><br />
     <%= f.password_field :password, autocomplete: "off" %>
   </div>
 
   <% if devise_mapping.rememberable? -%>
     <div class="field">
       <%= f.check_box :remember_me %>
-      <%= f.label :remember_me %>
+      <%= f.label :remember_me, t("devise_views.sessions.new.remember_me") %>
     </div>
   <% end -%>
 
   <div class="actions">
-    <%= f.submit "Entrar" %>
+    <%= f.submit(t("devise_views.sessions.new.submit"), class: "button radius") %>
   </div>
 <% end %>
 

app/views/devise/shared/_links.html.erb

@@ -1,25 +1,25 @@
 <%- if controller_name != 'sessions' %>
-  <%= link_to "Log in", new_session_path(resource_name) %><br />
+  <%= link_to t("devise_views.shared.links.login"), new_session_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
-  <%= link_to "Sign up", new_registration_path(resource_name) %><br />
+  <%= link_to t("devise_views.shared.links.signup"), new_registration_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
-  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
+  <%= link_to t("devise_views.shared.links.new_password"), new_password_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
+  <%= link_to t("devise_views.shared.links.new_confirmation"), new_confirmation_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
-  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
+  <%= link_to t("devise_views.shared.links.new_unlock"), new_unlock_path(resource_name) %><br />
 <% end -%>
 
 <%- if devise_mapping.omniauthable? %>
   <%- resource_class.omniauth_providers.each do |provider| %>
-    <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
+    <%= link_to t("devise_views.shared.links.signin_with_provider", provider: provider.to_s.titleize), omniauth_authorize_path(resource_name, provider) %><br />
   <% end -%>
 <% end -%>

app/views/devise/unlocks/new.html.erb

@@ -1,15 +1,15 @@
-<h2>Resend unlock instructions</h2>
+<h2><%= t("devise_views.unlocks.new.title") %></h2>
 
 <%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
   <%= devise_error_messages! %>
 
   <div class="field">
-    <%= f.label :email %><br />
+    <%= f.label :email, t("devise_views.unlocks.new.email_label") %><br />
     <%= f.email_field :email, autofocus: true %>
   </div>
 
   <div class="actions">
-    <%= f.submit "Resend unlock instructions" %>
+    <%= f.submit t("devise_views.unlocks.new.submit") %>
   </div>
 <% end %>