joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-25 23:02:55 +00:00
Code Packages Releases Activity

Merge remote-tracking branch 'upstream/4.1-dev' into translation

Browse Source
This commit is contained in:
Translation 2022-02-06 07:30:43 +00:00
commit 5f790df157
13 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
administrator/components/com_admin/script.php
View File

@ -8547,7 +8547,7 @@ class JoomlaInstallerScript
*
* @return void
*
* @since __DEPLOY_VERSION__
* @since 4.1.0
*/
protected function fixTemplateMode(): void
{

2
administrator/language/en-GB/install.xml
View File

@ -3,7 +3,7 @@
<name>English (en-GB)</name>
<tag>en-GB</tag>
<version>4.1.0</version>
<creationDate>January 2022</creationDate>
<creationDate>February 2022</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>

2
administrator/language/en-GB/langmetadata.xml
View File

@ -2,7 +2,7 @@
<metafile client="administrator">
<name>English (en-GB)</name>
<version>4.1.0</version>
<creationDate>January 2022</creationDate>
<creationDate>February 2022</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>

4
administrator/manifests/files/joomla.xml
View File

@ -6,8 +6,8 @@
<authorUrl>www.joomla.org</authorUrl>
<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<version>4.1.0-dev</version>
<creationDate>January 2022</creationDate>
<version>4.1.0-rc3-dev</version>
<creationDate>February 2022</creationDate>
<description>FILES_JOOMLA_XML_DESCRIPTION</description>
<scriptfile>administrator/components/com_admin/script.php</scriptfile>

2
administrator/manifests/packages/pkg_en-GB.xml
View File

@ -3,7 +3,7 @@
<name>English (en-GB) Language Pack</name>
<packagename>en-GB</packagename>
<version>4.1.0.1</version>
<creationDate>January 2022</creationDate>
<creationDate>February 2022</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>

2
api/language/en-GB/install.xml
View File

@ -3,7 +3,7 @@
<name>English (en-GB)</name>
<tag>en-GB</tag>
<version>4.1.0</version>
<creationDate>January 2022</creationDate>
<creationDate>February 2022</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>

2
api/language/en-GB/langmetadata.xml
View File

@ -2,7 +2,7 @@
<metafile client="api">
<name>English (en-GB)</name>
<version>4.1.0</version>
<creationDate>January 2022</creationDate>
<creationDate>February 2022</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>

2
installation/language/en-GB/langmetadata.xml
View File

@ -2,7 +2,7 @@
<metafile client="installation">
<name>English (United Kingdom)</name>
<version>4.1.0</version>
<creationDate>January 2022</creationDate>
<creationDate>February 2022</creationDate>
<author>Joomla! Project</author>
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

2
language/en-GB/install.xml
View File

@ -3,7 +3,7 @@
<name>English (en-GB)</name>
<tag>en-GB</tag>
<version>4.1.0</version>
<creationDate>January 2022</creationDate>
<creationDate>February 2022</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>

2
language/en-GB/langmetadata.xml
View File

@ -2,7 +2,7 @@
<metafile client="site">
<name>English (en-GB)</name>
<version>4.1.0</version>
<creationDate>January 2022</creationDate>
<creationDate>February 2022</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>

4
libraries/src/Mail/MailHelper.php
View File

@ -202,7 +202,7 @@ abstract class MailHelper
*
* @return string The converted content which the relative urls are converted to absolute urls
*
* @since __DEPLOY_VERSION__
* @since 4.1.0
*/
public static function convertRelativeToAbsoluteUrls($content)
{
@ -252,7 +252,7 @@ abstract class MailHelper
* @return void
*
* @throws \RuntimeException If there is an error in previous regular expression function call.
* @since __DEPLOY_VERSION__
* @since 4.1.0
*/
private static function checkContent($content)
{

4
libraries/src/Version.php
View File

@ -61,7 +61,7 @@ final class Version
* @var string
* @since 3.8.0
*/
const EXTRA_VERSION = 'dev';
const EXTRA_VERSION = 'rc3-dev';
/**
* Development status.
@ -85,7 +85,7 @@ final class Version
* @var string
* @since 3.5
*/
const RELDATE = '18-January-2022';
const RELDATE = '1-February-2022';
/**
* Release time.

2
plugins/system/debug/debug.php
View File

@ -672,7 +672,7 @@ class PlgSystemDebug extends CMSPlugin
*
* @return void
*
* @since __DEPLOY_VERSION__
* @since 4.1.0
*/
public function onBeforeRespond(): void
{