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

joomla · Feb 21, 2022 · bba7d9b · bba7d9b
2 parents 606dccc + 6e71102
commit bba7d9b
Show file tree

Hide file tree

Showing 26 changed files with 90 additions and 137 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -20,5 +20,5 @@ There are other branches available which serve specific purposes.
 | Branch | Purpose |
 | ------ | ------- |
 | 3.10-dev | Branch for the Joomla 3.x series. The 3.10 series release will only include compatibility features for 4.x as well as bugfixes and security patches. |
-| 4.0-dev | Branch for the Joomla 4.0 series. Commits to 3.10-dev will be applied to this branch as well. |
-| 4.1-dev | Branch for the next minor Joomla version. New features go into this branch. Commits to 4.0-dev will be applied to this branch as well. |
+| 4.1-dev | Branch for the current minor Joomla version. Commits to 3.10-dev will be applied to this branch as well. |
+| 4.2-dev | Branch for the next minor Joomla version. New features go into this branch. Commits to 4.1-dev will be applied to this branch as well. |
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.1.1-2022-02-20.sql b/administrator/components/com_admin/sql/updates/mysql/4.1.1-2022-02-20.sql
@@ -0,0 +1 @@
+DELETE FROM `#__postinstall_messages` WHERE `title_key` = 'COM_ADMIN_POSTINSTALL_MSG_FLOC_BLOCKER_TITLE';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.1.1-2022-02-20.sql b/administrator/components/com_admin/sql/updates/postgresql/4.1.1-2022-02-20.sql
@@ -0,0 +1 @@
+DELETE FROM "#__postinstall_messages" WHERE "title_key" = 'COM_ADMIN_POSTINSTALL_MSG_FLOC_BLOCKER_TITLE';
diff --git a/administrator/components/com_config/forms/application.xml b/administrator/components/com_config/forms/application.xml
@@ -1107,19 +1107,6 @@
 
 		</field>
 
-		<field
-			name="block_floc"
-			type="radio"
-			label="COM_CONFIG_FIELD_FLOC_BLOCKER_LABEL"
-			description="COM_CONFIG_FIELD_FLOC_BLOCKER_DESC"
-			layout="joomla.form.field.radio.switcher"
-			default="1"
-			filter="integer"
-			>
-			<option value="0">JNO</option>
-			<option value="1">JYES</option>
-		</field>
-
 	</fieldset>
 
 	<fieldset

diff --git a/administrator/language/en-GB/com_admin.ini b/administrator/language/en-GB/com_admin.ini
@@ -137,8 +137,6 @@ COM_ADMIN_POST_MAX_SIZE="Post Max Size"
 COM_ADMIN_POSTINSTALL_MSG_BEHIND_LOAD_BALANCER_ACTION="Enable Behind Load Balancer Setting"
 COM_ADMIN_POSTINSTALL_MSG_BEHIND_LOAD_BALANCER_DESCRIPTION="<p>For Joomla sites hosted behind Load Balancers and Reverse Proxies a new Global Configuration setting has been introduced with Joomla 3.9.26</p><p>This setting, when enabled, will allow your Load Balancer/Reverse Proxy to provide the real IP address of your visitors. This IP will then be used in your Action Logs and used for tracking voting on articles (if these features are enabled).</p><p><strong>Only sites behind a Load Balancer/Reverse Proxy will wish to enable this feature.</strong></p>"
 COM_ADMIN_POSTINSTALL_MSG_BEHIND_LOAD_BALANCER_TITLE="New Server Setting \"Behind Load Balancer\""
-COM_ADMIN_POSTINSTALL_MSG_FLOC_BLOCKER_DESCRIPTION="<p>A new technology is currently being rolled out to browsers to replace third party tracking cookies. This technology is named Federated Learning of Cohorts (FLoC) and you can read more about it at the <a href=\"https://wicg.github.io/floc/\" target=\"_blank\" rel=\"noopener noreferrer\">Web Platform Incubator Community Group</a> and at the <a href=\"https://www.eff.org/deeplinks/2021/03/googles-floc-terrible-idea\" target=\"_blank\" rel=\"noopener noreferrer\">Electronic Frontier Foundation</a>. Starting with Joomla! 3.9.27 your website blocks this technology, you can re-allow it from the Global Configuration. Additionally to disable this technology for all requests to your server, you have to update your .htaccess.</p>"
-COM_ADMIN_POSTINSTALL_MSG_FLOC_BLOCKER_TITLE="Block Federated Learning of Cohorts (FLoC)"
 COM_ADMIN_POSTINSTALL_MSG_HTACCESS_AUTOINDEX_DESCRIPTION="<p>Before 3.9.22 the default htaccess.txt file contained erroneous code meant for disabling directory listings. The security team recommends to manually apply the necessary changes to any existing .htaccess file, as this file can not be updated automatically.</p><p>The old code:</p><pre>&lt;IfModule autoindex&gt;\n  IndexIgnore *\n&lt;/IfModule&gt;</pre><p>The new code:</p><pre>&lt;IfModule mod_autoindex.c&gt;\n  IndexIgnore *\n&lt;/IfModule&gt;</pre>"
 COM_ADMIN_POSTINSTALL_MSG_HTACCESS_AUTOINDEX_TITLE=".htaccess Update Concerning Directory Listings"
 COM_ADMIN_SAVE_SUCCESS="Profile saved."

diff --git a/administrator/language/en-GB/com_config.ini b/administrator/language/en-GB/com_config.ini
@@ -89,8 +89,6 @@ COM_CONFIG_FIELD_FILTERS_DEFAULT_FORBIDDEN_LIST="Default Forbidden List"
 COM_CONFIG_FIELD_FILTERS_NO_FILTER="No Filtering"
 COM_CONFIG_FIELD_FILTERS_NO_HTML="No HTML"
 COM_CONFIG_FIELD_FILTERS_ALLOWED_LIST="Allowed List"
-COM_CONFIG_FIELD_FLOC_BLOCKER_DESC="Send a header to not support the tracking through the FLoC method."
-COM_CONFIG_FIELD_FLOC_BLOCKER_LABEL="Block FLoC"
 COM_CONFIG_FIELD_FORCE_SSL_DESC="HTTPS must be enabled on your server or load balancer to utilise this option. Enable 'Behind Load Balancer' if your SSL terminates on your load balancer but your site is served on http on its webserver."
 COM_CONFIG_FIELD_FORCE_SSL_LABEL="Force HTTPS"
 COM_CONFIG_FIELD_GZIP_COMPRESSION_DESC="Joomla can automatically compress the generated HTML pages with GZip, making them smaller and increasing your site's speed score. Disable it if your server is already doing that for you or if it conflicts with third party extensions."

diff --git a/administrator/language/en-GB/com_messages.ini b/administrator/language/en-GB/com_messages.ini
@@ -59,7 +59,7 @@ COM_MESSAGES_N_ITEMS_TRASHED_1="Message trashed."
 COM_MESSAGES_N_ITEMS_UNPUBLISHED="%d messages marked as unread."
 COM_MESSAGES_N_ITEMS_UNPUBLISHED_1="Message marked as unread."
 COM_MESSAGES_NEW_MESSAGE="New Message from {FROMNAME} at {SITENAME}"
-COM_MESSAGES_NEW_MESSAGE_BODY="{SUBJECT} \n\n{MESSAGE} \n\nPlease log in to {SITEURL} to read your message."
+COM_MESSAGES_NEW_MESSAGE_BODY="{SUBJECT} \n\n{MESSAGE}"
 COM_MESSAGES_NO_ITEM_SELECTED="No messages selected."
 COM_MESSAGES_OPTION_READ="Read"
 COM_MESSAGES_OPTION_UNREAD="Unread"

diff --git a/administrator/language/en-GB/lib_joomla.ini b/administrator/language/en-GB/lib_joomla.ini
@@ -611,7 +611,7 @@ JLIB_INSTALLER_ERROR_PACK_UNINSTALL_INVALID_NOTFOUND_MANIFEST="Package Uninstall
 JLIB_INSTALLER_ERROR_PACK_UNINSTALL_LOAD_MANIFEST="Package Uninstall: Could not load manifest file."
 JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MANIFEST_NOT_REMOVED="Package Uninstall: Errors were detected, manifest file not removed!"
 JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MISSINGMANIFEST="Package Uninstall: Missing manifest file."
-JLIB_INSTALLER_ERROR_PACK_UNINSTALL_NOT_PROPER="Package Uninstall: This extension may have already been uninstalled or might not have been uninstall properly: %s"
+JLIB_INSTALLER_ERROR_PACK_UNINSTALL_NOT_PROPER="Package Uninstall: This extension may have already been uninstalled or might not have been uninstalled properly: %s"
 JLIB_INSTALLER_ERROR_PACK_UNINSTALL_UNKNOWN_EXTENSION="Trying to uninstall unknown extension from package. This extension may have already been removed earlier."
 JLIB_INSTALLER_ERROR_PACK_UNINSTALL_WARNCOREPACK="Package Uninstall: Trying to uninstall core package."
 JLIB_INSTALLER_ERROR_PLG_DISCOVER_STORE_DETAILS="Plugin Discover install: Failed to store plugin details."