From a80fd8c79bfcf843fcb47f27389e755cc302caaf Mon Sep 17 00:00:00 2001 From: ThibG Date: Fri, 3 Jul 2020 03:06:08 +0200 Subject: [PATCH] Change the about.instance_actor_flash to be single-line (#14200) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some translations of that string are single-line, which somehow seems to make Crowdin issue a blank newline at the end of those translations. This, in turns, leads to different results when running “i18n-tasks normalize” depending on the version of libyaml installed, making the CI fail if it runs a different version than whoever ran “i18n-tasks normalize”. Since there is no real reason for that source string to be multi-line (it is only displayed in HTML, without replacing newlines by
tags), attempt to fix Crowdin export by making the source string single-line. --- config/locales/en.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 2cae0a3e3b..23bed812e8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -21,9 +21,7 @@ en: federation_hint_html: With an account on %{instance} you'll be able to follow people on any Mastodon server and beyond. get_apps: Try a mobile app hosted_on: Mastodon hosted on %{domain} - instance_actor_flash: | - This account is a virtual actor used to represent the server itself and not any individual user. - It is used for federation purposes and should not be blocked unless you want to block the whole instance, in which case you should use a domain block. + instance_actor_flash: This account is a virtual actor used to represent the server itself and not any individual user. It is used for federation purposes and should not be blocked unless you want to block the whole instance, in which case you should use a domain block. learn_more: Learn more privacy_policy: Privacy policy see_whats_happening: See what's happening