From 797074c47060ed0afd224caaac03a1a64e1702d6 Mon Sep 17 00:00:00 2001 From: Jean-Marie Simonet Date: Sat, 19 Sep 2020 09:00:13 +0200 Subject: [PATCH 1/2] [4.0] Missing alerts strings --- administrator/language/en-GB/joomla.ini | 3 +++ language/en-GB/joomla.ini | 4 +++- layouts/joomla/system/message.php | 9 +++++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/administrator/language/en-GB/joomla.ini b/administrator/language/en-GB/joomla.ini index 19191ae76a94..ab10d9206481 100644 --- a/administrator/language/en-GB/joomla.ini +++ b/administrator/language/en-GB/joomla.ini @@ -67,6 +67,7 @@ JCATEGORY_DESC="Category descending" JCATEGORY_SPRINTF="Category: %s" JCLEAR="Clear" JCLIENT="Location" +JCLOSE="Close" JCONFIG_PERMISSIONS_DESC="Permissions for this component unless they are changed for a specific item." JCONFIG_PERMISSIONS_LABEL="Permissions" JCURRENT="Current" @@ -101,8 +102,10 @@ JNEXT_TITLE="Next article: %s" JNO="No" JNONE="None" JOFF="Off" +JOK="OK" JON="On" JONLY="Only" +JOPEN="Open" JOPTIONS="Options" JORDERINGDISABLED="Please sort by order to enable reordering" JPREV="Prev" diff --git a/language/en-GB/joomla.ini b/language/en-GB/joomla.ini index 47aebb131dc6..303555afd2ea 100644 --- a/language/en-GB/joomla.ini +++ b/language/en-GB/joomla.ini @@ -65,7 +65,7 @@ JCATEGORY="Category" JCATEGORY_ASC="Category ascending" JCATEGORY_DESC="Category descending" JCLEAR="Clear" -JDATE="Date" +JCLOSE="Close" JDATE_ASC="Date ascending" JDATE_DESC="Date descending" JDAY="Day" @@ -93,9 +93,11 @@ JNO="No" JNONE="None" JNOTPUBLISHEDYET="Not published yet" JNOTICE="Notice" +JOK="OK" JOFF="Off" JOFFLINE_MESSAGE="This site is down for maintenance.
Please check back again soon." JON="On" +JOPEN="Open" JOPTIONS="Options" JPAGETITLE="%1$s - %2$s" JPREV="Prev" diff --git a/layouts/joomla/system/message.php b/layouts/joomla/system/message.php index a93e8f240d1b..460a215a8005 100644 --- a/layouts/joomla/system/message.php +++ b/layouts/joomla/system/message.php @@ -29,9 +29,14 @@ // Load JavaScript message titles Text::script('ERROR'); -Text::script('WARNING'); -Text::script('NOTICE'); Text::script('MESSAGE'); +Text::script('NOTICE'); +Text::script('WARNING'); + +// Load other Javascript message strings +Text::script('JCLOSE'); +Text::script('JOK'); +Text::script('JOPEN'); // Alerts progressive enhancement Factory::getDocument()->getWebAssetManager() From d05869cf512d7e402b7254cbb90a27e6e80d2ecc Mon Sep 17 00:00:00 2001 From: Jean-Marie Simonet Date: Sat, 19 Sep 2020 10:07:27 +0200 Subject: [PATCH 2/2] oops --- language/en-GB/joomla.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/language/en-GB/joomla.ini b/language/en-GB/joomla.ini index 303555afd2ea..820bbefaf11e 100644 --- a/language/en-GB/joomla.ini +++ b/language/en-GB/joomla.ini @@ -66,6 +66,7 @@ JCATEGORY_ASC="Category ascending" JCATEGORY_DESC="Category descending" JCLEAR="Clear" JCLOSE="Close" +JDATE="Date" JDATE_ASC="Date ascending" JDATE_DESC="Date descending" JDAY="Day"