Skip to content

[5.0] LICENSE.txt#41423

Merged
HLeithner merged 1 commit intojoomla:5.0-devfrom
heelc29:5.0/captcha-editor-events/license
Aug 22, 2023
Merged

[5.0] LICENSE.txt#41423
HLeithner merged 1 commit intojoomla:5.0-devfrom
heelc29:5.0/captcha-editor-events/license

Conversation

@heelc29
Copy link
Contributor

@heelc29 heelc29 commented Aug 21, 2023

Summary of Changes

set correct license information in header (see also #40400 or #41277 for reference)

Testing Instructions

code review

@brianteeman
Copy link
Contributor

why were these changes not in an upmerge? its a waste of your valuable time to do this

@heelc29
Copy link
Contributor Author

heelc29 commented Aug 21, 2023

why were these changes not in an upmerge? its a waste of your valuable time to do this

@brianteeman do you mean the other PR #41422?

The "error-pages" (templates/system/build_incomplete.html, templates/system/fatal-error.html, templates/system/incompatible.html) are generated/updated by the translation-bot in PR for translation update (eg. #41137)

npm ci --ignore-scripts && node build/build.js --build-pages

and this is (at the moment) only available for 4.3-dev.

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

So only the 3 files were updated in 4.3-dev (and upmerged).

The 4th file is only available in 5.0-dev (added with #40509) and do not exist in prior versions (no upmerge possible)

"destFile": ["/templates/system/incompatible.html", "/includes/incompatible.html"]

The solutions would be

  • run npm ci in the upmerge PR
  • or create an second/new workflow for translation update v5 (if crowdin is ready)

to to this automatically...

@brianteeman
Copy link
Contributor

I have tested this item ✅ successfully on e7c4629


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/41423.

1 similar comment
@richard67
Copy link
Member

I have tested this item ✅ successfully on e7c4629


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/41423.

@richard67
Copy link
Member

RTC


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/41423.

@joomla-cms-bot joomla-cms-bot added the RTC This Pull Request is Ready To Commit label Aug 22, 2023
@HLeithner HLeithner merged commit a16c058 into joomla:5.0-dev Aug 22, 2023
@HLeithner
Copy link
Member

thanks

@joomla-cms-bot joomla-cms-bot removed the RTC This Pull Request is Ready To Commit label Aug 22, 2023
@heelc29 heelc29 deleted the 5.0/captcha-editor-events/license branch August 22, 2023 19:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants