Merge pull request #1059 from urbalazs/blackout-wording
Blackout: improve wording
This commit is contained in:
commit
d572a68f28
2 changed files with 19 additions and 19 deletions
|
@ -94,17 +94,17 @@ function blackout_addon_admin(&$a, &$o) {
|
||||||
// a note for the admin
|
// a note for the admin
|
||||||
$adminnote = "";
|
$adminnote = "";
|
||||||
if ($date2 < $date1) {
|
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 {
|
} else {
|
||||||
$adminnote = DI::l10n()->t("Please double check that the current settings for the blackout. Begin will be <strong>%s</strong> and it will end <strong>%s</strong>.", $mystart, $myend);
|
$adminnote = DI::l10n()->t("Please double check the current settings for the blackout. It will begin on <strong>%s</strong> and end on <strong>%s</strong>.", $mystart, $myend);
|
||||||
}
|
}
|
||||||
$o = Renderer::replaceMacros($t, [
|
$o = Renderer::replaceMacros($t, [
|
||||||
'$submit' => DI::l10n()->t('Save Settings'),
|
'$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 <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute.")],
|
'$startdate' => ["startdate", DI::l10n()->t("Begin of the Blackout"), $mystart, DI::l10n()->t("Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute.")],
|
||||||
'$enddate' => ["enddate", DI::l10n()->t("End of the Blackout"), $myend, ""],
|
'$enddate' => ["enddate", DI::l10n()->t("End of the Blackout"), $myend, ""],
|
||||||
'$adminnote' => $adminnote,
|
'$adminnote' => $adminnote,
|
||||||
'$aboutredirect' => DI::l10n()->t("<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can't login again after logging out should the blackout is still in place."),
|
'$aboutredirect' => DI::l10n()->t("<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can't login again after logging out while the blackout is still in place."),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
function blackout_addon_admin_post (&$a) {
|
function blackout_addon_admin_post (&$a) {
|
||||||
|
|
|
@ -8,7 +8,7 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: \n"
|
"Project-Id-Version: \n"
|
||||||
"Report-Msgid-Bugs-To: \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"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
@ -17,48 +17,48 @@ msgstr ""
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
|
||||||
#: blackout.php:101
|
#: blackout.php:97
|
||||||
msgid ""
|
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 ""
|
msgstr ""
|
||||||
|
|
||||||
#: blackout.php:103
|
#: blackout.php:99
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"Please double check that the current settings for the blackout. Begin will "
|
"Please double check the current settings for the blackout. It will begin on "
|
||||||
"be <strong>%s</strong> and it will end <strong>%s</strong>."
|
"<strong>%s</strong> and end on <strong>%s</strong>."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: blackout.php:106
|
#: blackout.php:102
|
||||||
msgid "Save Settings"
|
msgid "Save Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: blackout.php:107
|
#: blackout.php:103
|
||||||
msgid "Redirect URL"
|
msgid "Redirect URL"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: blackout.php:107
|
#: blackout.php:103
|
||||||
msgid "all your visitors from the web will be redirected to this URL"
|
msgid "All your visitors from the web will be redirected to this URL."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: blackout.php:108
|
#: blackout.php:104
|
||||||
msgid "Begin of the Blackout"
|
msgid "Begin of the Blackout"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: blackout.php:108
|
#: blackout.php:104
|
||||||
msgid ""
|
msgid ""
|
||||||
"Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
|
"Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
|
||||||
"<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
|
"<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: blackout.php:109
|
#: blackout.php:105
|
||||||
msgid "End of the Blackout"
|
msgid "End of the Blackout"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: blackout.php:111
|
#: blackout.php:107
|
||||||
msgid ""
|
msgid ""
|
||||||
"<strong>Note</strong>: The redirect will be active from the moment you press "
|
"<strong>Note</strong>: The redirect will be active from the moment you press "
|
||||||
"the submit button. Users currently logged in will <strong>not</strong> be "
|
"the submit button. Users currently logged in will <strong>not</strong> 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."
|
"still in place."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
Loading…
Reference in a new issue