diff --git a/app/views/user_mailer/_mail_template.erb b/app/views/user_mailer/_mail_template.erb index cffd912cc..0d7acc2e5 100644 --- a/app/views/user_mailer/_mail_template.erb +++ b/app/views/user_mailer/_mail_template.erb @@ -30,14 +30,14 @@ <% end %> -
+
-
+

- Si tenés problemas con la plataforma escribinos a <%= @organization.contact_email %>. + <%= t('mailer.footer.problems', link: link_to(@organization.contact_email, "mailto:#{@organization.contact_email}", target: '_blank', style: 'color: #17687D')).html_safe %>

- Podés dejar de recibir estos mails modificando tus preferencias. + <%= t('mailer.footer.unsubscribe', link: link_to(t('mailer.footer.unsubscribe_link'), @organization.url_for('/user/notifications/manage'), target: '_blank', style: 'color: #17687D')).html_safe %>

@@ -48,7 +48,7 @@
- +
diff --git a/app/views/user_mailer/certificate.html.erb b/app/views/user_mailer/certificate.html.erb index 3ce7c68e8..0949f48ed 100644 --- a/app/views/user_mailer/certificate.html.erb +++ b/app/views/user_mailer/certificate.html.erb @@ -1,7 +1,7 @@ <%= render partial: 'user_mailer/mail_template', locals: { - title: t(:congratulations), - subtitle: t(:certificate_available), - text: t(:certificate_download), - button: t(:my_profile), + title: t('mailer.title.certificate'), + subtitle: t('mailer.subtitle.certificate'), + text: t('mailer.text.certificate'), + button: t('mailer.button.certificate'), url: @organization.url_for('/user/certificates') } %> diff --git a/app/views/user_mailer/notifications/_custom_notification.html.erb b/app/views/user_mailer/notifications/_custom_notification.html.erb index 906961ede..15b741169 100644 --- a/app/views/user_mailer/notifications/_custom_notification.html.erb +++ b/app/views/user_mailer/notifications/_custom_notification.html.erb @@ -3,10 +3,10 @@ <%= render inline: target.custom_html %> <% else %> <%= render partial: 'user_mailer/mail_template', locals: { - title: t("mailer.title.custom"), + title: t("mailer.title.custom_notification"), subtitle: '', text: target.body_html.html_safe, - button: t("mailer.button.custom"), + button: t("mailer.button.custom_notification"), url: @organization.url_for('/user/notifications') } %> <% end %> diff --git a/app/views/user_mailer/notifications/exam_authorization_request_updated/_rejected.html.erb b/app/views/user_mailer/notifications/exam_authorization_request_updated/_rejected.html.erb index 01911c69c..055f44f52 100644 --- a/app/views/user_mailer/notifications/exam_authorization_request_updated/_rejected.html.erb +++ b/app/views/user_mailer/notifications/exam_authorization_request_updated/_rejected.html.erb @@ -1,7 +1,5 @@ <%= render partial: 'user_mailer/mail_template', locals: { title: t("mailer.title.exam_authorization_request_rejected"), subtitle: t("mailer.subtitle.exam_authorization_request_rejected"), - text: t("mailer.text.exam_authorization_request_rejected"), - button: t("mailer.button.exam_authorization_request_rejected"), - url: @organization.url_for('/user/exam_authorizations') + text: t("mailer.text.exam_authorization_request_rejected") } %> diff --git a/app/views/user_mailer/welcome.html.erb b/app/views/user_mailer/welcome.html.erb index adb1d4924..c931ebd06 100644 --- a/app/views/user_mailer/welcome.html.erb +++ b/app/views/user_mailer/welcome.html.erb @@ -1,5 +1,5 @@ <%= render partial: 'user_mailer/mail_template', locals: { - title: '¡Hola, Matías!
Te damos la bienvenida a Mumuki'.html_safe, + title: t('mailer.title.welcome', first_name: @user.first_name).html_safe, text: @organization.welcome_email_template.html_safe, url: @organization.url_for('/user'), } %> diff --git a/lib/mumuki/laboratory/locales/en.yml b/lib/mumuki/laboratory/locales/en.yml index dd5d4f762..3a1e59970 100644 --- a/lib/mumuki/laboratory/locales/en.yml +++ b/lib/mumuki/laboratory/locales/en.yml @@ -199,23 +199,34 @@ en: locked_content: 'This content will be unlocked when you finish previous chapters' mailer: title: + certificate: Congratulations! + custom: You have a new notification! + custom_notification: You have a new notification! exam_authorization_request_updated: There are updates in your exam registration exam_authorization_request_rejected: Exam registration rejected exam_registration: Exam registrations open - custom: You have a new notification! + welcome: Hello %{first_name}!
Welcome to Mumuki subtitle: + certificate: Your certificate is available! exam_authorization_request_approved: Your registration request to the exam has been approved. exam_authorization_request_rejected: Your registration request to the exam has been rejected because the requirements weren't met. exam_registration: ¡You can register for the exam! text: + certificate: You can find it attached to this email or in your Mumuki profile exam_authorization_request_approved: You can sit for the exam on %{exam_start_date} by going into the platform. ¡Good luck! exam_authorization_request_rejected: ¡Don't be upset! You did a great job and we hope you'll keep learning programming. exam_registration: You have until %{exam_registration_deadline} to sign up. In order to be approved, you must meet the requirements. button: + certificate: View certificate + custom: View my notifications + custom_notification: View my notifications exam_registration: Sign up for the exam exam_authorization_request_approved: Go to the platform - exam_authorization_request_rejected: My exams - custom: My notifications + exam_authorization_request_rejected: '' + footer: + problems: If you have technical issues with the platform, get in contact with us at %{link}. + unsubscribe: You can stop receiving these emails by %{link}. + unsubscribe_link: modifying your preferences male: Male manage_notification_subscriptions: Manage your notification subscriptions manage_notifications: Manage notifications diff --git a/lib/mumuki/laboratory/locales/es-CL.yml b/lib/mumuki/laboratory/locales/es-CL.yml index 1c1133af7..3a2f9adbf 100644 --- a/lib/mumuki/laboratory/locales/es-CL.yml +++ b/lib/mumuki/laboratory/locales/es-CL.yml @@ -203,23 +203,34 @@ es-CL: locked_content: 'Éste contenido se desbloqueará cuando termines los capítulos anteriores' mailer: title: - exam_authorization_request_updated: Tenés cambios en tu inscripción al examen + certificate: ¡Felicitaciones! + custom: ¡Tenés una nueva notificación! + custom_notification: ¡Tenés una nueva notificación! + exam_authorization_request_updated: Tenemos novedades sobre tu inscripción al examen exam_authorization_request_rejected: Inscripción rechazada exam_registration: Apertura de inscripciones - custom: ¡Tenés una nueva notificación! + welcome: ¡Hola, %{first_name}!
Te damos la bienvenida a Mumuki subtitle: + certificate: Ya está disponible tu certificado. exam_authorization_request_approved: Tu solicitud de inscripción al examen fue aprobada. exam_authorization_request_rejected: Tu solicitud de inscripción al examen fue rechazada ya que no se cumplieron los requisitos. exam_registration: ¡Ya podés inscribirte al examen! text: + certificate: Descargalo desde el adjunto de este mail o visualizalo en tu perfil de Mumuki. exam_authorization_request_approved: Podrás rendir el examen el día %{exam_start_date} ingresando a la plataforma. ¡Éxitos! exam_authorization_request_rejected: ¡No te desanimes! Hiciste un gran esfuerzo y esperamos que continúes aprendiendo programación. exam_registration: Tenés tiempo de inscribirte hasta el %{exam_registration_deadline}. Para que tu inscripción sea aceptada debés cumplir con los requisitos. button: + certificate: Ver certificado + custom: Ver mis notificaciones + custom_notification: Ver mis notificaciones exam_registration: Inscribirme al Examen exam_authorization_request_approved: Ir a la plataforma - exam_authorization_request_rejected: Mis exámenes - custom: Mis notificaciones + exam_authorization_request_rejected: '' + footer: + problems: Si tienes problemas con la plataforma escribinos a %{link}. + unsubscribe: Podés dejar de recibir estos mails %{link}. + unsubscribe_link: modificando tus preferencias male: Hombre manage_notification_subscriptions: Administrá tus notificaciones manage_notifications: Administrar notificaciones diff --git a/lib/mumuki/laboratory/locales/es.yml b/lib/mumuki/laboratory/locales/es.yml index 9bcae0274..b8e75047d 100644 --- a/lib/mumuki/laboratory/locales/es.yml +++ b/lib/mumuki/laboratory/locales/es.yml @@ -212,23 +212,34 @@ es: locked_content: 'Este contenido se desbloqueará cuando termines los capítulos anteriores' mailer: title: - exam_authorization_request_updated: Tenés cambios en tu inscripción al examen + certificate: ¡Felicitaciones! + custom: ¡Tenés una nueva notificación! + custom_notification: ¡Tenés una nueva notificación! + exam_authorization_request_updated: Tenemos novedades sobre tu inscripción al examen exam_authorization_request_rejected: Inscripción rechazada exam_registration: Apertura de inscripciones - custom: ¡Tenés una nueva notificación! + welcome: ¡Hola, %{first_name}!
Te damos la bienvenida a Mumuki subtitle: + certificate: Ya está disponible tu certificado. exam_authorization_request_approved: Tu solicitud de inscripción al examen fue aprobada. exam_authorization_request_rejected: Tu solicitud de inscripción al examen fue rechazada ya que no se cumplieron los requisitos. exam_registration: ¡Ya podés inscribirte al examen! text: + certificate: Descargalo desde el adjunto de este mail o visualizalo en tu perfil de Mumuki. exam_authorization_request_approved: Podrás rendir el examen el día %{exam_start_date} ingresando a la plataforma. ¡Éxitos! exam_authorization_request_rejected: ¡No te desanimes! Hiciste un gran esfuerzo y esperamos que continúes aprendiendo programación. exam_registration: Tenés tiempo de inscribirte hasta el %{exam_registration_deadline}. Para que tu inscripción sea aceptada debés cumplir con los requisitos. button: + certificate: Ver certificado + custom: Ver mis notificaciones + custom_notification: Ver mis notificaciones exam_registration: Inscribirme al Examen exam_authorization_request_approved: Ir a la plataforma - exam_authorization_request_rejected: Mis exámenes - custom: Mis notificaciones + exam_authorization_request_rejected: '' + footer: + problems: Si tenés problemas con la plataforma escribinos a %{link}. + unsubscribe: Podés dejar de recibir estos mails %{link}. + unsubscribe_link: modificando tus preferencias male: Hombre manage_notification_subscriptions: Administrá tus notificaciones manage_notifications: Administrar notificaciones diff --git a/lib/mumuki/laboratory/locales/pt.yml b/lib/mumuki/laboratory/locales/pt.yml index c9b0323c8..69d95fa6d 100644 --- a/lib/mumuki/laboratory/locales/pt.yml +++ b/lib/mumuki/laboratory/locales/pt.yml @@ -39,7 +39,7 @@ pt: blocked_forum_explanation: Você está no meio de um exame agora? cancel: Cancelar certificate: Certificado - certificate_available: Seu certificado já está disponível + certificate_available: Seu certificado já está disponível. certificate_download: Baixe-o do anexo deste e-mail ou visualize-o em seu perfil Mumuki. certificates: Certificados certificates_will_be_here: Seus certificados nesta organização aparecerão aqui @@ -203,23 +203,34 @@ pt: locked_content: 'Este conteúdo será desbloqueado quando você terminar os capítulos anteriores' mailer: title: + certificate: Parabéns! + custom: Você tem uma nova notificação! + custom_notification: Você tem uma nova notificação! exam_authorization_request_updated: Você tem alterações no registro do seu exame exam_authorization_request_rejected: Inscrição rejeitada exam_registration: Abertura de inscrições - custom: Você tem uma nova notificação! + welcome: Olá %{first_name}!
Sejam bem-vindos a Mumuki subtitle: + certificate: Seu certificado já está disponível. exam_authorization_request_approved: Seu pedido de inscrição para o exame foi aprovado. exam_authorization_request_rejected: Sua inscrição para o exame foi rejeitada porque os requisitos não foram atendidos. exam_registration: Agora você pode se inscrever para o exame! text: + certificate: Baixe-o do anexo deste e-mail ou visualize-o em seu perfil Mumuki. exam_authorization_request_approved: Você poderá fazer o exame em %{exam_start_date} ao entrar na plataforma. Êxitos! exam_authorization_request_rejected: Não te desanimes! Você fez um grande esforço e esperamos que continue aprendendo programação. exam_registration: Você tem tempo para se registrar até o exam_registration_deadline. Para que seu registro seja aceito, você deve atender aos requisitos. button: + certificate: Minhas certificado + custom: Minhas notificações + custom_notification: Minhas notificações exam_registration: Assinar o exame exam_authorization_request_approved: Vá para a plataforma - exam_authorization_request_rejected: Meus exames - custom: Minhas notificações + exam_authorization_request_rejected: '' + footer: + problems: Se você tiver problemas com a plataforma, escreva para %{link}. + unsubscribe: Você pode parar de receber esses e-mails %{link}. + unsubscribe_link: modificando suas preferências male: Masculino manage_notification_subscriptions: Gerenciar suas notificações manage_notifications: Gerenciar notificações