translate invitations_controller

This commit is contained in:
Carl Chenet 2016-11-24 11:52:54 +01:00
parent 42e374f3c1
commit 66a1913735
3 changed files with 24 additions and 17 deletions

View file

@ -6,7 +6,7 @@ class InvitationsController < ApplicationController
if Rails.application.allow_invitation_requests? if Rails.application.allow_invitation_requests?
@invitation_request = InvitationRequest.new @invitation_request = InvitationRequest.new
else else
flash[:error] = "Public invitation requests are not allowed." flash[:error] = I18n.t 'controllers.invitations_controller.flashpublicinvitnotallowed'
return redirect_to "/login" return redirect_to "/login"
end end
end end
@ -17,21 +17,20 @@ class InvitationsController < ApplicationController
def confirm_email def confirm_email
if !(ir = InvitationRequest.where(:code => params[:code].to_s).first) 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" return redirect_to "/invitations/request"
end end
ir.is_verified = true ir.is_verified = true
ir.save! ir.save!
flash[:success] = "Your invitation request has been validated and " << flash[:success] = I18n.t 'controllers.invitations_controller.flashsuccessinvitrequest'
"will now be shown to other logged-in users."
return redirect_to "/invitations/request" return redirect_to "/invitations/request"
end end
def create def create
if !@user.can_invite? if !@user.can_invite?
flash[:error] = "Your account cannot send invitations" flash[:error] = I18n.t 'controllers.invitations_controller.flashaccountnotinvit'
redirect_to "/settings" redirect_to "/settings"
return return
end end
@ -46,8 +45,7 @@ class InvitationsController < ApplicationController
i.send_email i.send_email
flash[:success] = I18n.t 'controllers.invitations_controller.flashsuccessinvit', :guest => "#{params[:email].to_s}" flash[:success] = I18n.t 'controllers.invitations_controller.flashsuccessinvit', :guest => "#{params[:email].to_s}"
rescue rescue
flash[:error] = "Could not send invitation, verify the e-mail " << flash[:error] = I18n.t 'controllers.invitations_controller.flasherrorssinvit'
"address is valid."
end end
if params[:return_home] if params[:return_home]
@ -65,8 +63,7 @@ class InvitationsController < ApplicationController
@invitation_request.ip_address = request.remote_ip @invitation_request.ip_address = request.remote_ip
if @invitation_request.save if @invitation_request.save
flash[:success] = "You have been e-mailed a confirmation to " << flash[:success] = I18n.t 'controllers.invitations_controller.flashrequestconfirmation', :email => "#{params[:invitation_request][:email].to_s}"
params[:invitation_request][:email].to_s << "."
return redirect_to "/invitations/request" return redirect_to "/invitations/request"
else else
render :action => :build render :action => :build
@ -78,7 +75,7 @@ class InvitationsController < ApplicationController
def send_for_request def send_for_request
if !(ir = InvitationRequest.where(:code => params[:code].to_s).first) 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" return redirect_to "/invitations"
end end
@ -89,9 +86,7 @@ class InvitationsController < ApplicationController
i.save! i.save!
i.send_email i.send_email
ir.destroy! ir.destroy!
flash[:success] = "Successfully e-mailed invitation to " << flash[:success] = I18n.t 'controllers.invitations_controller.flashsuccessinvit', :guest => "#{ir.name.to_s}"
ir.name.to_s << "."
return redirect_to "/invitations" return redirect_to "/invitations"
end end
@ -101,14 +96,12 @@ class InvitationsController < ApplicationController
end end
if !(ir = InvitationRequest.where(:code => params[:code].to_s).first) 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" return redirect_to "/invitations"
end end
ir.destroy! ir.destroy!
flash[:success] = "Successfully deleted invitation request from " << flash[:success] = I18n.t 'controllers.invitations_controller.flashsuccessdeleteinvit', :name => "#{ir.name.to_s}"
ir.name.to_s << "."
return redirect_to "/invitations" return redirect_to "/invitations"
end end
end end

View file

@ -354,7 +354,14 @@ en:
neweststoriestitle: "Newest Stories" neweststoriestitle: "Newest Stories"
licensetext: "<div class=\"box wide\">You have no privacy.</div>" licensetext: "<div class=\"box wide\">You have no privacy.</div>"
invitations_controller: 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}." 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: messages_controller:
messagestitle: "Messages" messagestitle: "Messages"
messagessenttitle: "Messages Sent" messagessenttitle: "Messages Sent"

View file

@ -367,7 +367,14 @@ fr:
neweststoriestitle: "Dernières infos" neweststoriestitle: "Dernières infos"
licensetext: "<div class=\"box wide\">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 <a href=\"/moderations\">Journal de modération</a>.<br/><a rel=\"license\" href=\"https://creativecommons.org/licenses/by/4.0/deed.fr\"><img alt=\"Licence Creative Commons\" style=\"border-width:0\" src=\"https://i.creativecommons.org/l/by/4.0/88x31.png\" /></a><br /><span xmlns:dct=\"http://purl.org/dc/terms/\" property=\"dct:title\">Le Journal du hacker</span> est mis à disposition selon les termes de la <a rel=\"license\" href=\"https://creativecommons.org/licenses/by/4.0/deed.fr\">licence Creative Commons Attribution 4.0 International</a>.</div>" licensetext: "<div class=\"box wide\">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 <a href=\"/moderations\">Journal de modération</a>.<br/><a rel=\"license\" href=\"https://creativecommons.org/licenses/by/4.0/deed.fr\"><img alt=\"Licence Creative Commons\" style=\"border-width:0\" src=\"https://i.creativecommons.org/l/by/4.0/88x31.png\" /></a><br /><span xmlns:dct=\"http://purl.org/dc/terms/\" property=\"dct:title\">Le Journal du hacker</span> est mis à disposition selon les termes de la <a rel=\"license\" href=\"https://creativecommons.org/licenses/by/4.0/deed.fr\">licence Creative Commons Attribution 4.0 International</a>.</div>"
invitations_controller: 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}." 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: messages_controller:
messagestitle: "Messages" messagestitle: "Messages"
messagessenttitle: "Messages envoyés" messagessenttitle: "Messages envoyés"