Skip to content

Commit 455bae3

Browse files
Bodge-ITBodge-IT
committed
Merge remote-tracking branch 'upstream/5.2-dev' into upmerges/2024-09-12
2 parents a5adfd2 + 269fe84 commit 455bae3

File tree

350 files changed

+4036
-1170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

350 files changed

+4036
-1170
lines changed

‎.github/workflows/create-translation-pull-request-v4.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Create translation pull request
1+
name: Create translation pull request J4
22

33
on:
44
push:

‎.github/workflows/create-translation-pull-request-v5.yml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
name: Create translation pull request
1+
name: Create translation pull request J5
22

33
on:
44
push:
5-
branches: [ translation ]
5+
branches: [ translation5 ]
66

77
workflow_dispatch:
88

99
schedule:
1010
# Run daily at 7:32
1111
- cron: '32 7 * * *'
1212

13+
env:
14+
JOOMLA_MAJOR_VERSION: 5
15+
JOOMLA_MINOR_VERSION: 5.2
16+
1317
permissions:
1418
contents: read
1519

@@ -25,6 +29,7 @@ jobs:
2529
- uses: actions/checkout@v3
2630
# We need the full depth to create / update the pull request against the main repo
2731
with:
32+
ref: translation5
2833
fetch-depth: 0
2934
- uses: actions/setup-node@v3
3035
with:
@@ -37,7 +42,7 @@ jobs:
3742
git remote add upstream https://github.com/joomla/joomla-cms.git
3843
git fetch upstream
3944
git checkout --progress --force -B translation5 refs/remotes/origin/translation5
40-
git merge upstream/5.1-dev
45+
git merge upstream/${{ env.JOOMLA_MINOR_VERSION }}-dev
4146
4247
- name: Fetch and extract translations
4348
run: |
@@ -49,11 +54,9 @@ jobs:
4954
# We use a simple copy paste syntax here if needed customization for different directories
5055
run: |
5156
cd ..
52-
SYNC_VERSION="v5"
53-
5457
SYNC_PATH="installation/language/"
5558
echo ${SYNC_PATH}
56-
rsync -i -rptgo --checksum --ignore-times --delete --exclude="*en-GB*" core-translations-main/joomla_${SYNC_VERSION}/translations/core/${SYNC_PATH} joomla-cms/${SYNC_PATH}
59+
rsync -i -rptgo --checksum --ignore-times --delete --exclude="*en-GB*" core-translations-main/joomla_v${{ env.JOOMLA_MAJOR_VERSION }}/translations/core/${SYNC_PATH} joomla-cms/${SYNC_PATH}
5760
5861
- name: Update static error pages
5962
run: |
@@ -73,5 +76,5 @@ jobs:
7376
env:
7477
GITHUB_TOKEN: ${{ secrets.API_TOKEN_GITHUB }}
7578
run: |
76-
gh pr list -R joomla/joomla-cms --state open --author joomla-translation-bot -S "[5.x] Translation Update" | grep -v "No pull" || \
77-
gh pr create --title "[5.x] Translation Update" --body "Automatically created pull request based on core-translation repository changes" -R joomla/joomla-cms --base 5.1-dev
79+
gh pr list -R joomla/joomla-cms --state open --author joomla-translation-bot -S "[${{ env.JOOMLA_MINOR_VERSION }}] Translation Update" --base ${{ env.JOOMLA_MINOR_VERSION }}-dev | grep -v "No pull" || \
80+
gh pr create --title "[${{ env.JOOMLA_MINOR_VERSION }}] Translation Update" --body "Automatically created pull request based on core-translation repository changes" -R joomla/joomla-cms --base ${{ env.JOOMLA_MINOR_VERSION }}-dev

‎administrator/components/com_actionlogs/config.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
label="COM_ACTIONLOGS_LOG_EXTENSIONS_LABEL"
3131
multiple="true"
3232
layout="joomla.form.field.list-fancy-select"
33-
default="com_banners,com_cache,com_categories,com_checkin,com_config,com_contact,com_content,com_fields,com_installer,com_media,com_menus,com_messages,com_modules,com_newsfeeds,com_plugins,com_redirect,com_scheduler,com_tags,com_templates,com_users"
33+
default="com_banners,com_cache,com_categories,com_checkin,com_config,com_contact,com_content,com_fields,com_guidedtours,com_installer,com_media,com_menus,com_messages,com_modules,com_newsfeeds,com_plugins,com_redirect,com_scheduler,com_tags,com_templates,com_users"
3434
/>
3535
<field
3636
name="loggable_api"

‎administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public static function getCsvData($data): \Generator
5353
{
5454
if (!is_iterable($data)) {
5555
throw new \InvalidArgumentException(
56-
sprintf(
56+
\sprintf(
5757
'%s() requires an array or object implementing the Traversable interface, a %s was given.',
5858
__METHOD__,
5959
\is_object($data) ? \get_class($data) : \gettype($data)

‎administrator/components/com_actionlogs/src/Model/ActionlogModel.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class ActionlogModel extends BaseDatabaseModel implements UserFactoryAwareInterf
5252
public function addLog($messages, $messageLanguageKey, $context, $userId = 0)
5353
{
5454
if (!is_numeric($userId)) {
55-
@trigger_error(sprintf('User ID must be an integer in %s.', __METHOD__), E_USER_DEPRECATED);
55+
@trigger_error(\sprintf('User ID must be an integer in %s.', __METHOD__), E_USER_DEPRECATED);
5656
}
5757

5858
$user = $userId ? $this->getUserFactory()->loadUserById($userId) : $this->getCurrentUser();

‎administrator/components/com_admin/script.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ protected function updateManifestCaches()
380380
if (!$installer->refreshManifestCache($extension->extension_id)) {
381381
$this->collectError(
382382
__METHOD__,
383-
new \Exception(sprintf(
383+
new \Exception(\sprintf(
384384
'Error on updating manifest cache: (type, element, folder, client) = (%s, %s, %s, %s)',
385385
$extension->type,
386386
$extension->element,
@@ -489,7 +489,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
489489
if (File::delete(JPATH_ROOT . $file)) {
490490
$status['files_deleted'][] = $file;
491491
} else {
492-
$status['files_errors'][] = sprintf('Error on deleting file or folder %s', $file);
492+
$status['files_errors'][] = \sprintf('Error on deleting file or folder %s', $file);
493493
}
494494
}
495495
}
@@ -503,7 +503,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
503503
if (Folder::delete(JPATH_ROOT . $folder)) {
504504
$status['folders_deleted'][] = $folder;
505505
} else {
506-
$status['folders_errors'][] = sprintf('Error on deleting file or folder %s', $folder);
506+
$status['folders_errors'][] = \sprintf('Error on deleting file or folder %s', $folder);
507507
}
508508
}
509509
}

‎administrator/components/com_admin/sql/updates/mysql/5.2.0-2024-07-02.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-- Add mod_articles module
2+
INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`) VALUES
3+
(0, 'mod_articles', 'module', 'mod_articles', '', 0, 1, 0, 0, 1, '', '', '');

‎administrator/components/com_admin/sql/updates/mysql/5.2.0-2024-07-19.sql‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
--
2+
-- Add the Guided Tours selectable option to the User Action Logs
3+
--
4+
INSERT INTO `#__action_logs_extensions` (`extension`) VALUES ('com_guidedtours');
5+
6+
INSERT INTO `#__action_log_config` (`type_title`, `type_alias`, `id_holder`, `title_holder`, `table_name`, `text_prefix`) VALUES
7+
('guidedtour', 'com_guidedtours.state', 'id', 'title', '#__guidedtours', 'PLG_ACTIONLOG_JOOMLA');

‎administrator/components/com_admin/sql/updates/mysql/5.2.0-2024-08-22.sql‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
INSERT INTO `#__guidedtours` (`title`, `description`, `extensions`, `url`, `published`, `language`, `note`, `access`, `uid`, `autostart`, `created`, `created_by`, `modified`, `modified_by`) VALUES
2+
('COM_GUIDEDTOURS_TOUR_WHATSNEW_5_2_TITLE', 'COM_GUIDEDTOURS_TOUR_WHATSNEW_5_2_DESCRIPTION', '["com_cpanel"]', 'administrator/index.php', 1, '*', '', 1, 'joomla-whatsnew-5-2', 1, CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0);
3+
INSERT INTO `#__guidedtour_steps` (`title`, `description`, `position`, `target`, `type`, `interactive_type`, `url`, `published`, `language`, `note`, `params`, `tour_id`, `created`, `created_by`, `modified`, `modified_by`)
4+
SELECT 'COM_GUIDEDTOURS_TOUR_WHATSNEW_5_2_STEP_0_TITLE', 'COM_GUIDEDTOURS_TOUR_WHATSNEW_5_2_STEP_0_DESCRIPTION', 'right', '#sidebarmenu nav > ul:first-of-type > li:last-child', 0, 1, '', 1, '*', '', '{"required":1,"requiredvalue":""}', MAX(`id`), CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0
5+
FROM `#__guidedtours`
6+
WHERE `uid` = 'joomla-whatsnew-5-2';

‎administrator/components/com_admin/sql/updates/postgresql/5.2.0-2024-07-02.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-- Add mod_articles module
2+
INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data", "ordering", "state") VALUES
3+
(0, 'mod_articles', 'module', 'mod_articles', '', 0, 1, 0, 0, 1, '', '', '', 0, 0);

0 commit comments

Comments
 (0)