Merge pull request #13 from mftaff/translations

Translations for mailers and views
mikker · Feb 26, 2018 · 95c6fb8 · 95c6fb8
2 parents 0486005 + 51a907d
commit 95c6fb8
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/app/controllers/passwordless/sessions_controller.rb b/app/controllers/passwordless/sessions_controller.rb
@@ -60,7 +60,7 @@ def show
         redirect_to main_app.root_path
       end
     rescue ExpiredSessionError
-      flash[:error] = I18n.t('.passwordless.sessions.session_expired')
+      flash[:error] = I18n.t('.passwordless.sessions.create.session_expired')
       redirect_to main_app.root_path
     end
     # rubocop:enable Metrics/MethodLength, Metrics/AbcSize

diff --git a/app/mailers/passwordless/mailer.rb b/app/mailers/passwordless/mailer.rb
@@ -18,7 +18,7 @@ def magic_link(session)
       email_field = @session.authenticatable.class.passwordless_email_field
       mail(
         to: @session.authenticatable.send(email_field),
-        subject: 'Your magic link ✨'
+        subject: I18n.t('passwordless.mailer.subject')
       )
     end
   end

diff --git a/app/views/passwordless/mailer/magic_link.text.erb b/app/views/passwordless/mailer/magic_link.text.erb
@@ -1,2 +1 @@
-Here's your link:
-<%= @magic_link %>
+<%= I18n.t('passwordless.mailer.magic_link', link: @magic_link) %>
diff --git a/app/views/passwordless/sessions/create.html.erb b/app/views/passwordless/sessions/create.html.erb
@@ -1 +1 @@
-<p>If we found you in the system, we've sent you an email.</p>
+<p><%= I18n.t('passwordless.sessions.success.email_sent_if_record_found') %></p>
diff --git a/app/views/passwordless/sessions/new.html.erb b/app/views/passwordless/sessions/new.html.erb
@@ -1,5 +1,5 @@
 <%= form_for @session, url: send(authenticatable_resource).sign_in_path do |f| %>
   <% email_field_name = :"passwordless[#{@email_field}]" %>
   <%= text_field_tag email_field_name, params.fetch(email_field_name, nil) %>
-  <%= f.submit 'Send magic link' %>
+  <%= f.submit I18n.t('passwordless.sessions.new.submit') %>
 <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -2,4 +2,11 @@
 en:
   passwordless:
     sessions:
-      session_expired: 'Your session has expired, please sign in again.'
+      create:
+        session_expired: 'Your session has expired, please sign in again.'
+        email_sent_if_record_found: "If we found you in the system, we've sent you an email."
+      new:
+        submit: 'Send magic link'
+    mailer:
+      subject: "Your magic link ✨'"
+      magic_link: "Here's your link: %{link}"