Merge branch '4.2-dev' into confirm_update

joomla · Jun 16, 2022 · 37077a2 · 37077a2
2 parents 638f37a + 5489fff
commit 37077a2
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 102 deletions.
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php
@@ -342,7 +342,7 @@ class="extension-check upcomp hidden"
 		<?php if (!$this->noVersionCheck): ?>
 		<div id="preupdatecheckbox">
 			<div class="form-check d-flex justify-content-center mb-3">
-				<input type="checkbox" class="me-3" id="noncoreplugins" name="noncoreplugins" value="1" required />
+				<input type="checkbox" class="form-check-input me-3" id="noncoreplugins" name="noncoreplugins" value="1" required />
 				<label class="form-check-label" for="noncoreplugins">
 					<?php echo Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_NON_CORE_PLUGIN_CONFIRMATION'); ?>
 				</label>

diff --git a/administrator/language/en-GB/com_joomlaupdate.ini b/administrator/language/en-GB/com_joomlaupdate.ini
@@ -141,7 +141,7 @@ COM_JOOMLAUPDATE_VIEW_DEFAULT_PACKAGE_REINSTALL="Reinstall package URL"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_PHP_VERSION_NOT_SUPPORTED="Your PHP version is not supported"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_PHP_VERSION_NOT_SUPPORTED_DESC="An update to Joomla %1$s was found, but your currently installed PHP version does not match <a href=\"https://downloads.joomla.org/technical-requirements\">the minimum requirements for Joomla %1$s</a>."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN="Potential Upgrade Issue."
-COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_CONFIRM_MESSAGE="Are you sure you want to ignore the warnings about potentially incompatible extensions and proceed with the update?"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_CONFIRM_MESSAGE="Are you sure you want to acknowledge the warnings about potentially incompatible extensions and proceed with the update?"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_DESC="This extension includes a plugin that could cause the update to fail.<br><br>To perform the Joomla update safely you should either update this extension to a version compatible with your target version of Joomla or disable the relevant plugin(s) and check again.<br><br>For more information about the relevant plugins please check the 'Live Update' tab."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_POTENTIALLY_DANGEROUS_PLUGIN_LIST="The following plugins could cause problems during the update"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_PREUPDATE_CHECK="Pre-Update Check for Joomla %s"

diff --git a/administrator/language/en-GB/plg_user_profile.ini b/administrator/language/en-GB/plg_user_profile.ini
@@ -12,6 +12,8 @@ PLG_USER_PROFILE_FIELD_ADDRESS1_LABEL="Address 1"
 PLG_USER_PROFILE_FIELD_ADDRESS2_LABEL="Address 2"
 PLG_USER_PROFILE_FIELD_CITY_LABEL="City"
 PLG_USER_PROFILE_FIELD_COUNTRY_LABEL="Country"
+PLG_USER_PROFILE_FIELD_DOB_DESCRIPTION="Year-Month-Day, eg 2019-01-27." ; Adapt to the format you entered in the 'DATE_FORMAT_CALENDAR_DATE'
+PLG_USER_PROFILE_FIELD_DOB_HINT="YYYY-MM-DD" ; Adapt to the format you entered in the 'DATE_FORMAT_CALENDAR_DATE'
 PLG_USER_PROFILE_FIELD_DOB_LABEL="Date of Birth"
 PLG_USER_PROFILE_FIELD_FAVORITE_BOOK_LABEL="Favourite Book"
 PLG_USER_PROFILE_FIELD_NAME_PROFILE_REQUIRE_USER="User profile fields for profile edit form"
@@ -27,5 +29,4 @@ PLG_USER_PROFILE_FILL_FIELD_DESC_SITE="If required, please fill this field."
 PLG_USER_PROFILE_OPTION_AGREE="Agree"
 PLG_USER_PROFILE_OPTION_DO_NOT_AGREE="I do not agree"
 PLG_USER_PROFILE_SLIDER_LABEL="User Profile"
-PLG_USER_PROFILE_SPACER_DOB="The date of birth entered should use the format Year-Month-Day, eg 2019-01-27." ; Adapt to the format you entered in the 'DATE_FORMAT_CALENDAR_DATE'
 PLG_USER_PROFILE_XML_DESCRIPTION="User Profile Plugin"
diff --git a/layouts/plugins/user/profile/fields/dob.php b/layouts/plugins/user/profile/fields/dob.php
diff --git a/plugins/user/profile/forms/profile.xml b/plugins/user/profile/forms/profile.xml
@@ -89,9 +89,10 @@
 
 			<field
 				name="dob"
-				type="dob"
+				type="calendar"
 				label="PLG_USER_PROFILE_FIELD_DOB_LABEL"
-				info="PLG_USER_PROFILE_SPACER_DOB"
+				description="PLG_USER_PROFILE_FIELD_DOB_DESCRIPTION"
+				hint="PLG_USER_PROFILE_FIELD_DOB_HINT"
 				translateformat="true"
 				showtime="false"
 				filter="server_utc"

diff --git a/plugins/user/profile/src/Field/DobField.php b/plugins/user/profile/src/Field/DobField.php
diff --git a/tests/Unit/Libraries/Cms/Cache/CacheControllerFactoryAwareTraitTest.php b/tests/Unit/Libraries/Cms/Cache/CacheControllerFactoryAwareTraitTest.php
@@ -7,21 +7,19 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace Joomla\Tests\Unit\Libraries\Cms\User;
+namespace Joomla\Tests\Unit\Libraries\Cms\Cache;
 
 use Joomla\CMS\Cache\CacheControllerFactory;
 use Joomla\CMS\Cache\CacheControllerFactoryAwareTrait;
-use Joomla\CMS\User\CurrentUserTrait;
-use Joomla\CMS\User\User;
 use Joomla\Tests\Unit\UnitTestCase;
 
 /**
- * Test class for \Joomla\CMS\MVC\Model\BaseDatabaseModel
+ * Test class for \Joomla\CMS\Cache\CacheControllerFactoryAwareTrait
  *
  * @package     Joomla.UnitTest
- * @subpackage  MVC
+ * @subpackage  Cache
  *
- * @testdoc    The CacheControllerFactoryAwareTrait
+ * @testdoc     The CacheControllerFactoryAwareTrait
  *
  * @since       __DEPLOY_VERSION__
  */