Merge branch '4.1-dev' into batch_useer

.appveyor.yml

@@ -8,15 +8,8 @@ clone_folder: C:\projects\joomla-cms
 environment:
   PHPBuild: "x64"
   matrix:
-  - php_ver_target: 7.2
-  - php_ver_target: 7.3
-  - php_ver_target: 7.4
   - php_ver_target: 8.0
-  - php_ver_target: 8.1
 
-matrix:
-  allow_failures:
-    - php_ver_target: 8.1
 
 init:
   - SET PATH=C:\Tools\php;%PATH%

administrator/components/com_cache/config.xml

@@ -13,6 +13,7 @@
 			filter="rules"
 			validate="rules"
 			component="com_cache"
-			section="component" />
+			section="component"
+		/>
 	</fieldset>
 </config>

administrator/components/com_config/forms/application.xml

@@ -49,7 +49,7 @@
 			filter="integer"
 			validate="number"
 			showon="caching:1,2"
-		 />
+		/>
 
 		<field
 			name="cache_path"
@@ -173,7 +173,8 @@
 			label="COM_CONFIG_FIELD_DATABASE_TYPE_LABEL"
 			description="COM_CONFIG_FIELD_DATABASE_TYPE_DESC"
 			supported="mysql,mysqli,pgsql,postgresql"
-			filter="string" />
+			filter="string"
+		/>
 
 		<field
 			name="host"

administrator/components/com_contact/config.xml

@@ -838,22 +838,22 @@
 		</field>
 
 		<field
- 			name="contacts_display_num"
- 			type="list"
- 			label="COM_CONTACT_NUMBER_CONTACTS_LIST_LABEL"
- 			default="10"
+			name="contacts_display_num"
+			type="list"
+			label="COM_CONTACT_NUMBER_CONTACTS_LIST_LABEL"
+			default="10"
 			validate="options"
- 			>
- 			<option value="5">J5</option>
- 			<option value="10">J10</option>
- 			<option value="15">J15</option>
- 			<option value="20">J20</option>
- 			<option value="25">J25</option>
- 			<option value="30">J30</option>
- 			<option value="50">J50</option>
- 			<option value="100">J100</option>
- 			<option value="0">JALL</option>
- 		</field>
+			>
+			<option value="5">J5</option>
+			<option value="10">J10</option>
+			<option value="15">J15</option>
+			<option value="20">J20</option>
+			<option value="25">J25</option>
+			<option value="30">J30</option>
+			<option value="50">J50</option>
+			<option value="100">J100</option>
+			<option value="0">JALL</option>
+		</field>
 
 		<field
 			name="initial_sort"

administrator/components/com_contact/forms/contact.xml

@@ -15,7 +15,7 @@
 			type="text"
 			label="COM_CONTACT_FIELD_NAME_LABEL"
 			required="true"
-		 />
+		/>
 
 		<field
 			name="alias"
@@ -167,7 +167,7 @@
 			label="JFIELD_META_KEYWORDS_LABEL"
 			rows="3"
 			cols="30"
-		 />
+		/>
 
 		<field
 			name="metadesc"

administrator/components/com_content/forms/filter_featured.xml

@@ -94,7 +94,7 @@
 			step="1"
 			languages="*"
 			onchange="this.form.submit();"
- 			>
+			>
 			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
 		</field>
 	</fields>

administrator/components/com_finder/forms/filter.xml

@@ -66,7 +66,7 @@
 			readonly="true"
 			filter="unset"
 			validate="UserId"
-		 />
+		/>
 
 		<field
 			name="checked_out"

administrator/components/com_languages/tmpl/multilangstatus/default.php

@@ -146,6 +146,7 @@
 			<?php endif; ?>
 		<?php endforeach; ?>
 		<table class="table table-sm">
+			<caption class="visually-hidden"><?php echo Text::_('COM_LANGUAGES_MULTILANGSTATUS_TABLE_CAPTION'); ?></caption>
 			<thead>
 				<tr>
 					<th scope="col">
@@ -201,6 +202,7 @@
 			</tbody>
 		</table>
 		<table class="table table-sm">
+			<caption class="visually-hidden"><?php echo Text::_('COM_LANGUAGES_MULTILANGSTATUS_CONTENT_TABLE_CAPTION'); ?></caption>
 			<thead>
 				<tr>
 					<th scope="col">

administrator/components/com_media/config.xml

@@ -142,6 +142,6 @@
 			validate="rules"
 			component="com_media"
 			section="component"
-		 />
+		/>
 	</fieldset>
 </config>

administrator/components/com_media/src/Provider/ProviderManager.php

@@ -11,6 +11,7 @@
 
 \defined('_JEXEC') or die;
 
+use Joomla\CMS\Language\Text;
 use Joomla\Component\Media\Administrator\Adapter\AdapterInterface;
 
 /**
@@ -96,7 +97,7 @@ public function getProvider($id)
 	{
 		if (!isset($this->providers[$id]))
 		{
-			throw new \Exception("Media Provider not found");
+			throw new \Exception(Text::_('COM_MEDIA_ERROR_MEDIA_PROVIDER_NOT_FOUND'));
 		}
 
 		return $this->providers[$id];
@@ -119,14 +120,14 @@ public function getAdapter($name)
 
 		if ($account == null)
 		{
-			throw new \Exception('Account was not set');
+			throw new \Exception(Text::_('COM_MEDIA_ERROR_ACCOUNT_NOT_SET'));
 		}
 
 		$adapters = $this->getProvider($provider)->getAdapters();
 
 		if (!isset($adapters[$account]))
 		{
-			throw new \Exception("The account was not found");
+			throw new \Exception(Text::_('COM_MEDIA_ERROR_ACCOUNT_NOT_FOUND'));
 		}
 
 		return $adapters[$account];

administrator/components/com_media/src/Provider/ProviderManagerHelperTrait.php

@@ -13,6 +13,7 @@
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\Component\Media\Administrator\Adapter\AdapterInterface;
 use Joomla\Component\Media\Administrator\Event\MediaProviderEvent;
@@ -117,7 +118,7 @@ protected function resolveAdapterAndPath(String $path): array
 
 		if (!$this->getDefaultAdapterName())
 		{
-			throw new \InvalidArgumentException('No adapter found');
+			throw new \InvalidArgumentException(Text::_('COM_MEDIA_ERROR_NO_ADAPTER_FOUND'));
 		}
 
 		// If we have less than 2 parts, we return a default adapter name

administrator/components/com_media/src/View/File/HtmlView.php

@@ -49,7 +49,7 @@ public function display($tpl = null)
 		if (empty($this->file->content))
 		{
 			// @todo error handling controller redirect files
-			throw new \Exception('No content available!');
+			throw new \Exception(Text::_('COM_MEDIA_ERROR_NO_CONTENT_AVAILABLE'));
 		}
 
 		$this->addToolbar();

administrator/components/com_menus/forms/item_component.xml

@@ -42,7 +42,8 @@
 				type="radio"
 				label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
 				layout="joomla.form.field.radio.switcher"
-				default="1" filter="integer"
+				default="1"
+				filter="integer"
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>

administrator/components/com_privacy/services/provider.php

@@ -9,10 +9,12 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Component\Router\RouterFactoryInterface;
 use Joomla\CMS\Dispatcher\ComponentDispatcherFactoryInterface;
 use Joomla\CMS\Extension\ComponentInterface;
 use Joomla\CMS\Extension\Service\Provider\ComponentDispatcherFactory;
 use Joomla\CMS\Extension\Service\Provider\MVCFactory;
+use Joomla\CMS\Extension\Service\Provider\RouterFactory;
 use Joomla\CMS\HTML\Registry;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\Component\Privacy\Administrator\Extension\PrivacyComponent;
@@ -39,6 +41,7 @@ public function register(Container $container)
 	{
 		$container->registerServiceProvider(new MVCFactory('\\Joomla\\Component\\Privacy'));
 		$container->registerServiceProvider(new ComponentDispatcherFactory('\\Joomla\\Component\\Privacy'));
+		$container->registerServiceProvider(new RouterFactory('\\Joomla\\Component\\Privacy'));
 
 		$container->set(
 			ComponentInterface::class,
@@ -48,6 +51,7 @@ function (Container $container)
 
 				$component->setMVCFactory($container->get(MVCFactoryInterface::class));
 				$component->setRegistry($container->get(Registry::class));
+				$component->setRouterFactory($container->get(RouterFactoryInterface::class));
 
 				return $component;
 			}

administrator/components/com_privacy/src/Extension/PrivacyComponent.php

@@ -11,6 +11,8 @@
 
 \defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Component\Router\RouterServiceInterface;
+use Joomla\CMS\Component\Router\RouterServiceTrait;
 use Joomla\CMS\Extension\BootableExtensionInterface;
 use Joomla\CMS\Extension\MVCComponent;
 use Joomla\CMS\HTML\HTMLRegistryAwareTrait;
@@ -22,9 +24,10 @@
  *
  * @since  4.0.0
  */
-class PrivacyComponent extends MVCComponent implements BootableExtensionInterface
+class PrivacyComponent extends MVCComponent implements BootableExtensionInterface, RouterServiceInterface
 {
 	use HTMLRegistryAwareTrait;
+	use RouterServiceTrait;
 
 	/**
 	 * Booting the extension. This is the function to set up the environment of the extension like

administrator/components/com_redirect/forms/link.xml

@@ -8,7 +8,7 @@
 			default="0"
 			readonly="true"
 			class="readonly"
-		 />
+		/>
 
 		<field
 			name="old_url"

administrator/components/com_templates/forms/source.xml

@@ -9,7 +9,7 @@
 		<field
 			name="filename"
 			type="hidden"
-		 />
+		/>
 
 		<field
 			name="source"

administrator/components/com_templates/src/Model/TemplateModel.php

@@ -1451,7 +1451,7 @@ public function uploadFile($file, $location)
 		if ($this->getTemplate())
 		{
 			$app      = Factory::getApplication();
-			$path     = $this->getBasePath();;
+			$path     = $this->getBasePath();
 			$fileName = File::makeSafe($file['name']);
 
 			$err = null;

administrator/components/com_users/config.xml

@@ -264,23 +264,23 @@
 
 	</fieldset>
 
- 	<fieldset
+	<fieldset
 		name="massmail"
 		label="COM_USERS_MASS_MAIL"
 		description="COM_USERS_MASS_MAIL_DESC">
 
 		<field
- 			name="mailSubjectPrefix"
- 			type="text"
+			name="mailSubjectPrefix"
+			type="text"
 			label="COM_USERS_CONFIG_FIELD_SUBJECT_PREFIX_LABEL"
 		/>
 
- 		<field
- 			name="mailBodySuffix"
+		<field
+			name="mailBodySuffix"
 			type="textarea"
 			label="COM_USERS_CONFIG_FIELD_MAILBODY_SUFFIX_LABEL"
- 			rows="5"
- 			cols="30"
+			rows="5"
+			cols="30"
 		/>
 
 	</fieldset>

administrator/language/en-GB/com_installer.ini

@@ -112,7 +112,7 @@ COM_INSTALLER_MINIMUM_STABILITY_DEV="Development"
 COM_INSTALLER_MINIMUM_STABILITY_LABEL="Minimum Extension Stability"
 COM_INSTALLER_MINIMUM_STABILITY_RC="Release Candidate"
 COM_INSTALLER_MINIMUM_STABILITY_STABLE="Stable"
-COM_INSTALLER_MSG_DATABASE="This screen allows to you check that your database table structure is up to date with changes from the previous versions."
+COM_INSTALLER_MSG_DATABASE="This screen allows you to check that your database table structure is up to date with changes from previous versions."
 COM_INSTALLER_MSG_DATABASE_ADD_COLUMN="Table %2$s does not have column %3$s. (From file %1$s.)"
 COM_INSTALLER_MSG_DATABASE_ADD_INDEX="Table %2$s does not have index %3$s. (From file %1$s.)"
 COM_INSTALLER_MSG_DATABASE_CHANGE_COLUMN_TYPE="Table %2$s has the wrong type or attributes for column %3$s with type %4$s. (From file %1$s.)"
@@ -156,7 +156,7 @@ COM_INSTALLER_MSG_INSTALL_WARNINSTALLZLIB="The installer can't continue until Zl
 COM_INSTALLER_MSG_LANGUAGES_CANT_FIND_REMOTE_MANIFEST="The installer can't get the URL to the XML manifest file of the %s language."
 COM_INSTALLER_MSG_LANGUAGES_CANT_FIND_REMOTE_PACKAGE="The installer can't get the URL to the remote %s language."
 COM_INSTALLER_MSG_LANGUAGES_NOLANGUAGES="There are no available languages to install at the moment. Please select the "Find languages" button to check for updates on the Joomla! Languages server. You will need an internet connection for this to work."
-COM_INSTALLER_MSG_LANGUAGES_TRY_LATER="Try again later or <a href=\"https://downloads.joomla.org/language-packs\">contact the language team coordinator</a>."
+COM_INSTALLER_MSG_LANGUAGES_TRY_LATER="Try again later or <a href=\"https://downloads.joomla.org/language-packs\" target=\"_blank\" rel=\"noopener noreferrer\">contact the language team coordinator</a>."
 COM_INSTALLER_MSG_N_DATABASE_ERROR_PANEL="%d Database Problems Found."
 COM_INSTALLER_MSG_N_DATABASE_ERROR_PANEL_1="One Database Problem Found."
 COM_INSTALLER_MSG_UPDATE_ERROR="Error updating %s."
@@ -176,7 +176,7 @@ COM_INSTALLER_MSG_UPDATESITES_REBUILD_SUCCESS="Update sites have been rebuilt fr
 COM_INSTALLER_MSG_UPDATESITES_REBUILD_WARNING="Update sites have been rebuilt. No extension with updates sites discovered."
 COM_INSTALLER_MSG_WARNING_NO_LANGUAGES_UPDATESERVER="The update table is not up to date. Please <a href=\"index.php?option=com_installer&view=updatesites\">rebuild your update server table</a>"
 COM_INSTALLER_MSG_WARNINGFURTHERINFO="Further information on warnings"
-COM_INSTALLER_MSG_WARNINGFURTHERINFODESC="For more information see the <a href=\"https://docs.joomla.org/Special:MyLanguage/Help4.x:Information:_Warnings\" target=\"_blank\" class=\"alert-link\">Joomla! Documentation Site</a>."
+COM_INSTALLER_MSG_WARNINGFURTHERINFODESC="For more information see the <a href=\"https://docs.joomla.org/Special:MyLanguage/Help4.x:Information:_Warnings\" class=\"alert-link\" target=\"_blank\" rel=\"noopener noreferrer\">Joomla! Documentation Site</a>."
 COM_INSTALLER_MSG_WARNINGS_FILEUPLOADISDISABLEDDESC="File uploads are required to upload extensions with the installer."
 COM_INSTALLER_MSG_WARNINGS_FILEUPLOADSDISABLED="File uploads disabled."
 COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTSET="The Joomla temporary folder is not set."

administrator/language/en-GB/com_languages.ini

@@ -69,20 +69,22 @@ COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_MISSING="The <strong>%s</strong>
 COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_PUBLISHED="Published Content Languages"
 COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_SEF_MISSING="The \"URL Language Code\" is missing for the <strong>%s</strong> Content Language. <strong>The multilingual feature may not function properly or the site may not be reachable!</strong>"
 COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_TRASHED="The <strong>%s</strong> Content Language is trashed. <strong>The language will not display on the site.</strong>"
+COM_LANGUAGES_MULTILANGSTATUS_CONTENT_TABLE_CAPTION="Table of the status for each content language."
 COM_LANGUAGES_MULTILANGSTATUS_DEFAULT_HOME_MODULE_PUBLISHED="The menu module displaying the Home menu item set to language &quot;All&quot; should not be published."
 COM_LANGUAGES_MULTILANGSTATUS_ERROR_CONTENT_LANGUAGE="A Default Home page is assigned to the <strong>%s</strong> Content Language although a Site Language for this Content Language is not installed or enabled AND/OR the Content Language is not published. <strong>The language will not display on the site.</strong>"
 COM_LANGUAGES_MULTILANGSTATUS_ERROR_DEFAULT_CONTENT_LANGUAGE="The Content Language for the <strong>%s</strong> default Site Language is unpublished or does not exist. <strong>The multilingual feature may not function properly or the site may not be reachable!</strong>"
 COM_LANGUAGES_MULTILANGSTATUS_ERROR_LANGUAGE_TAG="The Content Language tag <strong>%s</strong> does not have a matching Site Language tag. Check that the Site Language is installed and enabled AND the correct language tag is used for the Content Language. Example: for English (en-GB) both tags should be 'en-GB'. <strong>The language will not display on the site.</strong>"
-COM_LANGUAGES_MULTILANGSTATUS_HOME_UNPUBLISHED="The Default Home page assigned to the <strong>%s</strong> Content Language is unpublished. <strong>The language will not display on the site.</strong>"
 COM_LANGUAGES_MULTILANGSTATUS_HOMES_PUBLISHED="Published Default Home pages"
 COM_LANGUAGES_MULTILANGSTATUS_HOMES_PUBLISHED_ALL="1 assigned to language 'All'."
 COM_LANGUAGES_MULTILANGSTATUS_HOMES_PUBLISHED_INCLUDING_ALL="Published Default Home pages (including 1 assigned to language &quot;All&quot;)."
+COM_LANGUAGES_MULTILANGSTATUS_HOME_UNPUBLISHED="The Default Home page assigned to the <strong>%s</strong> Content Language is unpublished. <strong>The language will not display on the site.</strong>"
 COM_LANGUAGES_MULTILANGSTATUS_LANGSWITCHER_PUBLISHED="Published Language Switcher Modules."
 COM_LANGUAGES_MULTILANGSTATUS_LANGSWITCHER_UNPUBLISHED="At least one Language Switcher module set to language &quot;All&quot; has to be published. Otherwise, it will be impossible to switch languages on the site. Disregard this message if you do not use a language switcher module but direct links."
 COM_LANGUAGES_MULTILANGSTATUS_LANGUAGEFILTER="Language Filter Plugin"
 COM_LANGUAGES_MULTILANGSTATUS_LANGUAGEFILTER_DISABLED="The Language Filter plugin is not enabled although one or more Language Switcher modules AND/OR one or more specific Content language Default Home pages are published."
 COM_LANGUAGES_MULTILANGSTATUS_NONE="This site is not set as a multilingual site."
 COM_LANGUAGES_MULTILANGSTATUS_SITE_LANG_PUBLISHED="Enabled Site Languages"
+COM_LANGUAGES_MULTILANGSTATUS_TABLE_CAPTION="Table of the multilingual status."
 COM_LANGUAGES_MULTILANGSTATUS_USELESS_HOMES="This site is not set as a multilingual site.<br><strong>Note</strong>: at least one Default Home page is assigned to a Content Language. This will not break a monolingual site but is useless."
 COM_LANGUAGES_N_ITEMS_DELETED="%d Content Languages deleted."
 COM_LANGUAGES_N_ITEMS_DELETED_1="Content Language deleted."

administrator/language/en-GB/com_media.ini

@@ -24,6 +24,11 @@ COM_MEDIA_DELETE_SUCCESS="Item deleted."
 COM_MEDIA_DROP_FILE="Drop file(s) to Upload"
 COM_MEDIA_EDIT="Media Edit"
 COM_MEDIA_ERROR="An error occurred."
+COM_MEDIA_ERROR_ACCOUNT_NOT_FOUND="The account was not found"
+COM_MEDIA_ERROR_ACCOUNT_NOT_SET="Account was not set."
+COM_MEDIA_ERROR_MEDIA_PROVIDER_NOT_FOUND="Media Provider not found."
+COM_MEDIA_ERROR_NO_ADAPTER_FOUND="No adapter found."
+COM_MEDIA_ERROR_NO_CONTENT_AVAILABLE="No content available!"
 COM_MEDIA_ERROR_NO_PROVIDERS="No filesystem providers have been found. Please enable at least one <a href=\"%s\">filesystem plugin</a>."
 COM_MEDIA_ERROR_NOT_AUTHENTICATED="You are not authenticated. Please login."
 COM_MEDIA_ERROR_NOT_AUTHORIZED="You are not authorised"

administrator/language/en-GB/joomla.ini

@@ -202,6 +202,7 @@ JFIELD_ALIAS_LABEL="Alias"
 JFIELD_ALIAS_PLACEHOLDER="Auto-generate from title"
 JFIELD_ALT_COMPONENT_LAYOUT_DESC="Use a layout from the supplied component view or overrides in the templates."
 JFIELD_ALT_LAYOUT_LABEL="Layout"
+; Deprecated, will be removed with 5.0
 JFIELD_ALT_MODULE_LAYOUT_DESC="Use a layout from the supplied module or overrides in the templates."
 JFIELD_ALT_PAGE_TITLE_DESC="An optional alternative page title to set that will change the TITLE tag in the HTML output."
 JFIELD_ALT_PAGE_TITLE_LABEL="Alternative Page Title"
@@ -644,7 +645,7 @@ JGLOBAL_SHOW_READMORE_LABEL=""Read More" Link"
 JGLOBAL_SHOW_READMORE_LIMIT_DESC="Set a limit of number of characters in Article Title to show in Read More button."
 JGLOBAL_SHOW_READMORE_LIMIT_LABEL="Read More Limit (characters)"
 JGLOBAL_SHOW_READMORE_TITLE_DESC="If set to show the title of the Article will be shown on the Read More button."
-JGLOBAL_SHOW_READMORE_TITLE_LABEL="Title with Read More"
+JGLOBAL_SHOW_READMORE_TITLE_LABEL="Read More with Title"
 JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC="Show or hide the subcategories descriptions."
 JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL="Subcategories Descriptions"
 JGLOBAL_SHOW_SUBCATEGORY_CONTENT_DESC="If None, only articles from this category will show. If a number, all articles from the category and the subcategories up to and including that level will show in the blog."