hamlab/mobilizon-frontend
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'change-wording-on-email-change' into 'master'

Browse Source 
Fix some gettext issues with translations

See merge request framasoft/mobilizon!532
This commit is contained in:
Thomas Citharel
2020-08-10 18:39:34 +02:00
parent e4e316b42b 7162c30153
commit 163b189d75
25 changed files with 1112 additions and 684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/web/email/user.ex
View File

@@ -170,17 +170,19 @@ defmodule Mobilizon.Web.Email.User do
_locale \\ "en"
) do
Gettext.put_locale(user_locale)
instance_name = Config.instance_name()
subject =
gettext(
"Mobilizon on %{instance}: confirm your email address",
instance: Config.instance_name()
instance: instance_name
)
Email.base_email(to: unconfirmed_email, subject: subject)
|> assign(:locale, user_locale)
|> assign(:subject, subject)
|> assign(:token, confirmation_token)
|> assign(:instance_name, instance_name)
|> render(:email_changed_new)
end

4
lib/web/templates/email/email.html.eex
View File

@@ -86,9 +86,9 @@
</h2>
<br>
<p style="margin: 0; color: #3A384C"><%= gettext "This is a demonstration site to test the beta version of Mobilizon." %></p>
<p style="margin: 0; color: #3A384C;"><%= gettext("%{b_start}Please do not use it for real purposes.%{b_end}", b_start: "<b>", b_end: "</b>") |> raw() %></p>
<p style="margin: 0; color: #3A384C;"><%= gettext("<b>Please do not use it for real purposes.</b>") |> raw() %></p>
<p style="margin: 0; color: #3A384C;">
<%= gettext("Mobilizon is still under development, we will add new features along the updates, until the release of %{b_start}version 1 of the software in the fall of 2020%{b_end}.", b_start: "<b>", b_end: "</b>") |> raw() %>
<%= gettext("Mobilizon is still under development, we will add new features along the updates, until the release of <b>version 1 of the software in the fall of 2020</b>.") |> raw() %>
<%= gettext("In the meantime, please consider this software as not (yet) fully functional. Read more %{a_start}on the Framasoft blog%{a_end}.", a_start: "<a target='_blank' style='color: #474467;' href='https://framablog.org/?p=18299'>", a_end: "</a>") |> raw() %>
</p>
</td>

2
lib/web/templates/email/email_changed_new.html.eex
View File

@@ -35,7 +35,7 @@
<tr>
<td bgcolor="#ffffff" align="left" style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >
<p style="margin: 0;">
<%= gettext "Hi there! It seems like you wanted to change the email address linked to your account on <b>%{instance}</b>. If you still wish to do so, please click the button below to confirm the change. You will then be able to log in to %{instance} with this new email address." %>
<%= gettext "Hi there! It seems like you wanted to change the email address linked to your account on <b>%{instance}</b>. If you still wish to do so, please click the button below to confirm the change. You will then be able to log in to %{instance} with this new email address.", %{instance: @instance_name} %>
</p>
</td>
</tr>

2
lib/web/templates/email/email_changed_new.text.eex
View File

@@ -1,5 +1,5 @@
<%= gettext "Confirm new email" %>
==
<%= gettext "Hi there! It seems like you wanted to change the email address linked to your account on <b>%{instance}</b>. If you still wish to do so, please click the button below to confirm the change. You will then be able to log in to %{instance} with this new email address." %>
<%= gettext "Hi there! It seems like you wanted to change the email address linked to your account on <b>%{instance}</b>. If you still wish to do so, please click the button below to confirm the change. You will then be able to log in to %{instance} with this new email address.", %{instance: @instance_name} %>
<%= user_email_validation_url(Mobilizon.Web.Endpoint, :index, @token) %>
<%= gettext "If you didn't trigger the change yourself, please ignore this message." %>

2
lib/web/templates/email/email_changed_old.html.eex
View File

@@ -38,7 +38,7 @@
<%= gettext("The email address for your account on <b>%{host}</b> is being changed to:", host: @instance[:name]) |> raw %>
</p>
<p>
<%= gettext("If you did not trigger this change yourself, it is likely that someone has gained access to your %{host} account. Please log in and change your password immediately. If you cannot login, contact the admin on %{host}.") %>
<%= gettext("If you did not trigger this change yourself, it is likely that someone has gained access to your %{host} account. Please log in and change your password immediately. If you cannot login, contact the admin on %{host}.", host: @instance[:name]) %>
</p>
</td>
</tr>

6
lib/web/templates/email/email_changed_old.text.eex
View File

@@ -1,9 +1,5 @@
<%= gettext "New email confirmation" %>
==
<%= gettext "Hi there! Just a quick note to confirm that the email address linked to your account on %{host} has been changed from this one to:", host: @instance[:name] %>
<%= @new_email %>
<%= gettext "If you did not trigger this change yourself, it is likely that someone has gained access to your %{host} account. Please log in and change your password immediately. If you cannot login, contact the admin on %{host}." %>
<%= gettext "If you did not trigger this change yourself, it is likely that someone has gained access to your %{host} account. Please log in and change your password immediately. If you cannot login, contact the admin on %{host}.", host: @instance[:name] %>