diff --git a/administrator/components/com_associations/src/Helper/AssociationsHelper.php b/administrator/components/com_associations/src/Helper/AssociationsHelper.php index bdc6199a01f04..b185c9907e73f 100644 --- a/administrator/components/com_associations/src/Helper/AssociationsHelper.php +++ b/administrator/components/com_associations/src/Helper/AssociationsHelper.php @@ -72,7 +72,7 @@ public static function getAssociationList($extensionName, $typeName, $itemId) } /** - * Get the the instance of the extension helper class + * Get the instance of the extension helper class * * @param string $extensionName The extension name with com_ * diff --git a/administrator/components/com_installer/src/Model/DatabaseModel.php b/administrator/components/com_installer/src/Model/DatabaseModel.php index ff8168472b4e7..0923a7cc5a4b2 100644 --- a/administrator/components/com_installer/src/Model/DatabaseModel.php +++ b/administrator/components/com_installer/src/Model/DatabaseModel.php @@ -527,7 +527,7 @@ public function compareUpdateVersion($extension) /** * Get a message of the tables skipped and checked * - * @param array $status status of of the update files + * @param array $status status of the update files * * @return array Messages with the errors with the update version * diff --git a/administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue b/administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue index 70f938292f55c..99269aa27d795 100644 --- a/administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue +++ b/administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue @@ -80,7 +80,7 @@ export default { }, }, methods: { - /* Check if the the form is valid */ + /* Check if the form is valid */ isValid() { return (this.folder); }, diff --git a/administrator/components/com_messages/src/Field/UserMessagesField.php b/administrator/components/com_messages/src/Field/UserMessagesField.php index 3deea01fc6ee6..939460035fdcb 100644 --- a/administrator/components/com_messages/src/Field/UserMessagesField.php +++ b/administrator/components/com_messages/src/Field/UserMessagesField.php @@ -78,7 +78,7 @@ protected function getGroups() /** * Method to get the users to exclude from the list of users * - * @return array|null array of users to exclude or null to to not exclude them + * @return array|null array of users to exclude or null to not exclude them * * @since 1.6 */ diff --git a/administrator/language/en-GB/plg_content_pagenavigation.ini b/administrator/language/en-GB/plg_content_pagenavigation.ini index ae698f5398d5b..5b7f4f6ff3f2a 100644 --- a/administrator/language/en-GB/plg_content_pagenavigation.ini +++ b/administrator/language/en-GB/plg_content_pagenavigation.ini @@ -4,6 +4,7 @@ ; Note : All ini files need to be saved as UTF-8 PLG_CONTENT_PAGENAVIGATION="Content - Page Navigation" +PLG_PAGENAVIGATION_ARIA_LABEL="Page Navigation" PLG_PAGENAVIGATION_FIELD_DISPLAY_LABEL="Link Text" PLG_PAGENAVIGATION_FIELD_POSITION_LABEL="Position" PLG_PAGENAVIGATION_FIELD_RELATIVE_LABEL="Relative To" diff --git a/installation/sql/mysql/base.sql b/installation/sql/mysql/base.sql index 871ae9ecf8e17..6a36467043e5d 100644 --- a/installation/sql/mysql/base.sql +++ b/installation/sql/mysql/base.sql @@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `#__assets` ( `lft` int NOT NULL DEFAULT 0 COMMENT 'Nested set lft.', `rgt` int NOT NULL DEFAULT 0 COMMENT 'Nested set rgt.', `level` int unsigned NOT NULL COMMENT 'The cached level in the nested tree.', - `name` varchar(50) NOT NULL COMMENT 'The unique name for the asset.\n', + `name` varchar(50) NOT NULL COMMENT 'The unique name for the asset.', `title` varchar(100) NOT NULL COMMENT 'The descriptive title for the asset.', `rules` varchar(5120) NOT NULL COMMENT 'JSON encoded access control.', PRIMARY KEY (`id`), diff --git a/libraries/src/Form/Field/UserField.php b/libraries/src/Form/Field/UserField.php index e5d5ef6127f8a..65c1edc7e20cf 100644 --- a/libraries/src/Form/Field/UserField.php +++ b/libraries/src/Form/Field/UserField.php @@ -163,7 +163,7 @@ protected function getGroups() /** * Method to get the users to exclude from the list of users * - * @return string[] Array of users to exclude or null to to not exclude them + * @return string[] Array of users to exclude or null to not exclude them * * @since 1.6 */ diff --git a/libraries/src/HTML/Helpers/Select.php b/libraries/src/HTML/Helpers/Select.php index e0499e43b72b5..7a1b20abc293a 100644 --- a/libraries/src/HTML/Helpers/Select.php +++ b/libraries/src/HTML/Helpers/Select.php @@ -350,10 +350,10 @@ public static function integerlist($start, $end, $inc, $name, $attribs = null, $ * option.label: The property in each option array to use as the * selection label attribute. If a "label" option is provided, defaults to * "label", if no label is given, defaults to null (none). - * option.text: The property that will hold the the displayed text. + * option.text: The property that will hold the displayed text. * Defaults to "text". If set to null, the option array is assumed to be a * list of displayable scalars. - * @param string $optText The property that will hold the the displayed text. This + * @param string $optText The property that will hold the displayed text. This * parameter is ignored if an options array is passed. * @param boolean $disable Not used. * @@ -445,7 +445,7 @@ public static function option($value, $text = '', $optKey = 'value', $optText = * Defaults to "disable". * -option.key: The property that will hold the selection value. * Defaults to "value". - * -option.text: The property that will hold the the displayed text. + * -option.text: The property that will hold the displayed text. * Defaults to "text". If set to null, the option array is assumed to be a * list of displayable scalars. * @param string $optText The name of the object variable for the option text. diff --git a/libraries/src/Helper/TagsHelper.php b/libraries/src/Helper/TagsHelper.php index 92a22aa7fabaf..cf0cf7ad77f2a 100644 --- a/libraries/src/Helper/TagsHelper.php +++ b/libraries/src/Helper/TagsHelper.php @@ -297,7 +297,7 @@ public function createTagsFromField($tags) } /** - * Method to delete the tag mappings and #__ucm_content record for for an item + * Method to delete the tag mappings and #__ucm_content record for an item * * @param TableInterface $table Table object of content table where delete occurred * @param integer|array $contentItemId ID of the content item. Or an array of key/value pairs with array key @@ -338,7 +338,7 @@ public function deleteTagData(TableInterface $table, $contentItemId) * @param integer $id Id of the item to retrieve tags for. * @param boolean $getTagData If true, data from the tags table will be included, defaults to true. * - * @return array Array of of tag objects + * @return array Array of tag objects * * @since 3.1 */ @@ -397,7 +397,7 @@ public function getItemTags($contentType, $id, $getTagData = true) * @param array $ids Id of the item to retrieve tags for. * @param boolean $getTagData If true, data from the tags table will be included, defaults to true. * - * @return array Array of of tag objects grouped by Id. + * @return array Array of tag objects grouped by Id. * * @since 4.2.0 */ @@ -766,7 +766,7 @@ public function getTagTreeArray($id, &$tagTreeArray = []) * @param array $selectTypes Optional array of type ids or aliases to limit the results to. Often from a request. * @param boolean $useAlias If true, the alias is used to match, if false the type_id is used. * - * @return array Array of of types + * @return array Array of types * * @since 3.1 */ diff --git a/libraries/src/Layout/BaseLayout.php b/libraries/src/Layout/BaseLayout.php index 9aedf61199518..07ddaa21d2eb8 100644 --- a/libraries/src/Layout/BaseLayout.php +++ b/libraries/src/Layout/BaseLayout.php @@ -266,7 +266,7 @@ public function set($key, $value) } /** - * Set the the data passed the layout + * Set the data passed the layout * * @param array $data Array with the data for the layout * diff --git a/libraries/src/MVC/View/HtmlView.php b/libraries/src/MVC/View/HtmlView.php index 0c229daab0096..7ef977e76f7bc 100644 --- a/libraries/src/MVC/View/HtmlView.php +++ b/libraries/src/MVC/View/HtmlView.php @@ -348,7 +348,7 @@ public function addHelperPath($path) * * @param string $tpl The name of the template source file; automatically searches the template paths and compiles as needed. * - * @return string The output of the the template script. + * @return string The output of the template script. * * @since 3.0 * @throws \Exception diff --git a/libraries/src/Version.php b/libraries/src/Version.php index 7283a2577ec0e..b42e797c3e02d 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -90,7 +90,7 @@ final class Version * @var string * @since 3.5 */ - public const RELDATE = '13-June-2024'; + public const RELDATE = '25-June-2024'; /** * Release time. @@ -98,7 +98,7 @@ final class Version * @var string * @since 3.5 */ - public const RELTIME = '08:48'; + public const RELTIME = '16:00'; /** * Release timezone. diff --git a/plugins/content/pagenavigation/tmpl/default.php b/plugins/content/pagenavigation/tmpl/default.php index aab1310d5d686..4c7bfd4b9d06c 100644 --- a/plugins/content/pagenavigation/tmpl/default.php +++ b/plugins/content/pagenavigation/tmpl/default.php @@ -14,11 +14,13 @@ use Joomla\CMS\Router\Route; /** - * @var \Joomla\Plugin\Content\PageNavigation\Extension\PageNavigation $this */ + * @var \Joomla\Plugin\Content\PageNavigation\Extension\PageNavigation $this + */ +$this->loadLanguage(); $lang = $this->getLanguage(); ?> -