From d288c0cef2a62324852677aaf559aa0003b11bb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20=C3=9Ar?= Date: Wed, 23 Dec 2020 01:19:54 +0100 Subject: [PATCH 1/3] Blackout: improve wording --- blackout/blackout.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/blackout/blackout.php b/blackout/blackout.php index 83b2dbc1..aa08cef7 100644 --- a/blackout/blackout.php +++ b/blackout/blackout.php @@ -94,17 +94,17 @@ function blackout_addon_admin(&$a, &$o) { // a note for the admin $adminnote = ""; if ($date2 < $date1) { - $adminnote = DI::l10n()->t("The end-date is prior to the start-date of the blackout, you should fix this"); + $adminnote = DI::l10n()->t("The end-date is prior to the start-date of the blackout, you should fix this."); } else { - $adminnote = DI::l10n()->t("Please double check that the current settings for the blackout. Begin will be %s and it will end %s.", $mystart, $myend); + $adminnote = DI::l10n()->t("Please double check the current settings for the blackout. Begin will be %s and it will end %s.", $mystart, $myend); } $o = Renderer::replaceMacros($t, [ '$submit' => DI::l10n()->t('Save Settings'), - '$rurl' => ["rurl", DI::l10n()->t("Redirect URL"), $myurl, DI::l10n()->t("all your visitors from the web will be redirected to this URL"), "", "", "url"], + '$rurl' => ["rurl", DI::l10n()->t("Redirect URL"), $myurl, DI::l10n()->t("All your visitors from the web will be redirected to this URL."), "", "", "url"], '$startdate' => ["startdate", DI::l10n()->t("Begin of the Blackout"), $mystart, DI::l10n()->t("Format is YYYY-MM-DD hh:mm; YYYY year, MM month, DD day, hh hour and mm minute.")], '$enddate' => ["enddate", DI::l10n()->t("End of the Blackout"), $myend, ""], '$adminnote' => $adminnote, - '$aboutredirect' => DI::l10n()->t("Note: The redirect will be active from the moment you press the submit button. Users currently logged in will not be thrown out but can't login again after logging out should the blackout is still in place."), + '$aboutredirect' => DI::l10n()->t("Note: The redirect will be active from the moment you press the submit button. Users currently logged in will not be thrown out but can't login again after logging out while the blackout is still in place."), ]); } function blackout_addon_admin_post (&$a) { From bb034121424826e1fd3449b3ccc63381c679f3f8 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 23 Dec 2020 01:33:35 -0500 Subject: [PATCH 2/3] [blackout] Improve wording some more --- blackout/blackout.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blackout/blackout.php b/blackout/blackout.php index aa08cef7..cfe4bbb7 100644 --- a/blackout/blackout.php +++ b/blackout/blackout.php @@ -96,7 +96,7 @@ function blackout_addon_admin(&$a, &$o) { if ($date2 < $date1) { $adminnote = DI::l10n()->t("The end-date is prior to the start-date of the blackout, you should fix this."); } else { - $adminnote = DI::l10n()->t("Please double check the current settings for the blackout. Begin will be %s and it will end %s.", $mystart, $myend); + $adminnote = DI::l10n()->t("Please double check the current settings for the blackout. It will begin on %s and end on %s.", $mystart, $myend); } $o = Renderer::replaceMacros($t, [ '$submit' => DI::l10n()->t('Save Settings'), From 0e534dc0ceba7102993541c4fb0f9b26c2897f23 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 23 Dec 2020 01:35:01 -0500 Subject: [PATCH 3/3] [blackout] Regenerate main translation file after strings update --- blackout/lang/C/messages.po | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/blackout/lang/C/messages.po b/blackout/lang/C/messages.po index abdd3fd9..688e8bb0 100644 --- a/blackout/lang/C/messages.po +++ b/blackout/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-12 09:26+0100\n" +"POT-Creation-Date: 2020-12-23 01:34-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,48 +17,48 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: blackout.php:101 +#: blackout.php:97 msgid "" -"The end-date is prior to the start-date of the blackout, you should fix this" +"The end-date is prior to the start-date of the blackout, you should fix this." msgstr "" -#: blackout.php:103 +#: blackout.php:99 #, php-format msgid "" -"Please double check that the current settings for the blackout. Begin will " -"be %s and it will end %s." +"Please double check the current settings for the blackout. It will begin on " +"%s and end on %s." msgstr "" -#: blackout.php:106 +#: blackout.php:102 msgid "Save Settings" msgstr "" -#: blackout.php:107 +#: blackout.php:103 msgid "Redirect URL" msgstr "" -#: blackout.php:107 -msgid "all your visitors from the web will be redirected to this URL" +#: blackout.php:103 +msgid "All your visitors from the web will be redirected to this URL." msgstr "" -#: blackout.php:108 +#: blackout.php:104 msgid "Begin of the Blackout" msgstr "" -#: blackout.php:108 +#: blackout.php:104 msgid "" "Format is YYYY-MM-DD hh:mm; YYYY year, MM month, " "DD day, hh hour and mm minute." msgstr "" -#: blackout.php:109 +#: blackout.php:105 msgid "End of the Blackout" msgstr "" -#: blackout.php:111 +#: blackout.php:107 msgid "" "Note: The redirect will be active from the moment you press " "the submit button. Users currently logged in will not be " -"thrown out but can't login again after logging out should the blackout is " +"thrown out but can't login again after logging out while the blackout is " "still in place." msgstr ""