Merge branch '5.1-dev' into emptystate

.drone.yml

@@ -272,7 +272,7 @@ volumes:
 
 services:
   - name: mysql
-    image: mysql:8
+    image: mysql:8.0
     command: ["--default-authentication-plugin=mysql_native_password"]
     environment:
       MYSQL_USER: joomla_ut
@@ -415,6 +415,6 @@ trigger:
 
 ---
 kind: signature
-hmac: 070b8d44a6bad66956066cf2f6587f8d4726a7d1a5c78a823664458001d90454
+hmac: 1dd372065e6179c1afc6c4da95e1bf89b3524489488dd2b0ff228f870f111685
 
 ...

administrator/components/com_redirect/src/View/Links/HtmlView.php

@@ -136,7 +136,7 @@ public function display($tpl = null)
             throw new GenericDataException(implode("\n", $errors), 500);
         }
 
-        if (!(PluginHelper::isEnabled('system', 'redirect') && RedirectHelper::collectUrlsEnabled())) {
+        if (!PluginHelper::isEnabled('system', 'redirect') || !RedirectHelper::collectUrlsEnabled()) {
             $this->redirectPluginId = RedirectHelper::getRedirectPluginId();
         }
 

administrator/components/com_redirect/tmpl/links/default.php

@@ -14,6 +14,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
 use Joomla\Component\Redirect\Administrator\Helper\RedirectHelper;
@@ -32,11 +33,12 @@
 $listDirn  = $this->escape($this->state->get('list.direction'));
 
 $collectUrlsEnabled = RedirectHelper::collectUrlsEnabled();
+$pluginEnabled      = PluginHelper::isEnabled('system', 'redirect');
 $redirectPluginId   = $this->redirectPluginId;
 
 // Show messages about the enabled plugin and if the plugin should collect URLs
-if (!$redirectPluginId && $collectUrlsEnabled) {
-    $app->enqueueMessage(Text::sprintf('COM_REDIRECT_COLLECT_URLS_ENABLED', Text::_('COM_REDIRECT_PLUGIN_ENABLED')), 'warning');
+if ($pluginEnabled && $collectUrlsEnabled) {
+    $app->enqueueMessage(Text::sprintf('COM_REDIRECT_COLLECT_URLS_ENABLED', Text::_('COM_REDIRECT_PLUGIN_ENABLED')), 'notice');
 } else {
     $popupOptions = [
         'popupType'  => 'iframe',
@@ -56,10 +58,10 @@
         ],
     );
 
-    if (!$redirectPluginId && !$collectUrlsEnabled) {
+    if ($pluginEnabled && !$collectUrlsEnabled) {
         $app->enqueueMessage(
             Text::sprintf('COM_REDIRECT_COLLECT_MODAL_URLS_DISABLED', Text::_('COM_REDIRECT_PLUGIN_ENABLED'), $link),
-            'warning'
+            'notice'
         );
     } else {
         $app->enqueueMessage(Text::sprintf('COM_REDIRECT_PLUGIN_MODAL_DISABLED', $link), 'error');

administrator/components/com_redirect/tmpl/links/emptystate.php

@@ -14,6 +14,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\Component\Redirect\Administrator\Helper\RedirectHelper;
 
@@ -42,11 +43,12 @@
 }
 
 $collectUrlsEnabled = RedirectHelper::collectUrlsEnabled();
+$pluginEnabled      = PluginHelper::isEnabled('system', 'redirect');
 $redirectPluginId   = $this->redirectPluginId;
 
 // Show messages about the enabled plugin and if the plugin should collect URLs
-if (!$redirectPluginId && $collectUrlsEnabled) {
-    $app->enqueueMessage(Text::sprintf('COM_REDIRECT_COLLECT_URLS_ENABLED', Text::_('COM_REDIRECT_PLUGIN_ENABLED')), 'warning');
+if ($pluginEnabled && $collectUrlsEnabled) {
+    $app->enqueueMessage(Text::sprintf('COM_REDIRECT_COLLECT_URLS_ENABLED', Text::_('COM_REDIRECT_PLUGIN_ENABLED')), 'notice');
 } else {
     /** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
     $wa = $this->document->getWebAssetManager();
@@ -70,10 +72,10 @@
         ],
     );
 
-    if (!$redirectPluginId && !$collectUrlsEnabled) {
+    if ($pluginEnabled && !$collectUrlsEnabled) {
         $app->enqueueMessage(
             Text::sprintf('COM_REDIRECT_COLLECT_MODAL_URLS_DISABLED', Text::_('COM_REDIRECT_PLUGIN_ENABLED'), $link),
-            'warning'
+            'notice'
         );
     } else {
         $app->enqueueMessage(Text::sprintf('COM_REDIRECT_PLUGIN_MODAL_DISABLED', $link), 'error');

administrator/language/en-GB/com_cpanel.ini

@@ -30,6 +30,6 @@ COM_CPANEL_MSG_TEXTFILTER3919_TITLE="Updated Text Filter Recommendations"
 COM_CPANEL_TITLE_SYSTEM_PANEL="System Panel"
 COM_CPANEL_UNPUBLISH_MODULE_ERROR="Error unpublishing the module"
 COM_CPANEL_UNPUBLISH_MODULE_SUCCESS="Module unpublished"
-COM_CPANEL_WELCOME_BEGINNERS_MESSAGE="<p>Community resources are available for new users.</p><ul><li><a href=\"https://docs.joomla.org/Special:MyLanguage/Portal:Beginners\" target=\"_blank\" rel=\"noopener noreferrer\">Joomla! Beginners Guide</a></li><li><a href=\"https://forum.joomla.org/viewforum.php?f=808\" target=\"_blank\" rel=\"noopener noreferrer\">New to Joomla! Forum</a></li></ul>"
+COM_CPANEL_WELCOME_BEGINNERS_MESSAGE="<p>Community resources are available for new users.</p><ul><li><a href=\"https://docs.joomla.org/Special:MyLanguage/Portal:Beginners\" target=\"_blank\" rel=\"noopener noreferrer\">Joomla! Beginners Guide</a></li><li><a href=\"https://forum.joomla.org/viewforum.php?f=834\" target=\"_blank\" rel=\"noopener noreferrer\">New to Joomla! Forum</a></li></ul>"
 COM_CPANEL_WELCOME_BEGINNERS_TITLE="Welcome to Joomla!"
 COM_CPANEL_XML_DESCRIPTION="Home Dashboard component"

administrator/language/en-GB/mod_user.ini

@@ -5,9 +5,12 @@
 
 MOD_USER="User Menu"
 MOD_USER_ACCESSIBILITY_SETTINGS="Accessibility Settings"
-MOD_USER_DARK_MODE="Dark Mode"
 MOD_USER_EDIT_ACCOUNT="Edit Account"
-MOD_USER_LIGHT_MODE="Light Mode"
+MOD_USER_LIGHTDARK_MODE="Light/Dark Mode"
 MOD_USER_MENU="User Menu"
 MOD_USER_TITLE="Signed in as %s"
 MOD_USER_XML_DESCRIPTION="This module shows the User Menu and is intended to be displayed in the 'status' position."
+
+; Deprecated, will be removed with 6.0
+MOD_USER_LIGHT_MODE="Light Mode"
+MOD_USER_DARK_MODE="Dark Mode"

administrator/modules/mod_user/tmpl/default.php

@@ -54,10 +54,10 @@
         <?php if ($colorSchemeSwitch) : ?>
             <button type="button" class="dropdown-item" data-color-scheme-switch>
                 <span class="d-dark-scheme-none">
-                    <span class="fa fa-sun icon-fw me-1" aria-hidden="true"></span> <?php echo Text::_('MOD_USER_LIGHT_MODE'); ?>
+                    <span class="fa fa-sun icon-fw me-1" aria-hidden="true"></span> <?php echo Text::_('MOD_USER_LIGHTDARK_MODE'); ?>
                 </span>
                 <span class="d-light-scheme-none">
-                    <span class="fa fa-moon icon-fw me-1" aria-hidden="true"></span> <?php echo Text::_('MOD_USER_DARK_MODE'); ?>
+                    <span class="fa fa-moon icon-fw me-1" aria-hidden="true"></span> <?php echo Text::_('MOD_USER_LIGHTDARK_MODE'); ?>
                 </span>
             </button>
         <?php endif; ?>

build/media_source/system/js/fields/joomla-media-select.w-c.es6.js

@@ -240,8 +240,8 @@ const insertAsOther = (media, editor, fieldClass, type) => {
   <source src="${Joomla.selectedMediaFile.url}" type="${Joomla.selectedMediaFile.fileType}">
 </video>`;
           }
-        } else if (Joomla.editors.instances[editor].getSelection() !== '') {
-          outputText = `<a download href="${Joomla.selectedMediaFile.url}">${Joomla.editors.instances[editor].getSelection()}</a>`;
+        } else if (editorInst.getSelection() !== '') {
+          outputText = `<a download href="${Joomla.selectedMediaFile.url}">${editorInst.getSelection()}</a>`;
         } else {
           const name = /([\w-]+)\./.exec(Joomla.selectedMediaFile.url);
           outputText = `<a download href="${Joomla.selectedMediaFile.url}">${Joomla.Text._('JFIELD_MEDIA_DOWNLOAD_FILE').replace('{file}', name[1])}</a>`;

installation/language/bg-BG/joomla.ini

@@ -81,11 +81,13 @@ INSTL_DATABASE_NAME_LABEL="Име на база данни"
 INSTL_DATABASE_NAME_MSG_MYSQL="Некоректно име на базата данни. Не трябва да съдържа символите: \ /"
 INSTL_DATABASE_NAME_MSG_POSTGRES="Некоректно име на базата данни. Трябва да започва с буква, последвана от буквено -цифрови знаци."
 INSTL_DATABASE_NO_SCHEMA="Не съществува схема за избрания вид база данни."
+INSTL_DATABASE_PASSWORD_DESC="Въведете парола която сте създали или е предоставена от хостинга Ви."
 INSTL_DATABASE_PREFIX_DESC="Въведете префикс на таблица или използвайте произволно генерирания."
 INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Ако използвате съществуваща база данни с таблици със същия префикс, Joomla ще преименува тези съществуващи таблици, като добави префикса \"bak_\"."
 INSTL_DATABASE_PREFIX_MSG="Префиксът на таблицата трябва да започва с буква и по избор да бъде последван от буквено -цифрови знаци и долна черта"
 INSTL_DATABASE_RESPONSE_ERROR="Инсталирането е неуспешно."
 INSTL_DATABASE_TYPE_DESC="Изберете тип база данни."
+INSTL_DATABASE_USER_DESC="Потребителско име, което сте създали или което Ви е предоставено от хостинга."
 INSTL_DATABASE_VALIDATION_ERROR="Проверете идентификационните данни на базата данни, типа на базата данни, името на базата данни или името на хоста. Ако имате инсталиран MySQL 8, моля, прочетете това <a href=\"https://docs.joomla.org/Special:MyLanguage/Joomla_and_MySQL_8#Workaround_to_get_Joomla_working_with_MySQL_8\" target=\"_blank\" rel=\"noopener noreferrer\">wiki</a> за повече информация."
 
 INSTL_CONNECT_DB="Настройка на връзка с база данни"
@@ -101,6 +103,9 @@ INSTL_SETUP_SITE_NAME="Име на сайта"
 INSTL_SITE="Основни настройки"
 INSTL_SITE_DEVMODE_LABEL="Открихме режим на разработчик"
 INSTL_SITE_NAME_DESC="Въведете име на Вашия Joomla сайт."
+; Expert View
+INSTL_PUBLIC_FOLDER_DESC="Относителен или абсолютен път към публичната папка"
+INSTL_PUBLIC_FOLDER_DESC_SHORT="Относителен или абсолютен път към публичната папка"
 ; Complete view
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Папката \"%s\" не може да бъде изтрита. Моля, изтрийте ръчно папката."
 INSTL_COMPLETE_REMOVE_FOLDER="Премахни \"%s\" папка"
@@ -280,4 +285,9 @@ JLIB_FORM_CONTAINS_INVALID_FIELDS="Липсват задължителни да
 JLIB_FORM_FIELD_INVALID_VALUE="Невалидна стойност."
 JLIB_FORM_FIELD_REQUIRED_CHECK="Изберете една от опциите."
 JLIB_FORM_FIELD_REQUIRED_VALUE="Попълнете полето."
+; Installation progress screen
+INSTL="Инсталиране"
+INSTL_FINISHED="Инсталацията приключи"
+INSTL_IN_PROGRESS="Инсталацията работи"
+INSTL_PROGRESS="Прогрес на инсталацията"