From d904046775e5dd7a3a4b5b1b404146cd30472fd4 Mon Sep 17 00:00:00 2001 From: Emma Winston Date: Fri, 13 Sep 2019 01:09:33 +0100 Subject: [PATCH] Swapping out Mastodon for site title in sessions, noscript and backup confirmation message --- app/views/auth/registrations/_sessions.html.haml | 2 +- app/views/home/index.html.haml | 2 +- app/views/user_mailer/backup_ready.html.haml | 2 +- config/locales/en.yml | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/views/auth/registrations/_sessions.html.haml b/app/views/auth/registrations/_sessions.html.haml index d7d96a1bb..80f9f722c 100644 --- a/app/views/auth/registrations/_sessions.html.haml +++ b/app/views/auth/registrations/_sessions.html.haml @@ -1,5 +1,5 @@ %h4= t 'sessions.title' -%p.muted-hint= t 'sessions.explanation' +%p.muted-hint= t('sessions.explanation', title: site_title) .table-wrapper %table.table.inline-table diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 4c7fac0b6..8e1d5f4c9 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -14,4 +14,4 @@ = image_pack_tag 'logo.svg', alt: 'Mastodon' %div - = t('errors.noscript_html', apps_path: 'https://joinmastodon.org/apps') + = t('errors.noscript_html', apps_path: 'https://joinmastodon.org/apps', title: site_title) diff --git a/app/views/user_mailer/backup_ready.html.haml b/app/views/user_mailer/backup_ready.html.haml index 85140b08b..6009d584d 100644 --- a/app/views/user_mailer/backup_ready.html.haml +++ b/app/views/user_mailer/backup_ready.html.haml @@ -36,7 +36,7 @@ %tbody %tr %td.column-cell.text-center - %p= t 'user_mailer.backup_ready.explanation' + %p= t('user_mailer.backup_ready.explanation', title: site_title) %table.email-table{ cellspacing: 0, cellpadding: 0 } %tbody diff --git a/config/locales/en.yml b/config/locales/en.yml index 5c322d4c5..22fd622e7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -601,7 +601,7 @@ en: '500': content: We're sorry, but something went wrong on our end. title: This page is not correct - noscript_html: To use the Mastodon web application, please enable JavaScript. Alternatively, try one of the native apps for Mastodon for your platform. + noscript_html: To use the %{title} web application, please enable JavaScript. Alternatively, try one of the native apps for Mastodon for your platform. existing_username_validator: not_found: could not find a local user with that username not_found_multiple: could not find %{usernames} @@ -850,7 +850,7 @@ en: weibo: Weibo current_session: Current session description: "%{browser} on %{platform}" - explanation: These are the web browsers currently logged in to your Mastodon account. + explanation: These are the web browsers currently logged in to your %{title} account. ip: IP platforms: adobe_air: Adobe Air @@ -1041,7 +1041,7 @@ en: wrong_code: The entered code was invalid! Are server time and device time correct? user_mailer: backup_ready: - explanation: You requested a full backup of your Mastodon account. It's now ready for download! + explanation: You requested a full backup of your %{title} account. It's now ready for download! subject: Your archive is ready for download title: Archive takeout warning: @@ -1070,7 +1070,7 @@ en: full_handle_hint: This is what you would tell your friends so they can message or follow you from another server. review_preferences_action: Change preferences review_preferences_step: Make sure to set your preferences, such as which emails you'd like to receive, or what privacy level you’d like your posts to default to. If you don’t have motion sickness, you could choose to enable GIF autoplay. - subject: Welcome to Mastodon + subject: Welcome to %{title} tip_federated_timeline: The federated timeline is a firehose view of the Mastodon network. But it only includes people your neighbours are subscribed to, so it's not complete. tip_following: You follow your server's admin(s) by default. To find more interesting people, check the local and federated timelines. tip_local_timeline: The local timeline is a firehose view of people on %{instance}. These are your immediate neighbours!