8 files changed, 121 insertions, 34 deletions

diff --git a/app/views/otp_challenges/new.html.erb b/app/views/otp_challenges/new.html.erb
index d6e18c85..677244c7 100644
--- a/app/views/otp_challenges/new.html.erb
+++ b/app/views/otp_challenges/new.html.erb
@@ -1,13 +1,13 @@
-<h1>Second factor</h1>
+<h1><%= t(".title") %></h1>
 
 <div id="admin_layout">
-  <div class="layout_row_label">Code</div>
+  <div class="layout_row_label"> <%= t(".code") %> </div>
   <div class="layout_row_content">
     <%= form_tag otp_challenge_path, :method => :post, :class => "otp_form" do %>
       <%= text_field_tag :code, nil, :autofocus => true,
             :autocomplete => "one-time-code", :inputmode => "numeric" %>
-      <%= submit_tag "Log in" %>
+      <%= submit_tag t(".log_in") %>
     <% end %>
-    <span class="field_hint">Enter the six-digit code from your authenticator app.</span>
+    <span class="field_hint"> <%= t(".hint") %> </span>
   </div>
 </div>
diff --git a/app/views/otp_enrollments/show.html.erb b/app/views/otp_enrollments/show.html.erb
index 12067ae3..e18d7fd1 100644
--- a/app/views/otp_enrollments/show.html.erb
+++ b/app/views/otp_enrollments/show.html.erb
@@ -1,14 +1,14 @@
-<h1>Enable second factor</h1>
+<h1><%= t(".title") %></h1>
 
 <div id="admin_layout">
-  <div class="layout_row_label">Scan</div>
+  <div class="layout_row_label"><%= t(".scan") %></div>
   <div class="layout_row_content">
     <div class="otp_qr">
       <%= raw RQRCode::QRCode.new(current_user.pending_otp_provisioning_uri)
                 .as_svg(:module_size => 4, :viewbox => true,
                         :color => "000", :fill => "fff") %>
     </div>
-    <span class="field_hint">Or enter the secret manually: <code><%= current_user.otp_pending_secret %></code></span>
+    <span class="field_hint"><%= t(".manual_hint") %> <code><%= current_user.otp_pending_secret %></code></span>
   </div>
 
   <div class="layout_row_label">Confirm</div>
@@ -17,10 +17,9 @@
       <%= text_field_tag :code, nil, :autofocus => true,
             :autocomplete => "one-time-code", :inputmode => "numeric" %>
       <%= button_tag :type => "submit", :class => "action_button" do %>
-        <%= icon("shield-check", library: "tabler", "aria-hidden": true) %> Confirm
+        <%= icon("shield-check", library: "tabler", "aria-hidden": true) %> <%= t(".confirm") %>
       <% end %>
     <% end %>
-    <span class="field_hint">Enter the six-digit code your app shows
-      for “<%= OTP_ISSUER %>”.</span>
+    <span class="field_hint"> <%= t(".app_hint", :issuer => OTP_ISSUER) %></span>
   </div>
 </div>
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 1c2c2368..3f115d58 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -4,12 +4,12 @@
       <div class="error_messages"><%= flash[:error] %></div>
     <% end %>
 
-    <div class="layout_row_label">Login</div>
+    <div class="layout_row_label"> <%= t(".login") %> </div>
     <div class="layout_row_content"><%= text_field_tag 'login', @login, :autocomplete => "username" %></div>
 
-    <div class="layout_row_label">Password</div>
+    <div class="layout_row_label"> <%= t(".password") %> </div>
     <div class="layout_row_content"><%= password_field_tag 'password', nil, :autocomplete => "current-password" %></div>
 
-    <div class="layout_row_content"><%= submit_tag 'log in' %></div>
+    <div class="layout_row_content"><%= submit_tag t(".log_in") %></div>
   <% end -%>
 </div>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index a8994701..ea5e7dec 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -1,4 +1,4 @@
-<h1><%= @user == current_user ? "My account" : "Edit user “#{@user.login}”" %></h1>
+<h1><%= @user == current_user ? t(".my_account") : t(".edit_user", :login => @user.login) %></h1>
 
 <% if @user.errors.any? %>
   <div class="error_messages">
@@ -9,61 +9,60 @@
 <div id="admin_layout">
   <%= form_for @user do |f| %>
   <div id="content">
-    <div class="layout_row_label">Login</div>
+    <div class="layout_row_label"><%= t(".login") %></div>
     <div class="layout_row_content"><%= f.text_field :login, :autocomplete => "username" %></div>
 
-    <div class="layout_row_label">E-Mail</div>
+    <div class="layout_row_label"><%= t(".email") %></div>
     <div class="layout_row_content"><%= f.text_field :email %></div>
 
-    <div class="layout_row_label">Password</div>
+    <div class="layout_row_label"><%= t(".password") %></div>
     <div class="layout_row_content"><%= f.password_field :password, :autocomplete => "new-password" %></div>
 
-    <div class="layout_row_label">Confirm</div>
+    <div class="layout_row_label"><%= t(".confirm") %></div>
     <div class="layout_row_content"><%= f.password_field :password_confirmation, :autocomplete => "new-password" %></div>
 
     <% if current_user.admin? %>
-    <div class="layout_row_label">Admin?</div>
+    <div class="layout_row_label"><%= t(".admin") %></div>
     <div class="layout_row_content"><%= f.check_box :admin %></div>
     <% end %>
 
     <div class="layout_row_label"></div>
-    <div class="layout_row_content"><%= f.submit "Update" %></div>
+    <div class="layout_row_content"><%= submit_tag t(".update") %></div>
   <% end %>
   </div>
 
   <% if @user == current_user %>
-    <div class="layout_row_label">Second factor</div>
+    <div class="layout_row_label"><%= t(".second_factor") %></div>
     <div class="layout_row_content">
       <% if current_user.otp_enrolled? %>
-        <p>Enabled.</p>
+        <p><%= t(".enabled") %></p>
         <%= form_tag otp_enrollment_path, :method => :delete, :class => "otp_form" do %>
           <%= text_field_tag :login, current_user.login, :autocomplete => "username", :readonly => true, :tabindex => -1, :class => "visually_hidden" %>
-          <%= password_field_tag :current_password, nil, :placeholder => "Current password", :autocomplete => "current-password" %>
-          <%= text_field_tag :code, nil, :placeholder => "Current code",
+          <%= password_field_tag :current_password, nil, :placeholder => t(".current_password"), :autocomplete => "current-password" %>
+          <%= text_field_tag :code, nil, :placeholder => t(".current_code"),
                 :autocomplete => "one-time-code", :inputmode => "numeric" %>
           <%= button_tag :type => "submit", :class => "action_button" do %>
-            <%= icon("shield-off", library: "tabler", "aria-hidden": true) %> Disable second factor
+            <%= icon("shield-off", library: "tabler", "aria-hidden": true) %> <%= t(".disable_second_factor") %>
           <% end %>
         <% end %>
       <% else %>
-        <p>Not enrolled.</p>
+        <p><%= t(".not_enrolled") %></p>
         <%= form_tag otp_enrollment_path, :method => :post, :class => "otp_form" do %>
           <%= text_field_tag :login, current_user.login, :autocomplete => "username", :readonly => true, :tabindex => -1, :class => "visually_hidden" %>
-          <%= password_field_tag :current_password, nil, :placeholder => "Current password", :autocomplete => "current-password"%>
+          <%= password_field_tag :current_password, nil, :placeholder => t(".current_password"), :autocomplete => "current-password"%>
           <%= button_tag :type => "submit", :class => "action_button" do %>
-            <%= icon("shield-lock", library: "tabler", "aria-hidden": true) %> Enable second factor
+            <%= icon("shield-lock", library: "tabler", "aria-hidden": true) %> <%= t(".enable_second_factor") %>
           <% end %>
         <% end %>
       <% end %>
     </div>
   <% elsif current_user.admin? && @user.otp_enrolled? %>
-    <div class="layout_row_label">Second factor</div>
+    <div class="layout_row_label"><%= t(".second_factor") %></div>
     <div class="layout_row_content">
-      Enabled.
-      <%= button_to "Reset second factor", reset_otp_user_path(@user), :method => :put,
+      <%= t(".enabled") %>
+      <%= button_to t(".reset_second_factor"), reset_otp_user_path(@user), :method => :put,
             :form_class => "button_to destructive",
-            :form => { :data => { :confirm =>
-              "Reset #{@user.login}'s second factor? They will log in with password only afterwards." } } %>
+            :form => { :data => { :confirm => t(".reset_confirm", :login => @user.login) } } %>
     </div>
   <% end %>
 </div>
diff --git a/config/application.rb b/config/application.rb
index 5ec3e8fe..c8f53ac2 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -18,7 +18,7 @@ module Cccms
 
     config.i18n.default_locale = :de
     config.i18n.available_locales = [:de, :en]
-    config.i18n.fallbacks = { en: [:en, :de] }
+    config.i18n.fallbacks = { en: [:en, :de], de: [:de, :en] }
 
     config.filter_parameters += [:password, :password_confirmation]
     config.active_storage.variant_processor = :disabled
diff --git a/config/locales/de.yml b/config/locales/de.yml
index ae955aa6..7d49a872 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -146,3 +146,44 @@ de:
     licensed_under: "Lizenziert unter %{license}"
 
   related_documents: "Weitere Dokumente"
+
+  sessions:
+    new:
+      login: "Anmeldename"
+      password: "Passwort"
+      log_in: "anmelden"
+
+  otp_challenges:
+    new:
+      title: "Zweiter Faktor"
+      code: "Code"
+      log_in: "Anmelden"
+      hint: "Gib den sechsstelligen Code aus deiner Authenticator-App ein."
+
+  otp_enrollments:
+    show:
+      title: "Zweiten Faktor einrichten"
+      scan: "Scannen"
+      manual_hint: "Oder Secret manuell eingeben:"
+      confirm: "Bestätigen"
+      app_hint: "Gib den sechsstelligen Code ein, den deine App für „%{issuer}“ anzeigt."
+
+  users:
+    edit:
+      my_account: "Mein Konto"
+      edit_user: "Benutzer „%{login}“ bearbeiten"
+      login: "Anmeldename"
+      email: "E-Mail"
+      password: "Passwort"
+      confirm: "bestätigen"
+      admin: "Admin?"
+      update: "Aktualisieren"
+      enabled: "Aktiviert."
+      not_enrolled: "Nicht eingerichtet."
+      current_password: "Aktuelles Passwort"
+      current_code: "Aktueller Code"
+      second_factor: "Zweiter Faktor"
+      enable_second_factor: "Zweiten Faktor aktivieren"
+      disable_second_factor: "Zweiten Faktor entfernen"
+      reset_second_factor: "Zweiten Faktor zurücksetzen"
+      reset_confirm: "Zweiten Faktor von %{login} zurücksetzen? Die Anmeldung ist danach nur mit Passwort möglich."
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 618f5164..ea94952a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -98,3 +98,44 @@ en:
     licensed_under: "Licensed under %{license}"
 
   related_documents: "Related documents"
+
+  sessions:
+    new:
+      login: "Login"
+      password: "Password"
+      log_in: "log in"
+
+  otp_challenges:
+    new:
+      title: "Second factor"
+      code: "Code"
+      log_in: "Log in"
+      hint: "Enter the six-digit code from your authenticator app."
+
+  otp_enrollments:
+    show:
+      title: "Enable second factor"
+      scan: "Scan"
+      manual_hint: "Or enter the secret manually:"
+      confirm: "Confirm"
+      app_hint: "Enter the six-digit code your app shows for “%{issuer}”."
+
+  users:
+    edit:
+      my_account: "My account"
+      edit_user: "Edit user “%{login}”"
+      login: "login"
+      email: "e-mail"
+      password: "password"
+      confirm: "confirm"
+      admin: "admin?"
+      update: "Update"
+      enabled: "Enabled."
+      not_enrolled: "Not enrolled."
+      current_password: "Current password"
+      current_code: "Current code"
+      second_factor: "Second factor"
+      enable_second_factor: "Enable second factor"
+      disable_second_factor: "Disable second factor"
+      reset_second_factor: "Reset second factor"
+      reset_confirm: "Reset %{login}'s second factor? They will log in with password only afterwards."
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 946b5414..14f12b52 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -163,6 +163,13 @@ class UsersControllerTest < ActionController::TestCase
     end
     assert_redirected_to users_path
   end
+
+  test "enrolled user gets a working my account" do
+    users(:quentin).update!(:otp_secret => ROTP::Base32.random)
+    login_as :quentin
+    get :edit, params: { :id => users(:quentin).id }
+    assert_response :success
+  end
   
   test "admin user can promote regular users to admins" do
     login_as :aaron