From 3418ffcd6e8cac133f4b1f4890034a0022e6397f Mon Sep 17 00:00:00 2001 From: Carl Chenet Date: Sun, 14 May 2017 13:05:58 +0200 Subject: [PATCH] I18n of the request of invitation email and add piwik gem --- Gemfile | 2 ++ .../invitation_request.text.erb | 16 +++++++--------- config/locales/en.yml | 9 +++++++++ config/locales/fr.yml | 9 +++++++++ 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index e548957..18c560e 100644 --- a/Gemfile +++ b/Gemfile @@ -38,3 +38,5 @@ group :test, :development do gem "sqlite3" gem "faker" end + +gem 'piwik_analytics', '~> 1.0.1' diff --git a/app/views/invitation_request_mailer/invitation_request.text.erb b/app/views/invitation_request_mailer/invitation_request.text.erb index f7d4c53..6d287fa 100644 --- a/app/views/invitation_request_mailer/invitation_request.text.erb +++ b/app/views/invitation_request_mailer/invitation_request.text.erb @@ -1,15 +1,13 @@ -Hello <%= @invitation_request.email %>, +<%= t '.title', :email => "#{@invitation_request.email}" %> -Someone at <%= @invitation_request.ip_address %> has submitted an invitation request to -<%= Rails.application.name %>. +<%= t '.invitedto', :userip => "#{@invitation_request.ip_address}", :appname => "#{Rails.application.name}" %> - Name: <%= @invitation_request.name %> - E-mail: <%= @invitation_request.email %> (won't be displayed to other users) - Memo: <%= @invitation_request.memo %> + <%= t '.name', :name => "#{@invitation_request.name}" %> + <%= t '.email', :email => "#{@invitation_request.email}" %> + <%= t '.memo', :memo => "#{@invitation_request.memo}" %> -If this is you, visit the URL below to confirm your request and -display it to other logged-in users. +<%= t '.warning' %> <%= Rails.application.root_url %>invitations/confirm/<%= @invitation_request.code %> -If this is not you, you can delete this message. +<%= t '.deletemessage' %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 2d1f558..4b0ad84 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -146,6 +146,15 @@ en: title: "Hello %{email}," invitedto: "The user %{user} has invited you to %{appname}" createaccount: "To accept this invitation and create an account, visit the URL below:" + invitation_request_mailer: + invitation_request: + title: "Hello %{email}," + invitedto: "Someone at %{userip} has submitted an invitation request to %{appname}." + name: "Name: %{name}" + email: "Email: %{email} (won't be displayed to other users)" + memo: "Memo: %{memo}" + warning: "If this is you, visit the URL below to confirm your request and display it to other logged-in users." + deletemessage: "If this is not you, you can delete this message." login: index: login: "Login" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index bde94fa..d906798 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -146,6 +146,15 @@ fr: title: "Bonjour %{email}," invitedto: "L'utilisateur %{user} vous a invité au %{appname}" createaccount: "Pour accepter cette invitation et créer votre compte, merci de cliquer sur le lien ci-dessous :" + invitation_request_mailer: + invitation_request: + title: "Bonjour %{email}," + invitedto: "Quelqu'un avec l'ip %{userip} a demandé une invitation au %{appname}." + name: "Name: %{name}" + email: "Email: %{email} (ne sera pas montré aux autres utilisateurs)" + memo: "Memo: %{memo}" + warning: "Si c'est bien vous, suivez l'URL suivante pour confirmer votre demande et l'afficher aux autres utilisateurs." + deletemessage: "S'il ne s'agit pas de vous, vous pouvez effacer ce message." login: index: login: "Se connecter"