* add i18n for devise and rails_admin

* update devise views for rails_admin login

Author: simonfranzen

Gemfile

@@ -7,17 +7,20 @@ ruby '2.6.5'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 6.0.3'
+gem 'rails-i18n', '~> 6.0.0'
 
 # Use postgresql as the database for Active Record
 gem 'pg'
 
 gem 'bcrypt', '~> 3.1.7'                    # Use ActiveModel has_secure_password
 gem 'devise'                                # Use devise as authentication module
-gem 'graphql'
+gem 'devise-i18n'                           # Install default translations
+gem 'graphql'                               # GraphQL as API
 gem 'graphql-auth', git: '[email protected]:simonfranzen/graphql-auth.git', branch: 'rails6'
 gem 'graphql-errors'                        # GrapqhQL error handling
 gem 'rack-cors'                             # Rack CORS settings
 gem 'rails_admin', '~> 2.0.2'               # Admin interface
+gem 'rails_admin-i18n'                      # Use default rails_admin translations
 gem 'cancancan'                             # Defining abilities
 gem 'image_processing', '~> 1.2'            # Image processing
 gem 'mini_magick'                           # Image manipulation with rmagick
@@ -62,6 +65,7 @@ group :test do
   gem 'rails-controller-testing'
   gem 'shoulda-matchers', '4.0.0.rc1'
   gem 'simplecov', require: false
+  gem 'i18n-spec'
 end
 
 group :development do

Gemfile.lock

@@ -91,6 +91,8 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
+    devise-i18n (1.9.2)
+      devise (>= 4.7.1)
     diff-lcs (1.3)
     docile (1.3.2)
     dotenv (2.7.2)
@@ -122,9 +124,13 @@ GEM
       tilt
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
+    i18n-spec (0.6.0)
+      iso
     image_processing (1.11.0)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
+    iso (0.3.0)
+      i18n
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -208,6 +214,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
+    rails-i18n (6.0.0)
+      i18n (>= 0.7, < 2)
+      railties (>= 6.0.0, < 7)
     rails_admin (2.0.2)
       activemodel-serializers-xml (>= 1.0)
       builder (~> 3.1)
@@ -220,6 +229,7 @@ GEM
       rails (>= 5.0, < 7)
       remotipart (~> 1.3)
       sassc-rails (>= 1.3, < 3)
+    rails_admin-i18n (1.12.0)
     railties (6.0.3.3)
       actionpack (= 6.0.3.3)
       activesupport (= 6.0.3.3)
@@ -343,12 +353,14 @@ DEPENDENCIES
   cancancan
   database_cleaner (~> 1.6)
   devise
+  devise-i18n
   dotenv-rails
   factory_bot_rails
   faker (~> 1.8)
   graphql
   graphql-auth!
   graphql-errors
+  i18n-spec
   image_processing (~> 1.2)
   listen (>= 3.0.5, < 3.2)
   mini_magick
@@ -357,7 +369,9 @@ DEPENDENCIES
   rack-cors
   rails (~> 6.0.3)
   rails-controller-testing
+  rails-i18n (~> 6.0.0)
   rails_admin (~> 2.0.2)
+  rails_admin-i18n
   rspec-rails (~> 3.8)
   rubocop
   rubocop-performance

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

@@ -3,21 +3,21 @@
     <%= image_tag('logo.svg', width: '200px', alt: 'Logo' ) %>
   </div>
   <hr/>
-  <h2>Resend confirmation instructions</h2>
+  <h2><%= t('.resend_confirmation_instructions') %></h2>
 
-  <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
+  <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
     <%= render "devise/shared/error_messages", resource: resource %>
-    <%= f.hidden_field :reset_password_token %>
 
     <div class="field">
       <%= f.label :email %><br />
       <%= f.email_field :email, autofocus: true, autocomplete: "email", value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %>
     </div>
 
     <div class="actions">
-      <%= f.submit "Resend confirmation instructions" %>
+      <%= f.submit t('.resend_confirmation_instructions') %>
     </div>
   <% end %>
 
   <%= render "devise/shared/links" %>
+
 </div>

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

@@ -1,7 +1,7 @@
-<p>Hello <%= @resource.email %>!</p>
+<p><%= t('.greeting', recipient: @resource.email) %></p>
 
-<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
+<p><%= t('.message') %></p>
 
-<p>Click the link below to unlock your account:</p>
+<p><%= t('.instruction') %></p>
 
-<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %></p>
+<p><%= link_to t('.action'), unlock_url(@resource, unlock_token: @token) %></p>

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

@@ -3,24 +3,30 @@
     <%= image_tag('logo.svg', width: '200px', alt: 'Logo' ) %>
   </div>
   <hr/>
-  <h2>Passwort ändern</h2>
+  <h2><%= t('.change_your_password') %></h2>
 
   <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
     <%= render "devise/shared/error_messages", resource: resource %>
     <%= f.hidden_field :reset_password_token %>
 
     <div class="field">
-      <%= f.password_field :password, autofocus: true, autocomplete: "new-password", placeholder: 'Neues Passwort' %>
+      <%= f.label :password, t('.new_password') %><br />
+      <% if @minimum_password_length %>
+        <em><%= t('devise.shared.minimum_password_length', count: @minimum_password_length) %></em><br />
+      <% end %>
+      <%= f.password_field :password, autofocus: true, autocomplete: "new-password" %>
     </div>
 
     <div class="field">
-      <%= f.password_field :password_confirmation, autocomplete: "off", placeholder: 'Passwort bestätigen' %>
+      <%= f.label :password_confirmation, t('.confirm_new_password') %><br />
+      <%= f.password_field :password_confirmation, autocomplete: "new-password" %>
     </div>
 
     <div class="actions">
-      <%= f.submit "Neues Passwort speichern" %>
+      <%= f.submit t('.change_my_password') %>
     </div>
   <% end %>
 
   <%= render "devise/shared/links" %>
+
 </div>

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

@@ -1,21 +1,19 @@
 <div class="authWrapper">
-  <div class='logo-wrapper'>
-    <%= image_tag('logo.svg', width: '200px', alt: 'Logo' ) %>
-  </div>
-  <hr/>
-  <h2>Passwort vergessen?</h2>
+  <h2><%= t('.forgot_your_password') %></h2>
 
   <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
     <%= render "devise/shared/error_messages", resource: resource %>
 
     <div class="field">
-      <%= f.email_field :email, autofocus: true, autocomplete: "email", placeholder: 'E-Mail' %>
+      <%= f.label :email %><br />
+      <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
     </div>
 
     <div class="actions">
-      <%= f.submit "Passwort zurücksetzen" %>
+      <%= f.submit t('.send_me_reset_password_instructions') %>
     </div>
   <% end %>
 
   <%= render "devise/shared/links" %>
+
 </div>

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

@@ -0,0 +1,50 @@
+<%# Note that registration is currently not used #%>
+<div class="authWrapper">
+  <div class='logo-wrapper'>
+    <%= image_tag('logo.svg', width: '200px', alt: 'Logo' ) %>
+  </div>
+  <hr/>
+  <h2><%= t('.title', resource: resource.model_name.human) %></h2>
+
+  <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
+    <%= render "devise/shared/error_messages", resource: resource %>
+
+    <div class="field">
+      <%= f.label :email %><br />
+      <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+    </div>
+
+    <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
+      <div><%= t('.currently_waiting_confirmation_for_email', email: resource.unconfirmed_email) %></div>
+    <% end %>
+
+    <div class="field">
+      <%= f.label :password %> <i>(<%= t('.leave_blank_if_you_don_t_want_to_change_it') %>)</i><br />
+      <%= f.password_field :password, autocomplete: "new-password" %>
+      <% if @minimum_password_length %>
+        <br />
+        <em><%= t('devise.shared.minimum_password_length', count: @minimum_password_length) %></em>
+      <% end %>
+    </div>
+
+    <div class="field">
+      <%= f.label :password_confirmation %><br />
+      <%= f.password_field :password_confirmation, autocomplete: "new-password" %>
+    </div>
+
+    <div class="field">
+      <%= f.label :current_password %> <i>(<%= t('.we_need_your_current_password_to_confirm_your_changes') %>)</i><br />
+      <%= f.password_field :current_password, autocomplete: "current-password" %>
+    </div>
+
+    <div class="actions">
+      <%= f.submit t('.update') %>
+    </div>
+  <% end %>
+
+  <h3><%= t('.cancel_my_account') %></h3>
+
+  <p><%= t('.unhappy') %> <%= button_to t('.cancel_my_account'), registration_path(resource_name), data: { confirm: t('.are_you_sure') }, method: :delete %></p>
+
+  <%= link_to t('devise.shared.links.back'), :back %>
+</div>

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

@@ -0,0 +1,36 @@
+<%# Note that registration is currently not used #%>
+<div class="authWrapper">
+  <div class='logo-wrapper'>
+    <%= image_tag('logo.svg', width: '200px', alt: 'Logo' ) %>
+  </div>
+  <hr/>
+  <h2><%= t('.sign_up') %></h2>
+
+  <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
+    <%= render "devise/shared/error_messages", resource: resource %>
+
+    <div class="field">
+      <%= f.label :email %><br />
+      <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+    </div>
+
+    <div class="field">
+      <%= f.label :password %>
+      <% if @minimum_password_length %>
+      <em><%= t('devise.shared.minimum_password_length', count: @minimum_password_length) %></em>
+      <% end %><br />
+      <%= f.password_field :password, autocomplete: "new-password" %>
+    </div>
+
+    <div class="field">
+      <%= f.label :password_confirmation %><br />
+      <%= f.password_field :password_confirmation, autocomplete: "new-password" %>
+    </div>
+
+    <div class="actions">
+      <%= f.submit t('.sign_up') %>
+    </div>
+  <% end %>
+
+  <%= render "devise/shared/links" %>
+</div>

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

@@ -3,14 +3,17 @@
     <%= image_tag('logo.svg', width: '200px', alt: 'Logo' ) %>
   </div>
   <hr/>
-  <h2>Login</h2>
+  <h2><%= t('.sign_in') %></h2>
+
   <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
     <div class="field">
-      <%= f.email_field :email, autofocus: true, autocomplete: "email", placeholder: 'E-Mail' %>
+      <%= f.label :email %><br />
+      <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
     </div>
 
     <div class="field">
-      <%= f.password_field :password, autocomplete: "current-password", placeholder: 'Passwort' %>
+      <%= f.label :password %><br />
+      <%= f.password_field :password, autocomplete: "current-password" %>
     </div>
 
     <% if devise_mapping.rememberable? %>
@@ -21,9 +24,10 @@
     <% end %>
 
     <div class="actions">
-      <%= f.submit "Anmelden" %>
+      <%= f.submit t('.sign_in') %>
     </div>
   <% end %>
 
   <%= render "devise/shared/links" %>
+
 </div>

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

@@ -1,26 +1,26 @@
 <%- if controller_name != 'sessions' %>
-  <%= link_to "Anmelden", new_session_path(resource_name) %><br />
+  <%= link_to t(".sign_in"), new_session_path(resource_name) %><br />
 <% end %>
 
-<%# disable registration because we use this views just to get into rails admin backend %>
+<%# remove registration %>
 <%# if devise_mapping.registerable? && controller_name != 'registrations' %>
-  <%# link_to "Registrieren", new_registration_path(resource_name) %><br />
+  <%# link_to t(".sign_up"), new_registration_path(resource_name) %><br />
 <%# end %>
 
 <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
-  <%= link_to "Passwort vergessen?", new_password_path(resource_name) %><br />
+  <%= link_to t(".forgot_your_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('.didn_t_receive_confirmation_instructions'), 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('.didn_t_receive_unlock_instructions'), new_unlock_path(resource_name) %><br />
 <% end %>
 
 <%- if devise_mapping.omniauthable? %>
   <%- resource_class.omniauth_providers.each do |provider| %>
-    <%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider) %><br />
+    <%= link_to t('.sign_in_with_provider', provider: OmniAuth::Utils.camelize(provider)), omniauth_authorize_path(resource_name, provider) %><br />
   <% end %>
 <% end %>