Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Translation Update #35379

Merged
merged 31 commits into from
Sep 11, 2021
Merged

Translation Update #35379

merged 31 commits into from
Sep 11, 2021

Conversation

joomla-translation-bot
Copy link
Contributor

Automatically created pull request based on core-translation repository changes

@joomla-cms-bot joomla-cms-bot added Language Change This is for Translators PR-4.0-dev labels Aug 26, 2021
@brianteeman
Copy link
Contributor

@HLeithner I thought you had made it so that the copyright in the xml did not get changed?

@HLeithner
Copy link
Member

@conconnl can you have a look because the crowdin config seems correct

@conconnl
Copy link
Member

That is what happens when people don't want to use the System which manages this automatically. I already provided a corrected file too the proofreader, which they are processing. After the retrieval process picked up the new version from their GitHub, it should be corrected.

We can't guarantee it stays correct, unless we deny proofreaders from using GitHub for their work. At this moment the only method is communicate and ask for correction.

</metafile>
<name>Japanese (ja-JP)</name>
<version>4.0.2</version>
<creationDate>2021年8月</creationDate>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The date should be in English format year-month-day

<creationDate>2021年8月</creationDate>
<author>Joomla!じゃぱん</author>
<copyright>(C) 2021 Joomla!じゃぱん</copyright>
<license>GNU GPL バージョン2以降。LICENSE.txtを参照ください。</license>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both copyright and license should in English, i.e. exactly like en-GB

@conconnl
Copy link
Member

Maybe read the previous message.
Then you would see that the corrections are already communicated and being processed by the proofreader.
https://github.com/joomlajp/Joomla-in-Japanese/blob/4.x/installation/language/ja-JP/langmetadata.xml

@infograf768
Copy link
Member

We still have the date as <creationDate>August 2021</creationDate> which is also an error in en-GB.
The English date format, i.e. 2021-08-24 for example, should be used for all languages xml including admin, site and APi. This has been decided some years ago.

Once more, handling this totally automatically is a mistake. Files should be checked by someone responsible at Production level before being included in the CMS.

@conconnl
Copy link
Member

conconnl commented Aug 27, 2021

We still have the date as <creationDate>August 2021</creationDate> which is also an error in en-GB.
The English date format, i.e. 2021-08-24 for example, should be used for all languages xml including admin, site and APi. This has been decided some years ago.

Once more, handling this totally automatically is a mistake. Files should be checked by someone responsible at Production level before being included in the CMS.

If that is wrong, fix the Core:
https://github.com/joomla/joomla-cms/blob/4.0-dev/administrator/manifests/packages/pkg_en-GB.xml

They are checked, how else would the proofreader receive the corrections they processed.

@HLeithner
Copy link
Member

That is what happens when people don't want to use the System which manages this automatically. I already provided a corrected file too the proofreader, which they are processing. After the retrieval process picked up the new version from their GitHub, it should be corrected.

We can't guarantee it stays correct, unless we deny proofreaders from using GitHub for their work. At this moment the only method is communicate and ask for correction.

ah sorry I thought the bot pulled it from crowdin in, ok then it's clear why it's not limited, thanks

@dgrammatiko
Copy link
Contributor

This PR is still incomplete, it is missing these files (that need to be updated with the new strings):

Basically it needs 3 more steps in the actions:

  • npm ci
  • node .\build\build.js --build-pages
  • add back the updated files:
    - uses: stefanzweifel/git-auto-commit-action@v4.11.0
      with:
        commit_message: Adding back the json created...
        branch: ${{ github.head_ref }}

@HLeithner
Copy link
Member

@dgrammatiko
Copy link
Contributor

@dgrammatiko what did I wrong?

It's not your fault. The tools require that the composer install should be executed before running the npm ci. Basically I should have spotted that, so it's my fault. Give me some time...

@dgrammatiko
Copy link
Contributor

dgrammatiko commented Sep 11, 2021

@HLeithner apply the following changes to https://github.com/joomla/joomla-cms/blob/4.0-dev/build/build-modules-js/init/cleanup-media.es6.js:

const {
  stat, mkdir, copy, remove,
} = require('fs-extra');
const { join } = require('path');

const RootPath = process.cwd();

/**
 * Method that will erase the media/vendor folder
 * and populate the debugbar assets
 *
 * @returns {Promise}
 */
module.exports.cleanVendors = async (skip = true) => {
  // eslint-disable-next-line no-console
  console.log('Cleanup the Vendor ');

  try {
    const mediaFolder = await stat(join(RootPath, 'libraries/vendor/maximebf/debugbar/src/DebugBar/Resources'));
    await mediaFolder.isDirectory();
  } catch (e) {
    // eslint-disable-next-line no-console
    console.error('You need to run `npm install` AFTER the command `composer install`!!!. The debug plugin HASN\'T installed all its front end assets');
    return;
  }

  // Recreate the media folder
  await mkdir(join(RootPath, 'media/vendor/debugbar'), { recursive: true, mode: 0o755 });

  // Copy some assets from a PHP package
  await copy(join(RootPath, 'libraries/vendor/maximebf/debugbar/src/DebugBar/Resources'), join(RootPath, 'media/vendor/debugbar'), { preserveTimestamps: true });
  await remove(join(RootPath, 'media/vendor/debugbar/vendor/font-awesome'));
  await remove(join(RootPath, 'media/vendor/debugbar/vendor/jquery'));
};

@HLeithner
Copy link
Member

Have to be done against the main cms repository

@dgrammatiko
Copy link
Contributor

@HLeithner #35531

@dgrammatiko
Copy link
Contributor

@HLeithner So I tweaked the file a bit more because the hard failing on composer install is kinda required or the debug will be totally broken. So the #35531 adds a check for a system variable and the action should be now TRANSLATION_BOT=YES npm ci.

Also the node .\build\build.js --build-pages is redundant, it already executed with the npm ci

@dgrammatiko
Copy link
Contributor

@HLeithner one more change

from

      - name: Update static error pages
        run: |
          npm install
          SKIP_COMPOSER_CHECK=yes npm ci

to

      - name: Update static error pages
        run: |
          SKIP_COMPOSER_CHECK=yes npm ci

Co-authored-by: Dimitris Grammatikogiannis <dg@dgrammatiko.dev>
@@ -47,6 +50,10 @@ jobs:
echo ${SYNC_PATH}
rsync -i -rptgo --checksum --ignore-times --delete --exclude="*en-GB*" core-translations-main/joomla_${SYNC_VERION}/translations/core/${SYNC_PATH} joomla-cms/${SYNC_PATH}

- name: Update static error pages
run: |
SKIP_COMPOSER_CHECK=yes npm ci
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
SKIP_COMPOSER_CHECK=yes npm ci
export SKIP_COMPOSER_CHECK=yes && npm ci

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Language Change This is for Translators
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants