Merge branch '5.1-dev' into fix-contacts-category-levels

.drone.yml

@@ -354,7 +354,7 @@ steps:
       - mkdir -p transfer
       - date +%s > transfer/$MINORVERSION-time.txt
       - git rev-parse origin/$MINORVERSION-dev > transfer/$MINORVERSION.txt
-      - php build/build.php --remote=origin/$MINORVERSION-dev --exclude-gzip --exclude-bzip2 --disable-patch-packages
+      - php build/build.php --remote=origin/$MINORVERSION-dev --exclude-gzip --disable-patch-packages
       - mv build/tmp/packages/* transfer/
 
   - name: upload
@@ -403,6 +403,6 @@ trigger:
 
 ---
 kind: signature
-hmac: e8ab45eb1d91c0b0b38c8d25a3a983d112c973dcba0153a982f2afd581dfa458
+hmac: c1434b09300896f8627ccb11c92e97878caf7a303772db01a647dca53a92fa3f
 
 ...

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

@@ -28,7 +28,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
 
       - name: Fetch latest cms changes
         run: |
@@ -37,7 +37,7 @@ jobs:
           git remote add upstream https://github.com/joomla/joomla-cms.git
           git fetch upstream
           git checkout --progress --force -B translation refs/remotes/origin/translation
-          git merge upstream/4.3-dev
+          git merge upstream/4.4-dev
 
       - name: Fetch and extract translations
         run: |
@@ -73,5 +73,5 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.API_TOKEN_GITHUB }}
         run: |
-          gh pr list -R joomla/joomla-cms --state open --author joomla-translation-bot -S "Translation Update" | grep -v "No pull" || \
-            gh pr create --title "Translation Update" --body "Automatically created pull request based on core-translation repository changes" -R joomla/joomla-cms --base 4.3-dev
+          gh pr list -R joomla/joomla-cms --state open --author joomla-translation-bot -S "[4.x] Translation Update" | grep -v "No pull" || \
+            gh pr create --title "[4.x] Translation Update" --body "Automatically created pull request based on core-translation repository changes" -R joomla/joomla-cms --base 4.4-dev

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

@@ -0,0 +1,77 @@
+name: Create translation pull request
+
+on:
+  push:
+    branches: [ translation ]
+
+  workflow_dispatch:
+
+  schedule:
+    # Run daily at 7:32
+    - cron:  '32 7 * * *'
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    permissions:
+      contents: write  # for Git to git push
+    runs-on: ubuntu-latest
+    # Only run this action the translation-bot repository in the translation branch
+    if: ${{ github.repository == 'joomla-translation-bot/joomla-cms' && github.ref == 'refs/heads/translation5' }}
+
+    steps:
+      - uses: actions/checkout@v3
+        # We need the full depth to create / update the pull request against the main repo
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 20
+
+      - name: Fetch latest cms changes
+        run: |
+          git config user.name Translation Bot
+          git config user.email release+translation-bot@joomla.org
+          git remote add upstream https://github.com/joomla/joomla-cms.git
+          git fetch upstream
+          git checkout --progress --force -B translation5 refs/remotes/origin/translation5
+          git merge upstream/5.0-dev
+
+      - name: Fetch and extract translations
+        run: |
+          cd ..
+          wget -nv "https://github.com/joomla/core-translations/archive/refs/heads/main.zip"
+          unzip main.zip
+
+      - name: Syncing directories
+        # We use a simple copy paste syntax here if needed customization for different directories
+        run: |
+          cd ..
+          SYNC_VERSION="v5"
+
+          SYNC_PATH="installation/language/"
+          echo ${SYNC_PATH}
+          rsync -i -rptgo --checksum --ignore-times --delete --exclude="*en-GB*" core-translations-main/joomla_${SYNC_VERSION}/translations/core/${SYNC_PATH} joomla-cms/${SYNC_PATH}
+
+      - name: Update static error pages
+        run: |
+          npm ci --ignore-scripts && node build/build.js --build-pages
+
+      - name: Create commit
+        continue-on-error: true
+        run: |
+          git config user.name Translation Bot
+          git config user.email release+translation-bot@joomla.org
+          git add .
+          git commit -m "Language update"
+          git push --force
+
+      - name: Create pull request
+        if: ${{ success() }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.API_TOKEN_GITHUB }}
+        run: |
+          gh pr list -R joomla/joomla-cms --state open --author joomla-translation-bot -S "Translation Update" | grep -v "No pull" || \
+            gh pr create --title "Translation Update" --body "Automatically created pull request based on core-translation repository changes" -R joomla/joomla-cms --base 5.0-dev

administrator/components/com_contact/src/View/Contacts/HtmlView.php

@@ -99,13 +99,6 @@ public function display($tpl = null)
             throw new GenericDataException(implode("\n", $errors), 500);
         }
 
-        // Preprocess the list of items to find ordering divisions.
-        // @todo: Complete the ordering stuff with nested sets
-        foreach ($this->items as &$item) {
-            $item->order_up = true;
-            $item->order_dn = true;
-        }
-
         // We don't need toolbar in the modal window.
         if ($this->getLayout() !== 'modal') {
             $this->addToolbar();

administrator/components/com_installer/tmpl/languages/default.php

@@ -19,7 +19,8 @@
 /** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $this->document->getWebAssetManager();
 $wa->useScript('table.columns')
-    ->useScript('multiselect');
+    ->useScript('multiselect')
+    ->useScript('webcomponent.core-loader');
 
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
@@ -72,7 +73,7 @@
                                 <td>
                                     <?php $buttonText = (isset($this->installedLang[0][$language->code]) || isset($this->installedLang[1][$language->code])) ? 'REINSTALL' : 'INSTALL'; ?>
                                     <?php $buttonClass = (isset($this->installedLang[0][$language->code]) || isset($this->installedLang[1][$language->code])) ? 'btn btn-success btn-sm' : 'btn btn-primary btn-sm'; ?>
-                                    <?php $onclick = 'document.getElementById(\'install_url\').value = \'' . $language->detailsurl . '\'; Joomla.submitbutton(\'install.install\');'; ?>
+                                    <?php $onclick = 'document.getElementById(\'install_url\').value = \'' . $language->detailsurl . '\'; Joomla.submitbutton(\'install.install\'); document.body.appendChild(document.createElement(\'joomla-core-loader\'));'; ?>
                                     <input type="button"
                                         class="<?php echo $buttonClass; ?>"
                                         value="<?php echo Text::_('COM_INSTALLER_' . $buttonText . '_BUTTON'); ?>"

administrator/components/com_modules/src/View/Module/HtmlView.php

@@ -186,7 +186,7 @@ function (Toolbar $childBar) use ($checkedOut, $canDo) {
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   5.1.0
      *
      * @throws  \Exception
      */

administrator/components/com_plugins/src/Controller/PluginController.php

@@ -32,7 +32,7 @@ class PluginController extends FormController
      *
      * @return  boolean  True if access level checks pass, false otherwise.
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   5.1.0
      */
     public function cancel($key = null)
     {
@@ -59,7 +59,7 @@ public function cancel($key = null)
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   5.1.0
      */
     protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
     {

administrator/components/com_plugins/src/View/Plugin/HtmlView.php

@@ -132,7 +132,7 @@ protected function addToolbar()
      *
      * @return  void
      *
-     * @since   __DEPLOY_VERSION__
+     * @since   5.1.0
      *
      * @throws  \Exception
      */

administrator/language/en-GB/install.xml

@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>5.1.0</version>
-	<creationDate>2023-12</creationDate>
+	<creationDate>2024-01</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

administrator/language/en-GB/langmetadata.xml

@@ -2,7 +2,7 @@
 <metafile client="administrator">
 	<name>English (en-GB)</name>
 	<version>5.1.0</version>
-	<creationDate>2023-12</creationDate>
+	<creationDate>2024-01</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

administrator/manifests/files/joomla.xml

@@ -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>5.1.0-alpha3-dev</version>
-	<creationDate>2023-12</creationDate>
+	<version>5.1.0-alpha4-dev</version>
+	<creationDate>2024-01</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
 	<scriptfile>administrator/components/com_admin/script.php</scriptfile>

administrator/manifests/packages/pkg_en-GB.xml

@@ -3,7 +3,7 @@
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
 	<version>5.1.0.1</version>
-	<creationDate>2023-12</creationDate>
+	<creationDate>2024-01</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

api/language/en-GB/install.xml

@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>5.1.0</version>
-	<creationDate>2023-12</creationDate>
+	<creationDate>2024-01</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

api/language/en-GB/langmetadata.xml

@@ -2,7 +2,7 @@
 <metafile client="api">
 	<name>English (en-GB)</name>
 	<version>5.1.0</version>
-	<creationDate>2023-12</creationDate>
+	<creationDate>2024-01</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

build/build.php

@@ -232,7 +232,7 @@ function clean_composer(string $dir)
 $fullpath = $tmp . '/' . $time;
 
 // Parse input options
-$options = getopt('', ['help', 'remote::', 'exclude-zip', 'exclude-gzip', 'exclude-bzip2', 'include-zstd', 'disable-patch-packages']);
+$options = getopt('', ['help', 'remote::', 'exclude-zip', 'exclude-gzip', 'include-bzip2', 'exclude-zstd', 'disable-patch-packages']);
 
 $remote             = $options['remote'] ?? false;
 $excludeZip         = isset($options['exclude-zip']);
@@ -671,21 +671,26 @@ function clean_composer(string $dir)
         }
     }
 
-    echo "Generating checksums.txt file\n";
+    echo "Generating checksums files\n";
 
-    $checksumsContent = '';
+    $checksumsContent       = '';
+    $checksumsContentUpdate = '';
 
     foreach ($checksums as $packageName => $packageHashes) {
         $checksumsContent .= "Filename: $packageName\n";
 
         foreach ($packageHashes as $hashType => $hash) {
             $checksumsContent .= "$hashType: $hash\n";
+            if (strpos($packageName, 'Update_Package.zip') !== false) {
+                $checksumsContentUpdate .= "<$hashType>$hash</$hashType>\n";
+            }
         }
 
         $checksumsContent .= "\n";
     }
 
     file_put_contents('checksums.txt', $checksumsContent);
+    file_put_contents('checksums_update.txt', $checksumsContentUpdate);
 
     echo "Generating github_release.txt file\n";
 

build/media_source/com_media/scss/components/_media-browser.scss

@@ -57,6 +57,7 @@
 }
 
 .media-browser-item-info {
+  max-width: 250px;
   padding: 0 2px;
   overflow: hidden;
   font-size: .9rem;
@@ -124,8 +125,7 @@
   &.active {
     top: 0;
     z-index: 1;
-    width: max-content;
-    min-width: 100%;
+    width: 100%;
     background-color: $browser-background-color;
     border: 1px solid hsl(var(--hue), 35%, 95%);
     border-radius: .25rem;
@@ -158,6 +158,9 @@
   .media-browser-actions-item-name {
     padding: 2px;
     margin-block-end: 3px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
   }
   button, a {
     position: relative;

build/media_source/plg_editors_codemirror/css/codemirror.css

@@ -27,6 +27,7 @@ joomla-editor-codemirror.fullscreen {
 joomla-editor-codemirror.fullscreen .cm-editor {
   width: auto !important;
   height: 90vh !important;
+  background-color: var(--body-bg);
 }
 
 

components/com_users/src/Controller/UserController.php

@@ -203,7 +203,7 @@ public function menulogout()
         }
 
         // Logout and redirect
-        $this->setRedirect('index.php?option=com_users&task=user.logout&' . Session::getFormToken() . '=1&return=' . base64_encode($url));
+        $this->setRedirect(Route::_('index.php?option=com_users&task=user.logout&' . Session::getFormToken() . '=1&return=' . base64_encode($url), false));
     }
 
     /**