From 66a191373575ab73747bd7b78e531e23ecd9d4e9 Mon Sep 17 00:00:00 2001 From: Carl Chenet Date: Thu, 24 Nov 2016 11:52:54 +0100 Subject: [PATCH] translate invitations_controller --- app/controllers/invitations_controller.rb | 27 +++++++++-------------- config/locales/en.yml | 7 ++++++ config/locales/fr.yml | 7 ++++++ 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/app/controllers/invitations_controller.rb b/app/controllers/invitations_controller.rb index ac9feb2..fd91588 100644 --- a/app/controllers/invitations_controller.rb +++ b/app/controllers/invitations_controller.rb @@ -6,7 +6,7 @@ class InvitationsController < ApplicationController if Rails.application.allow_invitation_requests? @invitation_request = InvitationRequest.new else - flash[:error] = "Public invitation requests are not allowed." + flash[:error] = I18n.t 'controllers.invitations_controller.flashpublicinvitnotallowed' return redirect_to "/login" end end @@ -17,21 +17,20 @@ class InvitationsController < ApplicationController def confirm_email if !(ir = InvitationRequest.where(:code => params[:code].to_s).first) - flash[:error] = "Invalid or expired invitation request" + flash[:error] = I18n.t 'controllers.invitations_controller.flashrequestconfirmation' return redirect_to "/invitations/request" end ir.is_verified = true ir.save! - flash[:success] = "Your invitation request has been validated and " << - "will now be shown to other logged-in users." + flash[:success] = I18n.t 'controllers.invitations_controller.flashsuccessinvitrequest' return redirect_to "/invitations/request" end def create if !@user.can_invite? - flash[:error] = "Your account cannot send invitations" + flash[:error] = I18n.t 'controllers.invitations_controller.flashaccountnotinvit' redirect_to "/settings" return end @@ -46,8 +45,7 @@ class InvitationsController < ApplicationController i.send_email flash[:success] = I18n.t 'controllers.invitations_controller.flashsuccessinvit', :guest => "#{params[:email].to_s}" rescue - flash[:error] = "Could not send invitation, verify the e-mail " << - "address is valid." + flash[:error] = I18n.t 'controllers.invitations_controller.flasherrorssinvit' end if params[:return_home] @@ -65,8 +63,7 @@ class InvitationsController < ApplicationController @invitation_request.ip_address = request.remote_ip if @invitation_request.save - flash[:success] = "You have been e-mailed a confirmation to " << - params[:invitation_request][:email].to_s << "." + flash[:success] = I18n.t 'controllers.invitations_controller.flashrequestconfirmation', :email => "#{params[:invitation_request][:email].to_s}" return redirect_to "/invitations/request" else render :action => :build @@ -78,7 +75,7 @@ class InvitationsController < ApplicationController def send_for_request if !(ir = InvitationRequest.where(:code => params[:code].to_s).first) - flash[:error] = "Invalid or expired invitation request" + flash[:error] = I18n.t 'controllers.invitations_controller.flashinvalidinvitation' return redirect_to "/invitations" end @@ -89,9 +86,7 @@ class InvitationsController < ApplicationController i.save! i.send_email ir.destroy! - flash[:success] = "Successfully e-mailed invitation to " << - ir.name.to_s << "." - + flash[:success] = I18n.t 'controllers.invitations_controller.flashsuccessinvit', :guest => "#{ir.name.to_s}" return redirect_to "/invitations" end @@ -101,14 +96,12 @@ class InvitationsController < ApplicationController end if !(ir = InvitationRequest.where(:code => params[:code].to_s).first) - flash[:error] = "Invalid or expired invitation request" + flash[:error] = I18n.t 'controllers.invitations_controller.flashrequestconfirmation' return redirect_to "/invitations" end ir.destroy! - flash[:success] = "Successfully deleted invitation request from " << - ir.name.to_s << "." - + flash[:success] = I18n.t 'controllers.invitations_controller.flashsuccessdeleteinvit', :name => "#{ir.name.to_s}" return redirect_to "/invitations" end end diff --git a/config/locales/en.yml b/config/locales/en.yml index a464da4..e4a603b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -354,7 +354,14 @@ en: neweststoriestitle: "Newest Stories" licensetext: "
You have no privacy.
" invitations_controller: + flashpublicinvitnotallowed: "Public invitation requests are not allowed." + flashsuccessinvitrequest: "Your invitation request has been validated and will now be shown to other logged-in users." + flashaccountnotinvit: "Your account cannot send invitations" flashsuccessinvit: "Successfully e-mailed invitation to %{guest}." + flasherrorssinvit: "Could not send invitation, verify the e-mail address is valid." + flashrequestconfirmation: "You have been e-mailed a confirmation to %{email}." + flashinvalidinvitation: "Invalid or expired invitation request" + flashsuccessdeleteinvit: "Successfully deleted invitation request from %{name}" messages_controller: messagestitle: "Messages" messagessenttitle: "Messages Sent" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 0f14ba4..cb14d7e 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -367,7 +367,14 @@ fr: neweststoriestitle: "Dernières infos" licensetext: "
Toutes les actions sur le site sont publiques à l'exception des messages privés entre utilisateurs. Les actions de modération peuvent être consultées via le Journal de modération.
\"Licence
Le Journal du hacker est mis à disposition selon les termes de la licence Creative Commons Attribution 4.0 International.
" invitations_controller: + flashpublicinvitnotallowed: "Demandes publiques d'invitation non-autorisées." + flashsuccessinvitrequest: "Votre demande d'invitation a été validée et sera maintenant affichée aux utilisateurs connectés." + flashaccountnotinvit: "Votre compte ne peut pas envoyer d'invitations" flashsuccessinvit: "Invitation envoyée par e-mail avec succès à %{guest}." + flasherrorssinvit: "L'invitation n'a pas pu être envoyée, merci de vérifier l'adresse e-mail." + flashrequestconfirmation: "Un e-mail de confirmation vous a été envoyé à %{email}." + flashinvalidinvitation: "Invitation invalide ou expirée" + flashsuccessdeleteinvit: "Demande d'invitation de %{name} supprimée avec succès" messages_controller: messagestitle: "Messages" messagessenttitle: "Messages envoyés"