* Make Reporting admin section translatable And translate it into english and french Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Make subject of emails translatable and improve french translation Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Make error pages translatable and translate them in english and french Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Translate site setting section * Insert instance in registration emails and improve them a bit Signed-off-by: Thomas Citharel <tcit@tcit.fr>closed-social-glitch-2
@ -1,52 +1,40 @@ | |||
- content_for :page_title do | |||
Site Settings | |||
= t('admin.settings.title') | |||
%table.table | |||
%colgroup | |||
%col{ width: '35%' }/ | |||
%thead | |||
%tr | |||
%th Setting | |||
%th Click to edit | |||
%th= t('admin.settings.setting') | |||
%th= t('admin.settings.click_to_edit') | |||
%tbody | |||
%tr | |||
%td{ rowspan: 2 } | |||
%strong Contact information | |||
%td= best_in_place @settings['site_contact_username'], :value, url: admin_setting_path(@settings['site_contact_username']), place_holder: 'Enter a username' | |||
%strong= t('admin.settings.contact_information.label') | |||
%td= best_in_place @settings['site_contact_username'], :value, url: admin_setting_path(@settings['site_contact_username']), place_holder: t('admin.settings.contact_information.username') | |||
%tr | |||
%td= best_in_place @settings['site_contact_email'], :value, url: admin_setting_path(@settings['site_contact_email']), place_holder: 'Enter a public e-mail address' | |||
%td= best_in_place @settings['site_contact_email'], :value, url: admin_setting_path(@settings['site_contact_email']), place_holder: t('admin.settings.contact_information.email') | |||
%tr | |||
%td | |||
%strong Site title | |||
%strong= t('admin.settings.site_title') | |||
%td= best_in_place @settings['site_title'], :value, url: admin_setting_path(@settings['site_title']) | |||
%tr | |||
%td | |||
%strong Site description | |||
%br/ | |||
Displayed as a paragraph on the frontpage and used as a meta tag. | |||
%br/ | |||
You can use HTML tags, in particular | |||
%code= '<a>' | |||
and | |||
%code= '<em>' | |||
%strong= t('admin.settings.site_description.title') | |||
%p= t('admin.settings.site_description.desc_html') | |||
%td= best_in_place @settings['site_description'], :value, as: :textarea, url: admin_setting_path(@settings['site_description']) | |||
%tr | |||
%td | |||
%strong Extended site description | |||
%br/ | |||
Displayed on extended information page | |||
%br/ | |||
You can use HTML tags | |||
%strong= t('admin.settings.site_description_extended.title') | |||
%p= t('admin.settings.site_description_extended.desc_html') | |||
%td= best_in_place @settings['site_extended_description'], :value, as: :textarea, url: admin_setting_path(@settings['site_extended_description']) | |||
%tr | |||
%td | |||
%strong Open registration | |||
%td= best_in_place @settings['open_registrations'], :value, as: :checkbox, collection: { false: 'Disabled', true: 'Enabled'}, url: admin_setting_path(@settings['open_registrations']) | |||
%strong= t('admin.settings.registrations.open.title') | |||
%td= best_in_place @settings['open_registrations'], :value, as: :checkbox, collection: { false: t('admin.settings.registrations.open.disabled'), true: t('admin.settings.registrations.open.enabled')}, url: admin_setting_path(@settings['open_registrations']) | |||
%tr | |||
%td | |||
%strong Closed registration message | |||
%br/ | |||
Displayed on frontpage when registrations are closed | |||
%br/ | |||
You can use HTML tags | |||
%strong= t('admin.settings.registrations.closed_message.title') | |||
%p= t('admin.settings.registrations.closed_message.desc_html') | |||
%td= best_in_place @settings['closed_registrations_message'], :value, as: :textarea, url: admin_setting_path(@settings['closed_registrations_message']) |
@ -1,5 +1,5 @@ | |||
- content_for :page_title do | |||
The page you were looking for doesn't exist | |||
= t('errors.404') | |||
- content_for :content do | |||
The page you were looking for doesn't exist | |||
= t('errors.404') |
@ -1,5 +1,5 @@ | |||
- content_for :page_title do | |||
The page you were looking for doesn't exist anymore | |||
= t('errors.410') | |||
- content_for :content do | |||
The page you were looking for doesn't exist anymore | |||
= t('errors.410') |
@ -1,5 +1,5 @@ | |||
- content_for :page_title do | |||
Security verification failed | |||
= t('errors.422.title') | |||
- content_for :content do | |||
Security verification failed. Are you blocking cookies? | |||
= t('errors.422.content') |
@ -1,5 +1,12 @@ | |||
<p>Welcome <%= @resource.email %>!</p> | |||
<p>Welcome <%= @resource.email %> !</p> | |||
<p>You can confirm your Mastodon account email through the link below:</p> | |||
<p>You just created an account on <%= @instance %>.</p> | |||
<p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %></p> | |||
<p>To confirm your inscription, please click on the following link : <br> | |||
<%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %> | |||
<p>Please also check out our <%= link_to 'terms and conditions', terms_url %>.</p> | |||
<p>Sincerely,<p> | |||
<p>The <%= @instance %> team</p> |
@ -1,5 +1,12 @@ | |||
Welcome <%= @resource.email %>! | |||
Welcome <%= @resource.email %> ! | |||
You can confirm your Mastodon account email through the link below: | |||
You just created an account on <%= @instance %>. | |||
To confirm your inscription, please click on the following link : | |||
<%= confirmation_url(@resource, confirmation_token: @token) %> | |||
Please also check out our terms and conditions <%= terms_url %> | |||
Sincerely, | |||
The <%= @instance %> team |
@ -1,5 +1,14 @@ | |||
<p>Bienvenue <%= @resource.email %> !</p> | |||
<p>Bonjour <%= @resource.email %> !<p> | |||
<p>Vous pouvez confirmer le courriel de votre compte Mastodon en cliquant sur le lien ci-dessous :</p> | |||
<p>Vous venez de vous créer un compte sur <%= @instance %> et nous vous en remercions :)</p> | |||
<p><%= link_to 'Confirmer mon compte', confirmation_url(@resource, confirmation_token: @token) %></p> | |||
<p>Pour confirmer votre inscription, merci de cliquer sur le lien suivant : <br> | |||
<%= link_to 'Confirmer mon compte', confirmation_url(@resource, confirmation_token: @token) %></p> | |||
<p>Après votre première connexion, vous pourrez accéder à la documentation de l'outil.</p> | |||
<p>Pensez également à jeter un œil à nos <%= link_to 'conditions d\'utilisation', terms_url %>.</p> | |||
<p>Amicalement,</p> | |||
<p>L'équipe <%= @instance %></p> |
@ -1,5 +1,14 @@ | |||
Bienvenue <%= @resource.email %> ! | |||
Bonjour <%= @resource.email %> ! | |||
Vous pouvez confirmer le courriel de votre compte Mastodon en cliquant sur le lien ci-dessous : | |||
Vous venez de vous créer un compte sur <%= @instance %> et nous vous en remercions. | |||
Pour confirmer votre inscription, merci de cliquer sur le lien suivant : | |||
<%= confirmation_url(@resource, confirmation_token: @token) %> | |||
Après votre première connexion, vous pourrez accéder à la documentation de l'outil. | |||
Pour rappel, nos conditions d'utilisation sont indiquées ici <%= terms_url %> | |||
Amicalement, | |||
L'équipe <%= @instance %> |