From 4255219e9f08d322524b7aa5b0f6468bb06ae676 Mon Sep 17 00:00:00 2001 From: Laurent GAY Date: Fri, 21 Nov 2025 17:44:55 +0100 Subject: [PATCH] correct lint-elixir --- lib/web/templates/api/privacy.html.heex | 122 +++++------ lib/web/templates/api/terms.html.heex | 200 +++++++++--------- .../activity/_comment_activity_item.html.heex | 16 +- .../_conversation_activity_item.html.heex | 8 +- .../_discussion_activity_item.html.heex | 20 +- .../activity/_event_activity_item.html.heex | 24 +-- .../activity/_group_activity_item.html.heex | 8 +- .../activity/_member_activity_item.html.heex | 40 ++-- .../activity/_post_activity_item.html.heex | 12 +- .../_resource_activity_item.html.heex | 32 +-- .../actor_suspension_participants.html.heex | 8 +- lib/web/templates/email/admin/_role.html.heex | 8 +- .../email/admin_user_confirmation.html.heex | 14 +- .../admin_user_email_changed_new.html.heex | 10 +- .../admin_user_email_changed_old.html.heex | 10 +- .../email/admin_user_role_changed.html.heex | 18 +- ...ymous_participation_confirmation.html.heex | 16 +- .../email/before_event_notification.html.heex | 10 +- .../email/date/event_tz_date.html.heex | 10 +- .../email/date/event_tz_date_range.html.heex | 20 +- lib/web/templates/email/email.html.heex | 22 +- .../email/email_anonymous_activity.html.heex | 26 +-- .../email/email_changed_new.html.heex | 10 +- .../email/email_changed_old.html.heex | 12 +- .../email/email_configuration_test.html.heex | 6 +- .../email/email_direct_activity.html.heex | 60 +++--- ...vent_group_follower_notification.html.heex | 8 +- .../event_participation_approved.html.heex | 16 +- .../event_participation_confirmed.html.heex | 22 +- .../event_participation_rejected.html.heex | 8 +- .../templates/email/event_updated.html.heex | 42 ++-- .../templates/email/group_invite.html.heex | 10 +- .../email/group_member_removal.html.heex | 10 +- .../email/group_membership_approval.html.heex | 8 +- .../group_membership_rejection.html.heex | 6 +- .../email/group_suspension.html.heex | 16 +- .../templates/email/instance_follow.html.heex | 24 +-- .../email/notification_each_week.html.heex | 18 +- .../email/on_day_notification.html.heex | 18 +- .../participation/card/_metadata.html.heex | 8 +- .../email/participation/card/_title.html.heex | 6 +- .../email/participation/event_card.html.heex | 18 +- .../templates/email/password_reset.html.heex | 16 +- ...nding_participation_notification.html.heex | 16 +- .../email/registration_confirmation.html.heex | 10 +- lib/web/templates/email/report.html.heex | 34 +-- .../templates/email/user_pending.html.heex | 8 +- lib/web/templates/error/500_page.html.heex | 16 +- .../export/event_participants.html.heex | 24 +-- lib/web/templates/page/index.html.heex | 14 +- package-lock.json | 104 ++++----- 51 files changed, 608 insertions(+), 614 deletions(-) diff --git a/lib/web/templates/api/privacy.html.heex b/lib/web/templates/api/privacy.html.heex index b54b60f95..8466cc96b 100644 --- a/lib/web/templates/api/privacy.html.heex +++ b/lib/web/templates/api/privacy.html.heex @@ -1,178 +1,178 @@

- <%= pgettext( + {pgettext( "terms", "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We have provided a glossary to help you understand them better." ) - |> raw %> + |> raw}

-

<%= pgettext("terms", "What information do we collect?") %>

+

{pgettext("terms", "What information do we collect?")}

-

<%= pgettext("terms", "What do we use your information for?") %>

+

{pgettext("terms", "What do we use your information for?")}

- <%= pgettext( + {pgettext( "terms", "Any of the information we collect from you may be used in the following ways:" - ) %> + )}

-

<%= pgettext("terms", "How do we protect your information?") %>

+

{pgettext("terms", "How do we protect your information?")}

- <%= pgettext( + {pgettext( "terms", "We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way algorithm." - ) %> + )}

-

<%= pgettext("terms", "What is our data retention policy?") %>

-

<%= pgettext("terms", "We will make a good faith effort to:") %>

+

{pgettext("terms", "What is our data retention policy?")}

+

{pgettext("terms", "We will make a good faith effort to:")}

-

<%= pgettext("terms", "You may irreversibly delete your account at any time.") %>

-

<%= pgettext("terms", "Do we use cookies?") %>

+

{pgettext("terms", "You may irreversibly delete your account at any time.")}

+

{pgettext("terms", "Do we use cookies?")}

- <%= pgettext("terms", "We store the following information on your device when you connect:") %> + {pgettext("terms", "We store the following information on your device when you connect:")}

-

<%= pgettext("terms", "If you delete this information, you need to login again.") %>

+

{pgettext("terms", "If you delete this information, you need to login again.")}

- <%= pgettext( + {pgettext( "terms", "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting this information will only stop displaying participation status in your browser." - ) %> + )}

- <%= pgettext( + {pgettext( "terms", "Note: This information is stored in your localStorage and not your cookies." - ) %> + )}

- <%= pgettext("terms", "Do we disclose any information to outside parties?") %> + {pgettext("terms", "Do we disclose any information to outside parties?")}

- <%= pgettext( + {pgettext( "terms", "No. We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety." - ) %> + )}

- <%= pgettext( + {pgettext( "terms", "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one." - ) %> + )}

-

<%= pgettext("terms", "Site usage by children") %>

+

{pgettext("terms", "Site usage by children")}

- <%= pgettext( + {pgettext( "terms", "If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (General Data Protection Regulation) do not use this site." ) - |> raw %> + |> raw}

- <%= pgettext( + {pgettext( "terms", "If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (Children's Online Privacy Protection Act) do not use this site." ) - |> raw %> + |> raw}

- <%= pgettext( + {pgettext( "terms", "Law requirements can be different if this server is in another jurisdiction." - ) %> + )}

-

<%= pgettext("terms", "Changes to our Privacy Policy") %>

+

{pgettext("terms", "Changes to our Privacy Policy")}

- <%= pgettext( + {pgettext( "terms", "If we decide to change our privacy policy, we will post those changes on this page." - ) %> + )}

- <%= pgettext( + {pgettext( "terms", "This document is licensed under CC BY-SA. It was last updated June 18, 2020." ) - |> raw %> + |> raw}

- <%= pgettext( + {pgettext( "terms", "Originally adapted from the Mastodon and Discourse privacy policies, also licensed under CC BY-SA." ) - |> raw %> + |> raw}

diff --git a/lib/web/templates/api/terms.html.heex b/lib/web/templates/api/terms.html.heex index 69f89307b..5bbff44e7 100644 --- a/lib/web/templates/api/terms.html.heex +++ b/lib/web/templates/api/terms.html.heex @@ -1,326 +1,326 @@
-

<%= pgettext("terms", "Short version") %>

+

{pgettext("terms", "Short version")}

    -
  • <%= pgettext("terms", "Your content is yours") %>
    • +
  • {pgettext("terms", "Your content is yours")}
  • - <%= pgettext( + {pgettext( "terms", "%{instance_name} will not use or transmit or resell your personal data", %{instance_name: @instance_name} ) - |> raw %> + |> raw}
  • - <%= pgettext("terms", "You must respect the law when using %{instance_name}", %{ + {pgettext("terms", "You must respect the law when using %{instance_name}", %{ instance_name: @instance_name }) - |> raw %> + |> raw}
  • - <%= pgettext( + {pgettext( "terms", "You must respect other people and %{instance_name}'s rules when using the service", %{instance_name: @instance_name} ) - |> raw %> + |> raw}
  • - <%= pgettext( + {pgettext( "terms", "The service is provided without warranties and these terms may change in the future" - ) %> + )}

- <%= pgettext( + {pgettext( "terms", "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We have provided a glossary to help you understand them better." ) - |> raw %> + |> raw}

- <%= pgettext( + {pgettext( "terms", "Here are the important things you need to know about accessing and using the %{instance_name} (%{instance_url}) website and service (collectively, \"Service\"). These are our terms of service (\"Terms\"). Please read them carefully.", %{instance_name: @instance_name, instance_url: @instance_url} ) - |> raw %> + |> raw}

- <%= pgettext( + {pgettext( "terms", "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors. Unless explicitly stated, this Mobilizon instance is an independent service using Mobilizon's source code. You may find more information about this instance on the \"About this instance\" page." ) - |> raw %> + |> raw}

-

<%= pgettext("terms", "Accepting these Terms") %>

+

{pgettext("terms", "Accepting these Terms")}

- <%= pgettext( + {pgettext( "terms", "By accessing or using the Service, this means you agree to be bound by all the terms below. If these terms are in any way unclear, please let us know by contacting %{contact}.", %{contact: @instance_contact} ) - |> raw %> + |> raw}

- <%= pgettext("terms", "Changes to these Terms") %> + {pgettext("terms", "Changes to these Terms")}

- <%= pgettext( + {pgettext( "terms", "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature." - ) %> + )}

- <%= pgettext( + {pgettext( "terms", "If we make major changes, we will notify our users in a clear and prominent manner. Minor changes may only be highlighted in the footer of our website. It is your responsibility to check the website regularly for changes to these Terms." - ) %> + )}

- <%= pgettext( + {pgettext( "terms", "If you continue to use the Service after the revised Terms go into effect, you accept the revised Terms." - ) %> + )}

-

<%= pgettext("terms", "Privacy Policy") %>

+

{pgettext("terms", "Privacy Policy")}

- <%= pgettext( + {pgettext( "terms", "For information about how we collect and use information about users of the Service, please check our privacy policy." ) - |> raw %> + |> raw}

-

<%= pgettext("terms", "Creating Accounts") %>

+

{pgettext("terms", "Creating Accounts")}

- <%= pgettext( + {pgettext( "terms", "When you create an account you agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to %{instance_name}.", %{instance_name: @instance_name} ) - |> raw %> + |> raw}

- <%= pgettext( + {pgettext( "terms", "If you discover or suspect any Service security breaches, please let us know as soon as possible. For security holes in the Mobilizon software itself, please contact its contributors directly." ) - |> raw %> + |> raw}

- <%= pgettext( + {pgettext( "terms", "We are not liable for any loss you may incur as a result of someone else using your email or password, either with or without your knowledge." - ) %> + )}

-

<%= pgettext("terms", "Your Content & Conduct") %>

+

{pgettext("terms", "Your Content & Conduct")}

- <%= pgettext( + {pgettext( "terms", "Our Service allows you and other users to post, link and otherwise make available content. You are responsible for the content that you make available to the Service, including its legality, reliability, and appropriateness." - ) %> + )}

- <%= pgettext( + {pgettext( "terms", "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set." - ) %> + )}

- <%= pgettext( + {pgettext( "terms", "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service." - ) %> + )}

- <%= pgettext( + {pgettext( "terms", "You can remove the content that you posted by deleting it. Once you delete your content, it will not appear on the Service, but copies of your deleted content may remain in our system or backups for some period of time. Web server access logs might also be stored for some time in the system." - ) %> + )}

- <%= pgettext( + {pgettext( "terms", "Since Mobilizon is a distributed network, it is possible, depending on the visibility rules set to your content, that your content has been distributed to other Mobilizon instances. When you delete your content, we will request those other instances to also delete the content. Our responsibility on the content being deleted from those other instances ends here. If for some reason, some other instance does not delete the content, we cannot be held responsible." - ) %> + )}

- <%= pgettext( + {pgettext( "terms", "In order to make %{instance_name} a great place for all of us, please do not post, link and otherwise make available on or through the Service any of the following:", %{instance_name: @instance_name} ) - |> raw %> + |> raw}

- <%= pgettext( + {pgettext( "terms", "Also, you agree that you will not do any of the following in connection with the Service or other users:" - ) %> + )}

- <%= pgettext( + {pgettext( "terms", "Finally, your use of the Service is also subject to acceptance of the instance's own specific rules regarding the code of conduct and moderation rules. Breaking those rules may also result in your account being disabled or suspended." ) - |> raw %> + |> raw}

- <%= pgettext("terms", "Our responsibility") %> + {pgettext("terms", "Our responsibility")}

- <%= pgettext( + {pgettext( "terms", "Instance administrators (and community moderators, given the relevant access) are responsible for monitoring and acting on flagged content and other user reports, and have the right and responsibility to remove or edit content that is not aligned to this Instance set of rules, or to suspend, block or ban (temporarily or permanently) any account, community, or instance for breaking these terms, or for other behaviours that they deem inappropriate, threatening, offensive, or harmful." - ) %> + )}

- <%= pgettext( + {pgettext( "terms", "Instance administrators should ensure that every community hosted on the instance is properly moderated according to the defined rules." - ) %> + )}

-

<%= pgettext("terms", "Source code") %>

+

{pgettext("terms", "Source code")}

- <%= pgettext( + {pgettext( "terms", "This Service runs on a Mobilizon instance. This source code is licensed under an AGPLv3 license which means you are allowed to and even encouraged to take the source code, modify it and use it." ) - |> raw %> + |> raw}

- <%= pgettext( + {pgettext( "terms", "For full details about the Mobilizon software see here." ) - |> raw %> + |> raw}

-

<%= pgettext("terms", "Hyperlinks and Third Party Content") %>

+

{pgettext("terms", "Hyperlinks and Third Party Content")}

- <%= pgettext( + {pgettext( "terms", "%{instance_name} makes no claim or representation regarding, and accepts no responsibility for third party websites accessible by hyperlink from the Service or websites linking to the Service. When you leave the Service, you should be aware that these Terms and our policies no longer govern. The inclusion of any link does not imply endorsement by %{instance_name} of the site. Use of any such linked website is at the user's own risk.", %{instance_name: @instance_name} ) - |> raw %> + |> raw}

- <%= pgettext( + {pgettext( "terms", "A lot of the content on the Service is from you and others, and we don't review, verify or authenticate it, and it may include inaccuracies or false information. We make no representations, warranties, or guarantees relating to the quality, suitability, truth, accuracy or completeness of any content contained in the Service. You acknowledge sole responsibility for and assume all risk arising from your use of or reliance on any content." - ) %> + )}

-

<%= pgettext("terms", "Termination") %>

+

{pgettext("terms", "Termination")}

- <%= pgettext( + {pgettext( "terms", "If you breach any of these Terms, we have the right to suspend or disable your access to or use of the Service." - ) %> + )}

-

<%= pgettext("terms", "Entire Agreement") %>

+

{pgettext("terms", "Entire Agreement")}

- <%= pgettext( + {pgettext( "terms", "These Terms constitute the entire agreement between you and %{instance_name} regarding the use of the Service, superseding any prior agreements between you and %{instance_name} relating to your use of the Service.", %{instance_name: @instance_name} ) - |> raw %> + |> raw}

-

<%= pgettext("terms", "Feedback") %>

+

{pgettext("terms", "Feedback")}

- <%= pgettext( + {pgettext( "terms", "We love feedback. Please let us know what you think of the Service, these Terms and, in general, %{instance_name}.", %{instance_name: @instance_name} ) - |> raw %> + |> raw}

-

<%= pgettext("terms", "Questions & Contact Information") %>

+

{pgettext("terms", "Questions & Contact Information")}

- <%= pgettext( + {pgettext( "terms", "Questions or comments about the Service may be directed to us at %{contact}", %{contact: @instance_contact} ) - |> raw %> + |> raw}

- <%= pgettext( + {pgettext( "terms", "This document is licensed under CC BY-SA. It was last updated June 22, 2020." ) - |> raw %> + |> raw}

- <%= pgettext( + {pgettext( "terms", "Originally adapted from the Diaspora* and App.net privacy policies, also licensed under CC BY-SA." ) - |> raw %> + |> raw}

diff --git a/lib/web/templates/email/activity/_comment_activity_item.html.heex b/lib/web/templates/email/activity/_comment_activity_item.html.heex index 169608daf..fc9f9eef2 100644 --- a/lib/web/templates/email/activity/_comment_activity_item.html.heex +++ b/lib/web/templates/email/activity/_comment_activity_item.html.heex @@ -1,34 +1,34 @@ <%= case @activity.subject do %> <% :event_comment_mention -> %> - <%= dgettext("activity", "%{profile} mentionned you in a comment under event %{event}.", %{ + {dgettext("activity", "%{profile} mentionned you in a comment under event %{event}.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}", event: " url() |> URI.decode()}\"> #{escape_html(@activity.subject_params["event_title"])} " }) - |> raw %> + |> raw} <% :participation_event_comment -> %> - <%= dgettext("activity", "%{profile} has posted an announcement under event %{event}.", %{ + {dgettext("activity", "%{profile} has posted an announcement under event %{event}.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}", event: " url() |> URI.decode()}\"> #{escape_html(@activity.subject_params["event_title"])} " }) - |> raw %> + |> raw} <% :event_new_comment -> %> <%= if @activity.subject_params["comment_reply_to"] do %> - <%= dgettext("activity", "%{profile} has posted a new reply under your event %{event}.", %{ + {dgettext("activity", "%{profile} has posted a new reply under your event %{event}.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}", event: " url() |> URI.decode()}#comment-#{@activity.subject_params["comment_reply_to_uuid"]}-#{@activity.subject_params["comment_uuid"]}\"> #{escape_html(@activity.subject_params["event_title"])} " }) - |> raw %> + |> raw} <% else %> - <%= dgettext( + {dgettext( "activity", "%{profile} has posted a new comment under your event %{event}.", %{ @@ -39,6 +39,6 @@ " } ) - |> raw %> + |> raw} <% end %> <% end %> diff --git a/lib/web/templates/email/activity/_conversation_activity_item.html.heex b/lib/web/templates/email/activity/_conversation_activity_item.html.heex index 8debdd3db..3f33684ec 100644 --- a/lib/web/templates/email/activity/_conversation_activity_item.html.heex +++ b/lib/web/templates/email/activity/_conversation_activity_item.html.heex @@ -1,16 +1,16 @@ <%= case @activity.subject do %> <% :conversation_created -> %> - <%= dgettext("activity", "%{profile} mentionned you in a %{conversation}.", %{ + {dgettext("activity", "%{profile} mentionned you in a %{conversation}.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}", conversation: " url() |> URI.decode()}\">conversation" }) - |> raw %> + |> raw} <% :conversation_replied -> %> - <%= dgettext("activity", "%{profile} replied you in a %{conversation}.", %{ + {dgettext("activity", "%{profile} replied you in a %{conversation}.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}", conversation: " url() |> URI.decode()}\">conversation" }) - |> raw %> + |> raw} <% end %> diff --git a/lib/web/templates/email/activity/_discussion_activity_item.html.heex b/lib/web/templates/email/activity/_discussion_activity_item.html.heex index ce02312c5..04b8ba51b 100644 --- a/lib/web/templates/email/activity/_discussion_activity_item.html.heex +++ b/lib/web/templates/email/activity/_discussion_activity_item.html.heex @@ -1,40 +1,40 @@ <%= case @activity.subject do %> <% :discussion_created -> %> - <%= dgettext("activity", "%{profile} created the discussion %{discussion}.", %{ + {dgettext("activity", "%{profile} created the discussion %{discussion}.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}", discussion: " url() |> URI.decode()}\"> #{escape_html(@activity.subject_params["discussion_title"])}" }) - |> raw %> + |> raw} <% :discussion_replied -> %> - <%= dgettext("activity", "%{profile} replied to the discussion %{discussion}.", %{ + {dgettext("activity", "%{profile} replied to the discussion %{discussion}.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}", discussion: " url() |> URI.decode()}\"> #{escape_html(@activity.subject_params["discussion_title"])}" }) - |> raw %> + |> raw} <% :discussion_renamed -> %> - <%= dgettext("activity", "%{profile} renamed the discussion %{discussion}.", %{ + {dgettext("activity", "%{profile} renamed the discussion %{discussion}.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}", discussion: " url() |> URI.decode()}\"> #{escape_html(@activity.subject_params["discussion_title"])}" }) - |> raw %> + |> raw} <% :discussion_archived -> %> - <%= dgettext("activity", "%{profile} archived the discussion %{discussion}.", %{ + {dgettext("activity", "%{profile} archived the discussion %{discussion}.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}", discussion: " url() |> URI.decode()}\"> #{escape_html(@activity.subject_params["discussion_title"])}" }) - |> raw %> + |> raw} <% :discussion_deleted -> %> - <%= dgettext("activity", "%{profile} deleted the discussion %{discussion}.", %{ + {dgettext("activity", "%{profile} deleted the discussion %{discussion}.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}", discussion: "#{escape_html(@activity.subject_params["discussion_title"])}" }) - |> raw %> + |> raw} <% end %> diff --git a/lib/web/templates/email/activity/_event_activity_item.html.heex b/lib/web/templates/email/activity/_event_activity_item.html.heex index 8d8ba1ae8..c7e8d0e7d 100644 --- a/lib/web/templates/email/activity/_event_activity_item.html.heex +++ b/lib/web/templates/email/activity/_event_activity_item.html.heex @@ -1,53 +1,53 @@ <%= case @activity.subject do %> <% :event_created -> %> - <%= dgettext("activity", "The event %{event} was created by %{profile}.", %{ + {dgettext("activity", "The event %{event} was created by %{profile}.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}", event: " url() |> URI.decode()}\"> #{escape_html(@activity.subject_params["event_title"])} " }) - |> raw %> + |> raw} <% :event_updated -> %> - <%= dgettext("activity", "The event %{event} was updated by %{profile}.", %{ + {dgettext("activity", "The event %{event} was updated by %{profile}.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}", event: " url() |> URI.decode()}\"> #{escape_html(@activity.subject_params["event_title"])} " }) - |> raw %> + |> raw} <% :event_deleted -> %> - <%= dgettext("activity", "The event %{event} was deleted by %{profile}.", %{ + {dgettext("activity", "The event %{event} was deleted by %{profile}.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}", event: "#{escape_html(@activity.subject_params["event_title"])}" }) - |> raw %> + |> raw} <% :comment_posted -> %> <%= if @activity.subject_params["comment_reply_to"] do %> - <%= dgettext("activity", "%{profile} replied to a comment on the event %{event}.", %{ + {dgettext("activity", "%{profile} replied to a comment on the event %{event}.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}", event: " url() |> URI.decode()}\"> #{escape_html(@activity.subject_params["event_title"])} " }) - |> raw %> + |> raw} <% else %> - <%= dgettext("activity", "%{profile} posted a comment on the event %{event}.", %{ + {dgettext("activity", "%{profile} posted a comment on the event %{event}.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}", event: " url() |> URI.decode()}\"> #{escape_html(@activity.subject_params["event_title"])} " }) - |> raw %> + |> raw} <% end %> <% :event_new_participation -> %> - <%= dgettext("activity", "%{profile} joined your event %{event}.", %{ + {dgettext("activity", "%{profile} joined your event %{event}.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}", event: " url() |> URI.decode()}\">#{escape_html(@activity.subject_params["event_title"])}" }) - |> raw %> + |> raw} <% end %> diff --git a/lib/web/templates/email/activity/_group_activity_item.html.heex b/lib/web/templates/email/activity/_group_activity_item.html.heex index bfd8b2b6b..73e06a0b9 100644 --- a/lib/web/templates/email/activity/_group_activity_item.html.heex +++ b/lib/web/templates/email/activity/_group_activity_item.html.heex @@ -1,20 +1,20 @@ <%= case @activity.subject do %> <% :group_created -> %> - <%= dgettext("activity", "%{profile} created the group %{group}.", %{ + {dgettext("activity", "%{profile} created the group %{group}.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}", group: " url() |> URI.decode()}\"> #{escape_html(@activity.subject_params["group_name"])} " }) - |> raw %> + |> raw} <% :group_updated -> %> - <%= dgettext("activity", "%{profile} updated the group %{group}.", %{ + {dgettext("activity", "%{profile} updated the group %{group}.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}", group: " url() |> URI.decode()}\"> #{escape_html(@activity.subject_params["group_name"])} " }) - |> raw %> + |> raw} <% end %> diff --git a/lib/web/templates/email/activity/_member_activity_item.html.heex b/lib/web/templates/email/activity/_member_activity_item.html.heex index f51fb6b92..a76dd0d98 100644 --- a/lib/web/templates/email/activity/_member_activity_item.html.heex +++ b/lib/web/templates/email/activity/_member_activity_item.html.heex @@ -1,58 +1,58 @@ <%= case @activity.subject do %> <% :member_request -> %> - <%= dgettext("activity", "%{member} requested to join the group.", %{ + {dgettext("activity", "%{member} requested to join the group.", %{ member: "#{escape_html(@activity.subject_params["member_actor_name"])}" }) - |> raw %> + |> raw} <% :member_invited -> %> - <%= dgettext("activity", "%{member} was invited by %{profile}.", %{ + {dgettext("activity", "%{member} was invited by %{profile}.", %{ member: "#{escape_html(@activity.subject_params["member_actor_name"])}", profile: "#{escaped_display_name_and_username(@activity.author)}" }) - |> raw %> + |> raw} <% :member_accepted_invitation -> %> - <%= dgettext("activity", "%{member} accepted the invitation to join the group.", %{ + {dgettext("activity", "%{member} accepted the invitation to join the group.", %{ member: "#{escape_html(@activity.subject_params["member_actor_name"])}" }) - |> raw %> + |> raw} <% :member_rejected_invitation -> %> - <%= dgettext("activity", "%{member} rejected the invitation to join the group.", %{ + {dgettext("activity", "%{member} rejected the invitation to join the group.", %{ member: "#{escape_html(@activity.subject_params["member_actor_name"])}" }) - |> raw %> + |> raw} <% :member_joined -> %> - <%= dgettext("activity", "%{member} joined the group.", %{ + {dgettext("activity", "%{member} joined the group.", %{ member: "#{escape_html(@activity.subject_params["member_actor_name"])}" }) - |> raw %> + |> raw} <% :member_added -> %> - <%= dgettext("activity", "%{profile} added the member %{member}.", %{ + {dgettext("activity", "%{profile} added the member %{member}.", %{ member: "#{escape_html(@activity.subject_params["member_actor_name"])}", profile: "#{escaped_display_name_and_username(@activity.author)}" }) - |> raw %> + |> raw} <% :member_approved -> %> - <%= dgettext("activity", "%{profile} approved the member %{member}.", %{ + {dgettext("activity", "%{profile} approved the member %{member}.", %{ member: "#{escape_html(@activity.subject_params["member_actor_name"])}", profile: "#{escaped_display_name_and_username(@activity.author)}" }) - |> raw %> + |> raw} <% :member_updated -> %> - <%= dgettext("activity", "%{profile} updated the member %{member}.", %{ + {dgettext("activity", "%{profile} updated the member %{member}.", %{ member: "#{escape_html(@activity.subject_params["member_actor_name"])}", profile: "#{escaped_display_name_and_username(@activity.author)}" }) - |> raw %> + |> raw} <% :member_removed -> %> - <%= dgettext("activity", "%{profile} excluded member %{member}.", %{ + {dgettext("activity", "%{profile} excluded member %{member}.", %{ member: "#{@activity.subject_params["member_actor_name"]}", profile: "#{escaped_display_name_and_username(@activity.author)}" }) - |> raw %> + |> raw} <% :member_quit -> %> - <%= dgettext("activity", "%{profile} quit the group.", %{ + {dgettext("activity", "%{profile} quit the group.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}" }) - |> raw %> + |> raw} <% end %> diff --git a/lib/web/templates/email/activity/_post_activity_item.html.heex b/lib/web/templates/email/activity/_post_activity_item.html.heex index 83a80b1bb..3fd6d3de5 100644 --- a/lib/web/templates/email/activity/_post_activity_item.html.heex +++ b/lib/web/templates/email/activity/_post_activity_item.html.heex @@ -1,26 +1,26 @@ <%= case @activity.subject do %> <% :post_created -> %> - <%= dgettext("activity", "The post %{post} was created by %{profile}.", %{ + {dgettext("activity", "The post %{post} was created by %{profile}.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}", post: " url() |> URI.decode()}\"> #{escape_html(@activity.subject_params["post_title"])} " }) - |> raw %> + |> raw} <% :post_updated -> %> - <%= dgettext("activity", "The post %{post} was updated by %{profile}.", %{ + {dgettext("activity", "The post %{post} was updated by %{profile}.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}", post: " url() |> URI.decode()}\"> #{escape_html(@activity.subject_params["post_title"])} " }) - |> raw %> + |> raw} <% :post_deleted -> %> - <%= dgettext("activity", "The post %{post} was deleted by %{profile}.", %{ + {dgettext("activity", "The post %{post} was deleted by %{profile}.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}", post: "#{escape_html(@activity.subject_params["post_title"])}" }) - |> raw %> + |> raw} <% end %> diff --git a/lib/web/templates/email/activity/_resource_activity_item.html.heex b/lib/web/templates/email/activity/_resource_activity_item.html.heex index b4300eabc..c65dbad5e 100644 --- a/lib/web/templates/email/activity/_resource_activity_item.html.heex +++ b/lib/web/templates/email/activity/_resource_activity_item.html.heex @@ -1,27 +1,27 @@ <%= case @activity.subject do %> <% :resource_created -> %> <%= if @activity.subject_params["is_folder"] do %> - <%= dgettext("activity", "%{profile} created the folder %{resource}.", %{ + {dgettext("activity", "%{profile} created the folder %{resource}.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}", resource: " url() |> URI.decode()}\"> #{escape_html(@activity.subject_params["resource_title"])} " }) - |> raw %> + |> raw} <% else %> - <%= dgettext("activity", "%{profile} created the resource %{resource}.", %{ + {dgettext("activity", "%{profile} created the resource %{resource}.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}", resource: " url() |> URI.decode()}\"> #{escape_html(@activity.subject_params["resource_title"])} " }) - |> raw %> + |> raw} <% end %> <% :resource_renamed -> %> <%= if @activity.subject_params["is_folder"] do %> - <%= dgettext( + {dgettext( "activity", "%{profile} renamed the folder from %{old_resource_title} to %{resource}.", %{ @@ -34,9 +34,9 @@ "#{escape_html(@activity.subject_params["old_resource_title"])}" } ) - |> raw %> + |> raw} <% else %> - <%= dgettext( + {dgettext( "activity", "%{profile} renamed the resource from %{old_resource_title} to %{resource}.", %{ @@ -49,40 +49,40 @@ "#{escape_html(@activity.subject_params["old_resource_title"])}" } ) - |> raw %> + |> raw} <% end %> <% :resource_moved -> %> <%= if @activity.subject_params["is_folder"] do %> - <%= dgettext("activity", "%{profile} moved the folder %{resource}.", %{ + {dgettext("activity", "%{profile} moved the folder %{resource}.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}", resource: " url() |> URI.decode()}\"> #{escape_html(@activity.subject_params["resource_title"])} " }) - |> raw %> + |> raw} <% else %> - <%= dgettext("activity", "%{profile} moved the resource %{resource}.", %{ + {dgettext("activity", "%{profile} moved the resource %{resource}.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}", resource: " url() |> URI.decode()}\"> #{escape_html(@activity.subject_params["resource_title"])} " }) - |> raw %> + |> raw} <% end %> <% :resource_deleted -> %> <%= if @activity.subject_params["is_folder"] do %> - <%= dgettext("activity", "%{profile} deleted the folder %{resource}.", %{ + {dgettext("activity", "%{profile} deleted the folder %{resource}.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}", resource: "#{escape_html(@activity.subject_params["resource_title"])}" }) - |> raw %> + |> raw} <% else %> - <%= dgettext("activity", "%{profile} deleted the resource %{resource}.", %{ + {dgettext("activity", "%{profile} deleted the resource %{resource}.", %{ profile: "#{escaped_display_name_and_username(@activity.author)}", resource: "#{escape_html(@activity.subject_params["resource_title"])}" }) - |> raw %> + |> raw} <% end %> <% end %> diff --git a/lib/web/templates/email/actor_suspension_participants.html.heex b/lib/web/templates/email/actor_suspension_participants.html.heex index 62f055725..6fd838bc5 100644 --- a/lib/web/templates/email/actor_suspension_participants.html.heex +++ b/lib/web/templates/email/actor_suspension_participants.html.heex @@ -15,10 +15,10 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("Your participation to %{event} on %{instance} has been cancelled!", + {gettext("Your participation to %{event} on %{instance} has been cancelled!", event: @event.title, instance: @instance_name - ) %> + )}

@@ -47,7 +47,7 @@ style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext( + {gettext( "Your instance's moderation team has decided to suspend %{actor_name} (%{actor_address}). All of their events have been removed and your participation to event %{event} cancelled.", actor_name: @actor.name || @actor.preferred_username, event: @event.title, @@ -56,7 +56,7 @@ do: "@#{@actor.preferred_username}@#{@actor.domain}", else: "@#{@actor.preferred_username}" ) - ) %> + )}

diff --git a/lib/web/templates/email/admin/_role.html.heex b/lib/web/templates/email/admin/_role.html.heex index ecf8c6b2f..313103339 100644 --- a/lib/web/templates/email/admin/_role.html.heex +++ b/lib/web/templates/email/admin/_role.html.heex @@ -1,10 +1,10 @@ <%= case @role do %> <% :administrator -> %> - <%= gettext("Administrator") %> + {gettext("Administrator")} <% :moderator -> %> - <%= gettext("Moderator") %> + {gettext("Moderator")} <% :user -> %> - <%= gettext("User") %> + {gettext("User")} <% :pending -> %> - <%= gettext("Pending") %> + {gettext("Pending")} <% end %> diff --git a/lib/web/templates/email/admin_user_confirmation.html.heex b/lib/web/templates/email/admin_user_confirmation.html.heex index 80ff98dcb..0662c5bef 100644 --- a/lib/web/templates/email/admin_user_confirmation.html.heex +++ b/lib/web/templates/email/admin_user_confirmation.html.heex @@ -15,7 +15,7 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("An administrator manually confirmed your account") %> + {gettext("An administrator manually confirmed your account")}

@@ -44,11 +44,11 @@ style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext( + {gettext( "Hi there! We just wanted to inform you that an administrator from %{instance} just manually confirmed your account.", %{instance: @instance_name} ) - |> raw %> + |> raw}

@@ -59,7 +59,7 @@ style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext("You may now login using your credentials on the service.") %> + {gettext("You may now login using your credentials on the service.")}

@@ -76,7 +76,7 @@ target="_blank" style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;" > - <%= gettext("Login on %{instance}", %{instance: @instance_name}) %> + {gettext("Login on %{instance}", %{instance: @instance_name})} @@ -93,14 +93,14 @@ style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; line-height: 20px;" >

- <%= gettext( + {gettext( "If something doesn't feel right to you, please contact the instance administrator through the contact methods %{start_link}on the instance's about page%{end_link}.", %{ start_link: "", end_link: "" } ) - |> raw %> + |> raw}

diff --git a/lib/web/templates/email/admin_user_email_changed_new.html.heex b/lib/web/templates/email/admin_user_email_changed_new.html.heex index 97a7b476a..fa9c40125 100644 --- a/lib/web/templates/email/admin_user_email_changed_new.html.heex +++ b/lib/web/templates/email/admin_user_email_changed_new.html.heex @@ -15,7 +15,7 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("An administrator manually changed the email attached to your account") %> + {gettext("An administrator manually changed the email attached to your account")}

@@ -44,11 +44,11 @@ style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext( + {gettext( "Hi there! We just wanted to inform you that an administrator from %{instance} just manually changed your account email from %{old_email} to %{new_email} (this one).", %{instance: @instance_name, old_email: @old_email, new_email: @new_email} ) - |> raw %> + |> raw}

@@ -59,14 +59,14 @@ style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; line-height: 20px;" >

- <%= gettext( + {gettext( "If something doesn't feel right to you, please contact the instance administrator through the contact methods %{start_link}on the instance's about page%{end_link}.", %{ start_link: "", end_link: "" } ) - |> raw %> + |> raw}

diff --git a/lib/web/templates/email/admin_user_email_changed_old.html.heex b/lib/web/templates/email/admin_user_email_changed_old.html.heex index 513b4779b..2912c4204 100644 --- a/lib/web/templates/email/admin_user_email_changed_old.html.heex +++ b/lib/web/templates/email/admin_user_email_changed_old.html.heex @@ -15,7 +15,7 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("An administrator manually changed the email attached to your account") %> + {gettext("An administrator manually changed the email attached to your account")}

@@ -44,11 +44,11 @@ style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext( + {gettext( "Hi there! We just wanted to inform you that an administrator from %{instance} just manually changed your account email from %{old_email} (this one) to %{new_email}.", %{instance: @instance_name, old_email: @old_email, new_email: @new_email} ) - |> raw %> + |> raw}

@@ -59,14 +59,14 @@ style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; line-height: 20px;" >

- <%= gettext( + {gettext( "If something doesn't feel right to you, please contact the instance administrator through the contact methods %{start_link}on the instance's about page%{end_link}.", %{ start_link: "", end_link: "" } ) - |> raw %> + |> raw}

diff --git a/lib/web/templates/email/admin_user_role_changed.html.heex b/lib/web/templates/email/admin_user_role_changed.html.heex index 5dfcb85b1..f45b708e2 100644 --- a/lib/web/templates/email/admin_user_role_changed.html.heex +++ b/lib/web/templates/email/admin_user_role_changed.html.heex @@ -15,7 +15,7 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("An administrator changed your role") %> + {gettext("An administrator changed your role")}

@@ -44,11 +44,11 @@ style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext( + {gettext( "Hi there! We just wanted to inform you that an administrator from %{instance} just changed your account role.", %{instance: @instance_name} ) - |> raw %> + |> raw}

@@ -61,18 +61,18 @@
- <%= gettext("Old role") %> + {gettext("Old role")} - <%= render("admin/_role.html", role: @old_role) %> + {render("admin/_role.html", role: @old_role)}
- <%= gettext("New role") %> + {gettext("New role")} - <%= render("admin/_role.html", role: @new_role) %> + {render("admin/_role.html", role: @new_role)}
@@ -85,14 +85,14 @@ style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; line-height: 20px;" >

- <%= gettext( + {gettext( "If something doesn't feel right to you, please contact the instance administrator through the contact methods %{start_link}on the instance's about page%{end_link}.", %{ start_link: "", end_link: "" } ) - |> raw %> + |> raw}

diff --git a/lib/web/templates/email/anonymous_participation_confirmation.html.heex b/lib/web/templates/email/anonymous_participation_confirmation.html.heex index 50f4f9e8e..5b60b8d1d 100644 --- a/lib/web/templates/email/anonymous_participation_confirmation.html.heex +++ b/lib/web/templates/email/anonymous_participation_confirmation.html.heex @@ -15,7 +15,7 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("Confirm your e-mail") %> + {gettext("Confirm your e-mail")}

@@ -44,11 +44,11 @@ style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext( + {gettext( "Hi there! You just registered to join this event: « %{title} ». Please confirm the e-mail address you provided:", title: escape_html(@participant.event.title) ) - |> raw %> + |> raw}

@@ -70,7 +70,7 @@ target="_blank" style="font-size: 20px; font-family: 'Roboto', Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;" > - <%= gettext("Confirm my e-mail address") %> + {gettext("Confirm my e-mail address")} @@ -87,9 +87,7 @@ style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext( - "If you wish to cancel your participation, simply click on the link below." - ) %> + {gettext("If you wish to cancel your participation, simply click on the link below.")}

@@ -110,7 +108,7 @@ target="_blank" style="font-size: 20px; font-family: 'Roboto', Helvetica, Arial, sans-serif; color: #3C376E; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;" > - <%= gettext("Cancel my attendance") %> + {gettext("Cancel my attendance")} @@ -127,7 +125,7 @@ style="padding: 20px 30px 40px 30px; color: #757199; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; line-height: 20px;" >

- <%= gettext("If you didn't trigger this email, you may safely ignore it.") %> + {gettext("If you didn't trigger this email, you may safely ignore it.")}

diff --git a/lib/web/templates/email/before_event_notification.html.heex b/lib/web/templates/email/before_event_notification.html.heex index fbb22607b..4bcd35cff 100644 --- a/lib/web/templates/email/before_event_notification.html.heex +++ b/lib/web/templates/email/before_event_notification.html.heex @@ -15,7 +15,7 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("An event is upcoming!") %> + {gettext("An event is upcoming!")}

@@ -44,7 +44,7 @@ style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext("Get ready for %{title}", title: @participant.event.title) %> + {gettext("Get ready for %{title}", title: @participant.event.title)}

@@ -62,7 +62,7 @@ target="_blank" style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;" > - <%= gettext("Go to event page") %> + {gettext("Go to event page")} @@ -79,9 +79,9 @@ style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; line-height: 20px;" >

- <%= gettext( + {gettext( "If you wish to cancel your attendance, visit the event page through the link above and click the « Attending » button." - ) %> + )}

diff --git a/lib/web/templates/email/date/event_tz_date.html.heex b/lib/web/templates/email/date/event_tz_date.html.heex index 679f6f66a..4fcee0c85 100644 --- a/lib/web/templates/email/date/event_tz_date.html.heex +++ b/lib/web/templates/email/date/event_tz_date.html.heex @@ -1,21 +1,21 @@ <%= if @event.options.timezone == nil do %> - <%= @date |> datetime_tz_convert(@timezone) |> datetime_to_string(@locale, :short) %> + {@date |> datetime_tz_convert(@timezone) |> datetime_to_string(@locale, :short)} <% else %> - <%= @date + {@date |> datetime_tz_convert(@event.options.timezone) - |> datetime_to_string(@locale, :short) %> + |> datetime_to_string(@locale, :short)}
<%= if @event.options.timezone != @timezone do %> - <%= gettext("🌐 %{timezone} %{offset}", + {gettext("🌐 %{timezone} %{offset}", timezone: @event.options.timezone, offset: @date |> datetime_tz_convert(@event.options.timezone) |> Cldr.DateTime.Formatter.zone_gmt() - ) %> + )} <% end %> <% end %> diff --git a/lib/web/templates/email/date/event_tz_date_range.html.heex b/lib/web/templates/email/date/event_tz_date_range.html.heex index 733cb0fca..c3a65a756 100644 --- a/lib/web/templates/email/date/event_tz_date_range.html.heex +++ b/lib/web/templates/email/date/event_tz_date_range.html.heex @@ -1,42 +1,42 @@ <%= cond do %> <% @end_date == nil -> %> - <%= render("date/event_tz_date.html", + {render("date/event_tz_date.html", date: @start_date, event: @event, timezone: @timezone, locale: @locale - ) %> + )} <% same_day?(@start_date, @end_date) -> %> - <%= gettext("On %{date} from %{start_time} to %{end_time}", + {gettext("On %{date} from %{start_time} to %{end_time}", date: datetime_to_date_string(@start_date, @locale), start_time: datetime_to_time_string(@start_date, @locale), end_time: datetime_to_time_string(@end_date, @locale) - ) %> + )}
<%= if @event.options.timezone != @timezone do %> - <%= gettext("🌐 %{timezone} %{offset}", + {gettext("🌐 %{timezone} %{offset}", timezone: @event.options.timezone, offset: Cldr.DateTime.Formatter.zone_gmt(@start_date) - ) %> + )} <% end %> <% true -> %> - <%= gettext("From the %{start} to the %{end}", + {gettext("From the %{start} to the %{end}", start: datetime_to_string(@start_date, @locale, :short), end: datetime_to_string(@end_date, @locale, :short) - ) %> + )}
<%= if @event.options.timezone != @timezone do %> - <%= gettext("🌐 %{timezone} %{offset}", + {gettext("🌐 %{timezone} %{offset}", timezone: @event.options.timezone, offset: Cldr.DateTime.Formatter.zone_gmt(@start_date) - ) %> + )} <% end %> <% end %> diff --git a/lib/web/templates/email/email.html.heex b/lib/web/templates/email/email.html.heex index d8a544dcc..0bbdcc6b8 100644 --- a/lib/web/templates/email/email.html.heex +++ b/lib/web/templates/email/email.html.heex @@ -1,7 +1,7 @@ - <%= @subject %> + {@subject} @@ -77,7 +77,7 @@ - <%= @inner_content %> + {@inner_content} <%= if Mobilizon.Config.instance_demo_mode?() do %> @@ -102,14 +102,14 @@ style="padding: 30px 30px 30px 30px; border-radius: 4px 4px 4px 4px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext("Warning") %> + {gettext("Warning")}


- <%= gettext("This is a demonstration site to test Mobilizon.") %> + {gettext("This is a demonstration site to test Mobilizon.")}

- <%= gettext("Please do not use it for real purposes.") %> + {gettext("Please do not use it for real purposes.")}

@@ -139,7 +139,7 @@ style="padding: 30px 30px 30px 30px; border-radius: 4px 4px 4px 4px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext("Need help? Is something not working as expected?") %> + {gettext("Need help? Is something not working as expected?")}

- <%= gettext("Ask the community on Framacolibri") %> + {gettext("Ask the community on Framacolibri")}

@@ -179,18 +179,18 @@ <%= if @offer_unsupscription do %>

- <%= gettext("Manage your notification settings") %> + {gettext("Manage your notification settings")}

<% end %>

- <%= gettext("%{instance} is powered by Mobilizon.", + {gettext("%{instance} is powered by Mobilizon.", instance: @instance_name ) - |> raw %> + |> raw}
- <%= gettext("Learn more about Mobilizon here!") %> + {gettext("Learn more about Mobilizon here!")}

diff --git a/lib/web/templates/email/email_anonymous_activity.html.heex b/lib/web/templates/email/email_anonymous_activity.html.heex index 74bd229e4..0a91d25e8 100644 --- a/lib/web/templates/email/email_anonymous_activity.html.heex +++ b/lib/web/templates/email/email_anonymous_activity.html.heex @@ -15,7 +15,7 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= @subject %> + {@subject}

@@ -47,7 +47,7 @@ align="center" style="border-radius: 3px; text-align: left; padding: 10px 5% 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: 400;line-height: 25px;" > - <%= dgettext( + {dgettext( "activity", "%{profile} has posted a public announcement under event %{event}.", %{ @@ -59,7 +59,7 @@ " } ) - |> raw %> + |> raw} @@ -82,7 +82,7 @@ target="_blank" style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;" > - <%= gettext("Visit event page") %> + {gettext("Visit event page")} @@ -104,7 +104,7 @@ align="center" style="border-radius: 3px; text-align: left; padding: 10px 5% 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: 400;line-height: 25px;" > - <%= dgettext( + {dgettext( "activity", "%{profile} has posted a private announcement about event %{event}.", %{ @@ -114,11 +114,11 @@ " url() |> URI.decode()}\">#{escape_html(@activity.subject_params["conversation_event_title"])}" } ) - |> raw %> - <%= dgettext( + |> raw} + {dgettext( "activity", "It might give details on how to join the event, so make sure to read it appropriately." - ) %> + )} @@ -133,9 +133,9 @@
- <%= @activity.subject_params["conversation_text"] + {@activity.subject_params["conversation_text"] |> sanitize_to_basic_html() - |> raw() %> + |> raw()}
@@ -153,10 +153,10 @@ align="center" style="border-radius: 3px; text-align: left; padding: 10px 5% 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: 400;line-height: 25px;" > - <%= dgettext( + {dgettext( "activity", "This information is sent privately to you as a person who registered for this event. Share the informations above with other people with caution." - ) %> + )} @@ -179,7 +179,7 @@ target="_blank" style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;" > - <%= gettext("Visit event page") %> + {gettext("Visit event page")} diff --git a/lib/web/templates/email/email_changed_new.html.heex b/lib/web/templates/email/email_changed_new.html.heex index 42131ceac..be52969d4 100644 --- a/lib/web/templates/email/email_changed_new.html.heex +++ b/lib/web/templates/email/email_changed_new.html.heex @@ -15,7 +15,7 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("Confirm new email") %> + {gettext("Confirm new email")}

@@ -44,11 +44,11 @@ style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext( + {gettext( "Hi there! It seems like you wanted to change the email address linked to your account on %{instance}. 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} ) - |> raw %> + |> raw}

@@ -65,7 +65,7 @@ target="_blank" style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;" > - <%= gettext("Verify your email address") %> + {gettext("Verify your email address")} @@ -82,7 +82,7 @@ style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; line-height: 20px;" >

- <%= gettext("If you didn't trigger the change yourself, please ignore this message.") %> + {gettext("If you didn't trigger the change yourself, please ignore this message.")}

diff --git a/lib/web/templates/email/email_changed_old.html.heex b/lib/web/templates/email/email_changed_old.html.heex index 55b578f18..a6bf9516c 100644 --- a/lib/web/templates/email/email_changed_old.html.heex +++ b/lib/web/templates/email/email_changed_old.html.heex @@ -15,7 +15,7 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("New email confirmation") %> + {gettext("New email confirmation")}

@@ -44,11 +44,11 @@ style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext( + {gettext( "The email address for your account on %{host} is being changed to:", host: @instance_name ) - |> raw %> + |> raw}

@@ -60,7 +60,7 @@
- <%= @new_email %> + {@new_email}
@@ -76,10 +76,10 @@ style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext( + {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 - ) %> + )}

diff --git a/lib/web/templates/email/email_configuration_test.html.heex b/lib/web/templates/email/email_configuration_test.html.heex index 8c20806cb..ac576fbc8 100644 --- a/lib/web/templates/email/email_configuration_test.html.heex +++ b/lib/web/templates/email/email_configuration_test.html.heex @@ -15,7 +15,7 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("Well done!") %> + {gettext("Well done!")}

@@ -44,9 +44,7 @@ style="padding: 20px 30px 30px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext( - "If you received this email, the email configuration seems to be correct." - ) %> + {gettext("If you received this email, the email configuration seems to be correct.")}

diff --git a/lib/web/templates/email/email_direct_activity.html.heex b/lib/web/templates/email/email_direct_activity.html.heex index 1a3af16ed..3b078f830 100644 --- a/lib/web/templates/email/email_direct_activity.html.heex +++ b/lib/web/templates/email/email_direct_activity.html.heex @@ -15,7 +15,7 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= @subject %> + {@subject}

@@ -50,19 +50,19 @@ <% :one_week -> %> <% dgettext("activity", "Here's your weekly activity recap") %> <% :one_hour -> %> - <%= dngettext( + {dngettext( "activity", "There has been an activity!", "There has been some activity!", @total_number_activities - ) %> + )} <% false -> %> - <%= dngettext( + {dngettext( "activity", "There has been an activity!", "There has been some activity!", @total_number_activities - ) %> + )} <% end %>

@@ -132,8 +132,8 @@ target="_blank" style="text-decoration: none;color: #474467;font-family: 'Roboto', Helvetica, Arial, sans-serif;font-size: 18px;font-weight: bold;line-height: 25px;" > - <%= hd(group_activities).group.name || - "@#{Mobilizon.Actors.Actor.preferred_username_and_domain(hd(group_activities).group)}" %> + {hd(group_activities).group.name || + "@#{Mobilizon.Actors.Actor.preferred_username_and_domain(hd(group_activities).group)}"} @@ -149,9 +149,9 @@ target="_blank" style="text-decoration: none;display: block;color: #7a7a7a;font-family: 'Roboto', Helvetica, Arial, sans-serif;font-size: 16px;font-weight: 400;line-height: 25px;" > - @<%= Mobilizon.Actors.Actor.preferred_username_and_domain( + @{Mobilizon.Actors.Actor.preferred_username_and_domain( hd(group_activities).group - ) %> + )} @@ -170,42 +170,42 @@

<%= case activity.type do %> <% :discussion -> %> - <%= render("activity/_discussion_activity_item.html", + {render("activity/_discussion_activity_item.html", activity: activity - ) %> + )} <% :conversation -> %> - <%= render("activity/_conversation_activity_item.html", + {render("activity/_conversation_activity_item.html", activity: activity - ) %> + )} <% :event -> %> - <%= render("activity/_event_activity_item.html", + {render("activity/_event_activity_item.html", activity: activity - ) %> + )} <% :group -> %> - <%= render("activity/_group_activity_item.html", + {render("activity/_group_activity_item.html", activity: activity - ) %> + )} <% :member -> %> - <%= render("activity/_member_activity_item.html", + {render("activity/_member_activity_item.html", activity: activity - ) %> + )} <% :post -> %> - <%= render("activity/_post_activity_item.html", + {render("activity/_post_activity_item.html", activity: activity - ) %> + )} <% :resource -> %> - <%= render("activity/_resource_activity_item.html", + {render("activity/_resource_activity_item.html", activity: activity - ) %> + )} <% :comment -> %> - <%= render("activity/_comment_activity_item.html", + {render("activity/_comment_activity_item.html", activity: activity - ) %> + )} <% end %>

<%= unless @single_activity do %> - <%= datetime_to_string(activity.inserted_at, @locale, :short) %> + {datetime_to_string(activity.inserted_at, @locale, :short)} <% end %> @@ -227,13 +227,13 @@ target="_blank" style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;" > - <%= dngettext( + {dngettext( "activity", "View one more activity", "View %{count} more activities", length(group_activities) - 5, %{count: length(group_activities) - 5} - ) %> + )} @@ -257,7 +257,7 @@ style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; line-height: 20px;" >

- <%= dgettext( + {dgettext( "activity", "Don't want to receive activity notifications? You may change frequency or disable them in %{tag_start}your settings%{tag_end}.", %{ @@ -265,7 +265,7 @@ tag_end: "" } ) - |> raw %> + |> raw}

diff --git a/lib/web/templates/email/event_group_follower_notification.html.heex b/lib/web/templates/email/event_group_follower_notification.html.heex index 6feabd81e..1fbbe2a71 100644 --- a/lib/web/templates/email/event_group_follower_notification.html.heex +++ b/lib/web/templates/email/event_group_follower_notification.html.heex @@ -15,9 +15,9 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("%{group} scheduled a new event", + {gettext("%{group} scheduled a new event", group: Mobilizon.Actors.Actor.display_name(@group) - ) %> + )}

@@ -45,12 +45,12 @@ align="left" style="padding: 20px 15px 0px 15px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" > - <%= render("participation/event_card.html", + {render("participation/event_card.html", event: @event, timezone: @timezone, locale: @locale, action: "event" - ) %> + )} diff --git a/lib/web/templates/email/event_participation_approved.html.heex b/lib/web/templates/email/event_participation_approved.html.heex index 7018db80d..d0987b149 100644 --- a/lib/web/templates/email/event_participation_approved.html.heex +++ b/lib/web/templates/email/event_participation_approved.html.heex @@ -15,7 +15,7 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("You're going!") %> + {gettext("You're going!")}

@@ -44,10 +44,10 @@ style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext("You recently requested to attend %{title}.", + {gettext("You recently requested to attend %{title}.", title: escape_html(@event.title) ) - |> raw %> + |> raw}

@@ -58,9 +58,9 @@ style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext( + {gettext( "Good news: one of the event organizers just approved your request. Update your calendar, because you're on the guest list now!" - ) %> + )}

@@ -78,7 +78,7 @@ target="_blank" style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;" > - <%= gettext("Visit event page") %> + {gettext("Visit event page")} @@ -95,9 +95,9 @@ style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; line-height: 20px;" >

- <%= gettext( + {gettext( "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button." - ) %> + )}

diff --git a/lib/web/templates/email/event_participation_confirmed.html.heex b/lib/web/templates/email/event_participation_confirmed.html.heex index 5279d55d8..997aacf65 100644 --- a/lib/web/templates/email/event_participation_confirmed.html.heex +++ b/lib/web/templates/email/event_participation_confirmed.html.heex @@ -15,7 +15,7 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("You're going!") %> + {gettext("You're going!")}

@@ -44,10 +44,10 @@ style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext("You recently requested to attend %{title}.", + {gettext("You recently requested to attend %{title}.", title: escape_html(@event.title) ) - |> raw %> + |> raw}

@@ -58,9 +58,9 @@ style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext( + {gettext( "You have now confirmed your participation. Update your calendar, because you're on the guest list now!" - ) %> + )}

@@ -78,7 +78,7 @@ target="_blank" style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;" > - <%= gettext("Visit event page") %> + {gettext("Visit event page")} @@ -96,9 +96,9 @@ style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext( + {gettext( "If you wish to cancel your participation, simply click on the link below." - ) %> + )}

@@ -119,7 +119,7 @@ target="_blank" style="font-size: 20px; font-family: 'Roboto', Helvetica, Arial, sans-serif; color: #3C376E; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;" > - <%= gettext("Cancel my attendance") %> + {gettext("Cancel my attendance")} @@ -137,9 +137,9 @@ style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext( + {gettext( "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button." - ) %> + )}

diff --git a/lib/web/templates/email/event_participation_rejected.html.heex b/lib/web/templates/email/event_participation_rejected.html.heex index 8d2d673fa..429cdd790 100644 --- a/lib/web/templates/email/event_participation_rejected.html.heex +++ b/lib/web/templates/email/event_participation_rejected.html.heex @@ -15,7 +15,7 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("Sorry! You're not going.") %> + {gettext("Sorry! You're not going.")}

@@ -44,10 +44,10 @@ style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext("You issued a request to attend %{title}.", + {gettext("You issued a request to attend %{title}.", title: escape_html(@event.title) ) - |> raw %> + |> raw}

@@ -58,7 +58,7 @@ style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext("Unfortunately, the organizers rejected your request.") %> + {gettext("Unfortunately, the organizers rejected your request.")}

diff --git a/lib/web/templates/email/event_updated.html.heex b/lib/web/templates/email/event_updated.html.heex index b6af2e869..71ebd0d5f 100644 --- a/lib/web/templates/email/event_updated.html.heex +++ b/lib/web/templates/email/event_updated.html.heex @@ -15,7 +15,7 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("Event update!") %> + {gettext("Event update!")}

@@ -44,11 +44,11 @@ style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext( + {gettext( "There have been changes for %{title} so we'd thought we'd let you know.", title: escape_html(@old_event.title) ) - |> raw %> + |> raw}

@@ -65,13 +65,13 @@ <%= case @event.status do %> <% :confirmed -> %> - <%= gettext("This event has been confirmed") %> + {gettext("This event has been confirmed")} <% :tentative -> %> - <%= gettext( + {gettext( "This event has yet to be confirmed: organizers will let you know if they do confirm it." - ) %> + )} <% :cancelled -> %> - <%= gettext("This event has been cancelled by its organizers. Sorry!") %> + {gettext("This event has been cancelled by its organizers. Sorry!")} <% end %> @@ -80,57 +80,57 @@ <%= if MapSet.member?(@changes, :title) do %> - <%= gettext("Event title") %> + {gettext("Event title")} - <%= @event.title %> + {@event.title} <% end %> <%= if MapSet.member?(@changes, :begins_on) do %> - <%= gettext("Start") %> + {gettext("Start")} - <%= render("date/event_tz_date.html", + {render("date/event_tz_date.html", event: @event, date: @event.begins_on, timezone: @timezone, locale: @locale - ) %> + )} <% end %> <%= if MapSet.member?(@changes, :ends_on) && !is_nil(@event.ends_on) do %> - <%= gettext("End") %> + {gettext("End")} - <%= render("date/event_tz_date.html", + {render("date/event_tz_date.html", event: @event, date: @event.ends_on, timezone: @timezone, locale: @locale - ) %> + )} <% end %> <%= if MapSet.member?(@changes, :physical_address) do %> - <%= gettext("Location") %> + {gettext("Location")} <%= unless is_nil(@event.physical_address) do %>

- <%= Mobilizon.Addresses.Address.representation(@event.physical_address) %> + {Mobilizon.Addresses.Address.representation(@event.physical_address)}

<% else %> - <%= gettext("Location address was removed") %> + {gettext("Location address was removed")} <% end %> @@ -152,7 +152,7 @@ target="_blank" style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;" > - <%= gettext("Visit the updated event page") %> + {gettext("Visit the updated event page")} @@ -169,11 +169,11 @@ style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; line-height: 20px;" >

- <%= ngettext( + {ngettext( "Would you wish to cancel your attendance, visit the event page through the link above and click the « Attending » button.", "Would you wish to cancel your attendance to one or several events, visit the event pages through the links above and click the « Attending » button.", 1 - ) %> + )}

diff --git a/lib/web/templates/email/group_invite.html.heex b/lib/web/templates/email/group_invite.html.heex index 1dcd13441..8b394a80e 100644 --- a/lib/web/templates/email/group_invite.html.heex +++ b/lib/web/templates/email/group_invite.html.heex @@ -15,7 +15,7 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("Come along!") %> + {gettext("Come along!")}

@@ -44,14 +44,14 @@ style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext( + {gettext( "%{inviter} just invited you to join their group %{link_start}%{group}%{link_end}", group: escape_html(display_name(@group)), inviter: escape_html(display_name(@inviter)), link_start: "", link_end: "" ) - |> raw %> + |> raw}

@@ -62,7 +62,7 @@ style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext("To accept this invitation, head over to your groups.") %> + {gettext("To accept this invitation, head over to your groups.")}

@@ -80,7 +80,7 @@ target="_blank" style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;" > - <%= gettext("See my groups") %> + {gettext("See my groups")} diff --git a/lib/web/templates/email/group_member_removal.html.heex b/lib/web/templates/email/group_member_removal.html.heex index 001c8a127..f6502b3ad 100644 --- a/lib/web/templates/email/group_member_removal.html.heex +++ b/lib/web/templates/email/group_member_removal.html.heex @@ -15,7 +15,7 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("Until next time!") %> + {gettext("Until next time!")}

@@ -44,13 +44,13 @@ style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext( + {gettext( "You have been removed from group %{link_start}%{group}%{link_end}. You will not be able to access this group's private content anymore.", group: escape_html(display_name(@group)), link_start: "", link_end: "" ) - |> raw %> + |> raw}

@@ -61,9 +61,9 @@ style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext( + {gettext( "If you feel this is an error, you may contact the group's administrators so that they can add you back." - ) %> + )}

diff --git a/lib/web/templates/email/group_membership_approval.html.heex b/lib/web/templates/email/group_membership_approval.html.heex index 02992d216..f89b19341 100644 --- a/lib/web/templates/email/group_membership_approval.html.heex +++ b/lib/web/templates/email/group_membership_approval.html.heex @@ -15,7 +15,7 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("You're in!") %> + {gettext("You're in!")}

@@ -44,14 +44,14 @@ style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext( + {gettext( "Your membership request for group %{link_start}%{group}%{link_end} has been approved.", group: escape_html(display_name(@group)), link_start: " url() |> URI.decode()}\">", link_end: "" ) - |> raw %> + |> raw}

@@ -73,7 +73,7 @@ target="_blank" style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;" > - <%= gettext("View the group") %> + {gettext("View the group")} diff --git a/lib/web/templates/email/group_membership_rejection.html.heex b/lib/web/templates/email/group_membership_rejection.html.heex index 76dfa0b73..ae060795a 100644 --- a/lib/web/templates/email/group_membership_rejection.html.heex +++ b/lib/web/templates/email/group_membership_rejection.html.heex @@ -15,7 +15,7 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("Sorry, not this time!") %> + {gettext("Sorry, not this time!")}

@@ -44,14 +44,14 @@ style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext( + {gettext( "Your membership request for group %{link_start}%{group}%{link_end} has been rejected.", group: escape_html(display_name(@group)), link_start: " url() |> URI.decode()}\">", link_end: "" ) - |> raw %> + |> raw}

diff --git a/lib/web/templates/email/group_suspension.html.heex b/lib/web/templates/email/group_suspension.html.heex index 828bb7c6f..1553c8078 100644 --- a/lib/web/templates/email/group_suspension.html.heex +++ b/lib/web/templates/email/group_suspension.html.heex @@ -15,10 +15,10 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("The group %{group} has been suspended on %{instance}!", + {gettext("The group %{group} has been suspended on %{instance}!", group: display_name(@group), instance: @instance_name - ) %> + )}

@@ -47,12 +47,12 @@ style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext( + {gettext( "Your instance's moderation team has decided to suspend %{group_name} (%{group_address}). You are no longer a member of this group.", group_name: escape_html(display_name(@group)), group_address: preferred_username_and_domain(@group) ) - |> raw %> + |> raw}

@@ -64,9 +64,9 @@ style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext( + {gettext( "As this group was located on this instance, all of its data has been irretrievably deleted." - ) %> + )}

@@ -78,9 +78,9 @@ style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext( + {gettext( "As this group was located on another instance, it will continue to work for other instances than this one." - ) %> + )}

diff --git a/lib/web/templates/email/instance_follow.html.heex b/lib/web/templates/email/instance_follow.html.heex index 67e9a94bb..859285a82 100644 --- a/lib/web/templates/email/instance_follow.html.heex +++ b/lib/web/templates/email/instance_follow.html.heex @@ -15,7 +15,7 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("Want to connect?") %> + {gettext("Want to connect?")}

@@ -44,15 +44,15 @@ style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext("%{name} just requested to follow your instance.", + {gettext("%{name} just requested to follow your instance.", name: escape_html(display_name_and_username(@follower)) ) - |> raw %> + |> raw}
<%= if @follower.type == :Application do %> - <%= gettext("If you accept, this instance will receive all of your public events.") %> + {gettext("If you accept, this instance will receive all of your public events.")} <% else %> - <%= gettext("If you accept, this profile will receive all of your public events.") %> + {gettext("If you accept, this profile will receive all of your public events.")} <% end %>

@@ -65,10 +65,10 @@ style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext( + {gettext( "Note: %{name} following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too.", name: escape_html(display_name_and_username(@follower)) - ) %> + )}

@@ -81,11 +81,9 @@ >

<%= if @follower.type == :Application do %> - <%= gettext( - "To accept this invitation, head over to the instance's admin settings." - ) %> + {gettext("To accept this invitation, head over to the instance's admin settings.")} <% else %> - <%= gettext("To accept this invitation, head over to the profile's admin page.") %> + {gettext("To accept this invitation, head over to the profile's admin page.")} <% end %>

@@ -107,7 +105,7 @@ target="_blank" style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;" > - <%= gettext("View the details") %> + {gettext("View the details")} <% else %> - <%= gettext("View the details") %> + {gettext("View the details")} <% end %> diff --git a/lib/web/templates/email/notification_each_week.html.heex b/lib/web/templates/email/notification_each_week.html.heex index 288010db9..6ea2ef9d3 100644 --- a/lib/web/templates/email/notification_each_week.html.heex +++ b/lib/web/templates/email/notification_each_week.html.heex @@ -15,7 +15,7 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("On the agenda this week") %> + {gettext("On the agenda this week")}

@@ -44,12 +44,12 @@ style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= ngettext( + {ngettext( "You have one event this week:", "You have %{total} events this week:", @total, total: @total - ) %> + )}

@@ -63,22 +63,22 @@ <% else %> - <%= render("participation/event_card.html", + {render("participation/event_card.html", event: @participation.event, timezone: @timezone, locale: @locale, action: "participation" - ) %> + )} <% end %> @@ -89,11 +89,11 @@ style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; line-height: 20px;" >

- <%= ngettext( + {ngettext( "Would you wish to cancel your attendance, visit the event page through the link above and click the « Attending » button.", "Would you wish to cancel your attendance to one or several events, visit the event pages through the links above and click the « Attending » button.", @total - ) %> + )}

diff --git a/lib/web/templates/email/on_day_notification.html.heex b/lib/web/templates/email/on_day_notification.html.heex index 9c37baa51..5fef318aa 100644 --- a/lib/web/templates/email/on_day_notification.html.heex +++ b/lib/web/templates/email/on_day_notification.html.heex @@ -15,7 +15,7 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("What's up today?") %> + {gettext("What's up today?")}

@@ -44,9 +44,9 @@ style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= ngettext("You have one event today:", "You have %{total} events today:", @total, + {ngettext("You have one event today:", "You have %{total} events today:", @total, total: @total - ) %> + )}

@@ -60,22 +60,22 @@ <% else %> - <%= render("participation/event_card.html", + {render("participation/event_card.html", event: @participation.event, timezone: @timezone, locale: @locale, action: "participation" - ) %> + )} <% end %> @@ -86,11 +86,11 @@ style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; line-height: 20px;" >

- <%= ngettext( + {ngettext( "Would you wish to cancel your attendance, visit the event page through the link above and click the « Attending » button.", "Would you wish to cancel your attendance to one or several events, visit the event pages through the links above and click the « Attending » button.", @total - ) %> + )}

diff --git a/lib/web/templates/email/participation/card/_metadata.html.heex b/lib/web/templates/email/participation/card/_metadata.html.heex index 9d2a87402..da0a2d1f2 100644 --- a/lib/web/templates/email/participation/card/_metadata.html.heex +++ b/lib/web/templates/email/participation/card/_metadata.html.heex @@ -49,14 +49,14 @@ style="color: rgb(87,100,108); font-family: Helvetica,Arial,sans-serif; font-weight: 300; line-height: 1.5; font-size: 16px; vertical-align: baseline; margin: 0; padding: 0; border: 0;" align="left" > - <%= render("date/event_tz_date_range.html", + {render("date/event_tz_date_range.html", event: @event, start_date: datetime_tz_convert(@event.begins_on, @event.options.timezone), end_date: datetime_tz_convert(@event.ends_on, @event.options.timezone), timezone: @timezone, locale: @locale - ) %> + )}

@@ -87,7 +87,7 @@ style="color: rgb(87,100,108); font-family: Helvetica,Arial,sans-serif; font-weight: 300; line-height: 1.5; font-size: 16px; vertical-align: baseline; margin: 0; padding: 0; border: 0;" align="left" > - <%= render_address(@event.physical_address) %> + {render_address(@event.physical_address)}

@@ -118,7 +118,7 @@ style="color: rgb(87,100,108); font-family: Helvetica,Arial,sans-serif; font-weight: 300; line-height: 1.5; font-size: 16px; vertical-align: baseline; margin: 0; padding: 0; border: 0;" align="left" > - <%= gettext("Online event") %> + {gettext("Online event")}

diff --git a/lib/web/templates/email/participation/card/_title.html.heex b/lib/web/templates/email/participation/card/_title.html.heex index 8b202ceb8..8c686faf4 100644 --- a/lib/web/templates/email/participation/card/_title.html.heex +++ b/lib/web/templates/email/participation/card/_title.html.heex @@ -11,7 +11,7 @@ style="color: rgb(66,81,90); font-family: Helvetica,Arial,sans-serif; font-weight: 700; text-align: left; line-height: 1.4; text-decoration: none; vertical-align: baseline; font-size: 22px; letter-spacing: 0.2px; margin: 0 0 30px; padding: 0; border: 0;" target="_blank" > - <%= @event.title %> + {@event.title}
<%= cond do %> @@ -44,11 +44,11 @@ style="color: rgb(254,56,89); font-family: Helvetica,Arial,sans-serif; font-weight: normal; text-align: left; line-height: 1.3; text-decoration: none; vertical-align: baseline; margin: 0; padding: 0; border: 0;" target="_blank" > - <%= @event.attributed_to.name || @event.attributed_to.preferred_username %> + {@event.attributed_to.name || @event.attributed_to.preferred_username} <% else %> - <%= @event.organizer_actor.name || @event.organizer_actor.preferred_username %> + {@event.organizer_actor.name || @event.organizer_actor.preferred_username} <% end %>

diff --git a/lib/web/templates/email/participation/event_card.html.heex b/lib/web/templates/email/participation/event_card.html.heex index 3724441b4..c2c551baf 100644 --- a/lib/web/templates/email/participation/event_card.html.heex +++ b/lib/web/templates/email/participation/event_card.html.heex @@ -1,15 +1,15 @@ <%= if @event.picture do %> - <%= render("participation/card/_picture.html", event: @event) %> + {render("participation/card/_picture.html", event: @event)} <% end %> -<%= render("participation/card/_title.html", event: @event) %> -<%= render("participation/card/_metadata.html", +{render("participation/card/_title.html", event: @event)} +{render("participation/card/_metadata.html", event: @event, timezone: @timezone, locale: @locale, action: @action -) %> +)} <%= case @action do %> <% "participation" -> %>
- <%= gettext("Manage your participation") %> + {gettext("Manage your participation")} @@ -88,7 +88,7 @@ style="color: rgb(255,255,255); font-family: Helvetica,Arial,sans-serif; text-align: left; line-height: 14px; text-decoration: none; vertical-align: baseline; font-size: 20px; display: inline-block; border: 1px solid #3C376E; border-radius: 15px; white-space: nowrap; margin: 0; padding: 15px 25px; border: none;" target="_blank" > - <%= gettext("Participate") %> + {gettext("Participate")} @@ -110,14 +110,14 @@ style="color: rgb(46,62,72); font-family: Helvetica,Arial,sans-serif; font-weight: 700; line-height: 1.5; font-size: 16px; vertical-align: baseline; margin: 0; padding: 0 0 7.5px; border: 0;" align="left" > - <%= gettext("Details") %> + {gettext("Details")}

- <%= process_description(@event.description) %> + {process_description(@event.description)}

<%= if String.length(@event.description) > 200 do %>

- <%= gettext("Read more") %> + {gettext("Read more")}

<% end %> diff --git a/lib/web/templates/email/password_reset.html.heex b/lib/web/templates/email/password_reset.html.heex index e6bace00e..4d4c44490 100644 --- a/lib/web/templates/email/password_reset.html.heex +++ b/lib/web/templates/email/password_reset.html.heex @@ -15,7 +15,7 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("Password reset") %> + {gettext("Password reset")}

@@ -44,15 +44,15 @@ style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext("You requested a new password for your account on %{instance}.", + {gettext("You requested a new password for your account on %{instance}.", instance: @instance_name ) - |> raw %> + |> raw}

- <%= gettext( + {gettext( "Resetting your password is easy. Just press the button below and follow the instructions. We'll have you up and running in no time." - ) %> + )}

@@ -63,9 +63,9 @@ style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; line-height: 20px;" >

- <%= gettext( + {gettext( "If you didn't request this, please ignore this email. Your password won't change until you access the link below and create a new one." - ) %> + )}

@@ -83,7 +83,7 @@ target="_blank" style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #474467; display: inline-block;" > - <%= gettext("Reset Password") %> + {gettext("Reset Password")} diff --git a/lib/web/templates/email/pending_participation_notification.html.heex b/lib/web/templates/email/pending_participation_notification.html.heex index fb493f4fd..fa853027e 100644 --- a/lib/web/templates/email/pending_participation_notification.html.heex +++ b/lib/web/templates/email/pending_participation_notification.html.heex @@ -15,7 +15,7 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("A request is pending!") %> + {gettext("A request is pending!")}

@@ -44,12 +44,12 @@ style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= ngettext( + {ngettext( "You have one pending attendance request to process for the following event:", "You have %{number_participation_requests} attendance requests to process for the following event:", @total, number_participation_requests: @total - ) %> + )}

@@ -59,12 +59,12 @@ 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;" > - <%= render("participation/event_card.html", + {render("participation/event_card.html", event: @event, timezone: @timezone, locale: @locale, action: nil - ) %> + )} @@ -86,7 +86,7 @@ target="_blank" style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;" > - <%= gettext("Manage pending requests") %> + {gettext("Manage pending requests")} @@ -103,9 +103,9 @@ style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; line-height: 20px;" >

- <%= gettext( + {gettext( "You are receiving this email because you chose to get notifications for pending attendance requests to your events. You can disable or change your notification settings in your user account settings under « Notifications »." - ) %> + )}

diff --git a/lib/web/templates/email/registration_confirmation.html.heex b/lib/web/templates/email/registration_confirmation.html.heex index 2c1381772..497e1d7e1 100644 --- a/lib/web/templates/email/registration_confirmation.html.heex +++ b/lib/web/templates/email/registration_confirmation.html.heex @@ -15,7 +15,7 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("Nearly there!") %> + {gettext("Nearly there!")}

@@ -44,11 +44,11 @@ style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext( + {gettext( "You created an account on %{host} with this email address. You are one click away from activating it.", host: @instance_name ) - |> raw %> + |> raw}

@@ -59,7 +59,7 @@ style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; line-height: 20px;" >

- <%= gettext("If you didn't trigger this email, you may safely ignore it.") %> + {gettext("If you didn't trigger this email, you may safely ignore it.")}

@@ -77,7 +77,7 @@ target="_blank" style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;" > - <%= gettext("Activate my account") %> + {gettext("Activate my account")} diff --git a/lib/web/templates/email/report.html.heex b/lib/web/templates/email/report.html.heex index 002e81ac5..ae198340d 100644 --- a/lib/web/templates/email/report.html.heex +++ b/lib/web/templates/email/report.html.heex @@ -15,7 +15,7 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("New report on %{instance}", instance: @instance_name) |> raw %> + {gettext("New report on %{instance}", instance: @instance_name) |> raw}

@@ -45,16 +45,16 @@ >

<%= if @report.reporter.type == :Application and @report.reporter.preferred_username == "relay" do %> - <%= gettext( + {gettext( "Someone on %{instance} reported the following content for you to analyze:", instance: escape_html(@report.reporter.domain) ) - |> raw %> + |> raw} <% else %> - <%= gettext("%{reporter} reported the following content.", + {gettext("%{reporter} reported the following content.", reporter: escape_html(display_name_and_username(@report.reporter)) ) - |> raw %> + |> raw} <% end %>

@@ -68,18 +68,18 @@ >

<%= if @report.reported.type == :Group do %> -

<%= gettext("Group reported") %>

+

{gettext("Group reported")}

- <%= Mobilizon.Actors.Actor.display_name_and_username(@report.reported) %> + {Mobilizon.Actors.Actor.display_name_and_username(@report.reported)} <% else %> -

<%= gettext("Profile reported") %>

- <%= Mobilizon.Actors.Actor.display_name_and_username(@report.reported) %> +

{gettext("Profile reported")}

+ {Mobilizon.Actors.Actor.display_name_and_username(@report.reported)} <% end %>

-

<%= gettext("Flagged events") %>

+

{gettext("Flagged events")}

<%= for event <- @report.events do %> - <%= gettext("%{title} by %{creator}", + {gettext("%{title} by %{creator}", title: event.title, creator: Mobilizon.Actors.Actor.preferred_username_and_domain(@report.reported) - ) %> + )} <% end %>

@@ -155,10 +155,10 @@ 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;" > -

<%= gettext("Flagged comments") %>

+

{gettext("Flagged comments")}

<%= for comment <- @report.comments do %>

- <%= Mobilizon.Service.Formatter.HTML.strip_tags(comment.text) %> + {Mobilizon.Service.Formatter.HTML.strip_tags(comment.text)}

<% end %>

-

<%= gettext("Reasons for report") %>

- <%= @report.content %> +

{gettext("Reasons for report")}

+ {@report.content}

- <%= gettext("View report") %> + {gettext("View report")} diff --git a/lib/web/templates/email/user_pending.html.heex b/lib/web/templates/email/user_pending.html.heex index a6c9dd93f..9a8ba4c74 100644 --- a/lib/web/templates/email/user_pending.html.heex +++ b/lib/web/templates/email/user_pending.html.heex @@ -15,7 +15,7 @@ style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;" >

- <%= gettext("New pending user on %{instance}", instance: @instance_name) |> raw %> + {gettext("New pending user on %{instance}", instance: @instance_name) |> raw}

@@ -44,11 +44,11 @@ style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >

- <%= gettext("New pending user from %{user} on %{instance}", + {gettext("New pending user from %{user} on %{instance}", user: @user.email, instance: @instance_name ) - |> raw %> + |> raw}

@@ -59,7 +59,7 @@ target="_blank" style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;" > - <%= gettext("Login to view the list of pending users") %> + {gettext("Login to view the list of pending users")} diff --git a/lib/web/templates/error/500_page.html.heex b/lib/web/templates/error/500_page.html.heex index e73eb25ad..e38ae0b5c 100644 --- a/lib/web/templates/error/500_page.html.heex +++ b/lib/web/templates/error/500_page.html.heex @@ -4,7 +4,7 @@ - <%= gettext("This page is not correct") %> + {gettext("This page is not correct")} -

<%= gettext("Participants for %{event}", event: @event.title) %>

+

{gettext("Participants for %{event}", event: @event.title)}

-
<%= gettext("Begins on") %>
-
<%= datetime_to_string(@event.begins_on, @locale, :long) %>
+
{gettext("Begins on")}
+
{datetime_to_string(@event.begins_on, @locale, :long)}
<%= if @event.ends_on do %> -
<%= gettext("Ends on") %>
-
<%= datetime_to_string(@event.ends_on, @locale, :long) %>
+
{gettext("Ends on")}
+
{datetime_to_string(@event.ends_on, @locale, :long)}
<% end %> <%= if not is_nil(@event.physical_address) and not is_nil(render_address(@event.physical_address)) do %> -
<%= gettext("Location") %>
-
<%= render_address(@event.physical_address) %>
+
{gettext("Location")}
+
{render_address(@event.physical_address)}
<% end %> -
<%= gettext("Number of participants") %>
+
{gettext("Number of participants")}
- <%= @event.participant_stats.participant + @event.participant_stats.moderator + - @event.participant_stats.administrator + @event.participant_stats.creator %> + {@event.participant_stats.participant + @event.participant_stats.moderator + + @event.participant_stats.administrator + @event.participant_stats.creator}
<%= for column <- @columns do %> - + <% end %> @@ -147,7 +147,7 @@ <%= for line <- @data do %> <%= for cell <- line do %> - + <% end %> <% end %> diff --git a/lib/web/templates/page/index.html.heex b/lib/web/templates/page/index.html.heex index d0fcf595b..7dbe50c84 100644 --- a/lib/web/templates/page/index.html.heex +++ b/lib/web/templates/page/index.html.heex @@ -1,7 +1,7 @@ - <%= raw(Mobilizon.Config.get([:html_hooks, :app_index_html_head_first], "")) %> + {raw(Mobilizon.Config.get([:html_hooks, :app_index_html_head_first], ""))} @@ -22,14 +22,14 @@ <% end %> - <%= tags(assigns) || assigns.tags %> - <%= Vite.vite_client() %> - <%= Vite.vite_snippet("src/main.ts") %> - <%= raw(Mobilizon.Config.get([:html_hooks, :app_index_html_head_last], "")) %> + {tags(assigns) || assigns.tags} + {Vite.vite_client()} + {Vite.vite_snippet("src/main.ts")} + {raw(Mobilizon.Config.get([:html_hooks, :app_index_html_head_last], ""))} - <%= raw(Mobilizon.Config.get([:html_hooks, :app_index_html_body_first], "")) %> + {raw(Mobilizon.Config.get([:html_hooks, :app_index_html_body_first], ""))}
- <%= raw(Mobilizon.Config.get([:html_hooks, :app_index_html_body_last], "")) %> + {raw(Mobilizon.Config.get([:html_hooks, :app_index_html_body_last], ""))} diff --git a/package-lock.json b/package-lock.json index f2b48ad4c..cdaaf9eee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5001,14 +5001,14 @@ } }, "node_modules/@vitest/coverage-v8": { - "version": "4.0.12", - "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-4.0.12.tgz", - "integrity": "sha512-d+w9xAFJJz6jyJRU4BUU7MH409Ush7FWKNkxJU+jASKg6WX33YT0zc+YawMR1JesMWt9QRFQY/uAD3BTn23FaA==", + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-4.0.13.tgz", + "integrity": "sha512-w77N6bmtJ3CFnL/YHiYotwW/JI3oDlR3K38WEIqegRfdMSScaYxwYKB/0jSNpOTZzUjQkG8HHEz4sdWQMWpQ5g==", "dev": true, "license": "MIT", "dependencies": { "@bcoe/v8-coverage": "^1.0.2", - "@vitest/utils": "4.0.12", + "@vitest/utils": "4.0.13", "ast-v8-to-istanbul": "^0.3.8", "debug": "^4.4.3", "istanbul-lib-coverage": "^3.2.2", @@ -5023,8 +5023,8 @@ "url": "https://opencollective.com/vitest" }, "peerDependencies": { - "@vitest/browser": "4.0.12", - "vitest": "4.0.12" + "@vitest/browser": "4.0.13", + "vitest": "4.0.13" }, "peerDependenciesMeta": { "@vitest/browser": { @@ -5033,16 +5033,16 @@ } }, "node_modules/@vitest/expect": { - "version": "4.0.12", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.0.12.tgz", - "integrity": "sha512-is+g0w8V3/ZhRNrRizrJNr8PFQKwYmctWlU4qg8zy5r9aIV5w8IxXLlfbbxJCwSpsVl2PXPTm2/zruqTqz3QSg==", + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.0.13.tgz", + "integrity": "sha512-zYtcnNIBm6yS7Gpr7nFTmq8ncowlMdOJkWLqYvhr/zweY6tFbDkDi8BPPOeHxEtK1rSI69H7Fd4+1sqvEGli6w==", "dev": true, "license": "MIT", "dependencies": { "@standard-schema/spec": "^1.0.0", "@types/chai": "^5.2.2", - "@vitest/spy": "4.0.12", - "@vitest/utils": "4.0.12", + "@vitest/spy": "4.0.13", + "@vitest/utils": "4.0.13", "chai": "^6.2.1", "tinyrainbow": "^3.0.3" }, @@ -5051,13 +5051,13 @@ } }, "node_modules/@vitest/mocker": { - "version": "4.0.12", - "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.0.12.tgz", - "integrity": "sha512-GsmA/tD5Ht3RUFoz41mZsMU1AXch3lhmgbTnoSPTdH231g7S3ytNN1aU0bZDSyxWs8WA7KDyMPD5L4q6V6vj9w==", + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.0.13.tgz", + "integrity": "sha512-eNCwzrI5djoauklwP1fuslHBjrbR8rqIVbvNlAnkq1OTa6XT+lX68mrtPirNM9TnR69XUPt4puBCx2Wexseylg==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/spy": "4.0.12", + "@vitest/spy": "4.0.13", "estree-walker": "^3.0.3", "magic-string": "^0.30.21" }, @@ -5088,9 +5088,9 @@ } }, "node_modules/@vitest/pretty-format": { - "version": "4.0.12", - "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.0.12.tgz", - "integrity": "sha512-R7nMAcnienG17MvRN8TPMJiCG8rrZJblV9mhT7oMFdBXvS0x+QD6S1G4DxFusR2E0QIS73f7DqSR1n87rrmE+g==", + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.0.13.tgz", + "integrity": "sha512-ooqfze8URWbI2ozOeLDMh8YZxWDpGXoeY3VOgcDnsUxN0jPyPWSUvjPQWqDGCBks+opWlN1E4oP1UYl3C/2EQA==", "dev": true, "license": "MIT", "dependencies": { @@ -5101,13 +5101,13 @@ } }, "node_modules/@vitest/runner": { - "version": "4.0.12", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.0.12.tgz", - "integrity": "sha512-hDlCIJWuwlcLumfukPsNfPDOJokTv79hnOlf11V+n7E14rHNPz0Sp/BO6h8sh9qw4/UjZiKyYpVxK2ZNi+3ceQ==", + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.0.13.tgz", + "integrity": "sha512-9IKlAru58wcVaWy7hz6qWPb2QzJTKt+IOVKjAx5vb5rzEFPTL6H4/R9BMvjZ2ppkxKgTrFONEJFtzvnyEpiT+A==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/utils": "4.0.12", + "@vitest/utils": "4.0.13", "pathe": "^2.0.3" }, "funding": { @@ -5115,13 +5115,13 @@ } }, "node_modules/@vitest/snapshot": { - "version": "4.0.12", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.0.12.tgz", - "integrity": "sha512-2jz9zAuBDUSbnfyixnyOd1S2YDBrZO23rt1bicAb6MA/ya5rHdKFRikPIDpBj/Dwvh6cbImDmudegnDAkHvmRQ==", + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.0.13.tgz", + "integrity": "sha512-hb7Usvyika1huG6G6l191qu1urNPsq1iFc2hmdzQY3F5/rTgqQnwwplyf8zoYHkpt7H6rw5UfIw6i/3qf9oSxQ==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "4.0.12", + "@vitest/pretty-format": "4.0.13", "magic-string": "^0.30.21", "pathe": "^2.0.3" }, @@ -5130,9 +5130,9 @@ } }, "node_modules/@vitest/spy": { - "version": "4.0.12", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.0.12.tgz", - "integrity": "sha512-GZjI9PPhiOYNX8Nsyqdw7JQB+u0BptL5fSnXiottAUBHlcMzgADV58A7SLTXXQwcN1yZ6gfd1DH+2bqjuUlCzw==", + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.0.13.tgz", + "integrity": "sha512-hSu+m4se0lDV5yVIcNWqjuncrmBgwaXa2utFLIrBkQCQkt+pSwyZTPFQAZiiF/63j8jYa8uAeUZ3RSfcdWaYWw==", "dev": true, "license": "MIT", "funding": { @@ -5140,13 +5140,13 @@ } }, "node_modules/@vitest/ui": { - "version": "4.0.12", - "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-4.0.12.tgz", - "integrity": "sha512-RCqeApCnbwd5IFvxk6OeKMXTvzHU/cVqY8HAW0gWk0yAO6wXwQJMKhDfDtk2ss7JCy9u7RNC3kyazwiaDhBA/g==", + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-4.0.13.tgz", + "integrity": "sha512-MFV6GhTflgBj194+vowTB2iLI5niMZhqiW7/NV7U4AfWbX/IAtsq4zA+gzCLyGzpsQUdJlX26hrQ1vuWShq2BQ==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/utils": "4.0.12", + "@vitest/utils": "4.0.13", "fflate": "^0.8.2", "flatted": "^3.3.3", "pathe": "^2.0.3", @@ -5158,17 +5158,17 @@ "url": "https://opencollective.com/vitest" }, "peerDependencies": { - "vitest": "4.0.12" + "vitest": "4.0.13" } }, "node_modules/@vitest/utils": { - "version": "4.0.12", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.0.12.tgz", - "integrity": "sha512-DVS/TLkLdvGvj1avRy0LSmKfrcI9MNFvNGN6ECjTUHWJdlcgPDOXhjMis5Dh7rBH62nAmSXnkPbE+DZ5YD75Rw==", + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.0.13.tgz", + "integrity": "sha512-ydozWyQ4LZuu8rLp47xFUWis5VOKMdHjXCWhs1LuJsTNKww+pTHQNK4e0assIB9K80TxFyskENL6vCu3j34EYA==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "4.0.12", + "@vitest/pretty-format": "4.0.13", "tinyrainbow": "^3.0.3" }, "funding": { @@ -13991,19 +13991,19 @@ } }, "node_modules/vitest": { - "version": "4.0.12", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.0.12.tgz", - "integrity": "sha512-pmW4GCKQ8t5Ko1jYjC3SqOr7TUKN7uHOHB/XGsAIb69eYu6d1ionGSsb5H9chmPf+WeXt0VE7jTXsB1IvWoNbw==", + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.0.13.tgz", + "integrity": "sha512-QSD4I0fN6uZQfftryIXuqvqgBxTvJ3ZNkF6RWECd82YGAYAfhcppBLFXzXJHQAAhVFyYEuFTrq6h0hQqjB7jIQ==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/expect": "4.0.12", - "@vitest/mocker": "4.0.12", - "@vitest/pretty-format": "4.0.12", - "@vitest/runner": "4.0.12", - "@vitest/snapshot": "4.0.12", - "@vitest/spy": "4.0.12", - "@vitest/utils": "4.0.12", + "@vitest/expect": "4.0.13", + "@vitest/mocker": "4.0.13", + "@vitest/pretty-format": "4.0.13", + "@vitest/runner": "4.0.13", + "@vitest/snapshot": "4.0.13", + "@vitest/spy": "4.0.13", + "@vitest/utils": "4.0.13", "debug": "^4.4.3", "es-module-lexer": "^1.7.0", "expect-type": "^1.2.2", @@ -14032,10 +14032,10 @@ "@opentelemetry/api": "^1.9.0", "@types/debug": "^4.1.12", "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0", - "@vitest/browser-playwright": "4.0.12", - "@vitest/browser-preview": "4.0.12", - "@vitest/browser-webdriverio": "4.0.12", - "@vitest/ui": "4.0.12", + "@vitest/browser-playwright": "4.0.13", + "@vitest/browser-preview": "4.0.13", + "@vitest/browser-webdriverio": "4.0.13", + "@vitest/ui": "4.0.13", "happy-dom": "*", "jsdom": "*" },
<%= column %>{column}
<%= cell %>{cell}