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

[Backport 4.2.x] Support section variable in manual url (#8494) #8566

Merged
merged 3 commits into from
Dec 16, 2024

Conversation

wangf1122
Copy link
Collaborator

Manuals backport for #8494

  • support section variable in manual url

  • isoLang variable, help wording

  • Revert "isoLang variable, help wording"

This reverts commit 0b000ce

  • ignore path "/" for default language replacement

  • Update web-ui/src/main/resources/catalog/locales/en-admin.json

  • remove double slash

  • remove double slash in error handler


Checklist

  • I have read the contribution guidelines
  • Pull request provided for main branch, backports managed with label
  • Good housekeeping of code, cleaning up comments, tests, and documentation
  • Clean commit history broken into understandable chucks, avoiding big commits with hundreds of files, cautious of reformatting and whitespace changes
  • Clean commit messages, longer verbose messages are encouraged
  • API Changes are identified in commit messages
  • Testing provided for features or enhancements using automatic tests
  • User documentation provided for new features or enhancements in manual
  • Build documentation provided for development instructions in README.md files
  • Library management using pom.xml dependency management. Update build documentation with intended library use and library tutorials or documentation

* support section variable in manual url

* isoLang variable, help wording

* Revert "isoLang variable, help wording"

This reverts commit 0b000ce

* ignore path "/" for default language replacement

* Update web-ui/src/main/resources/catalog/locales/en-admin.json

Co-authored-by: Jose García <[email protected]>

* remove double slash

* remove double slash in error handler

---------

Co-authored-by: Jose García <[email protected]>
@CLAassistant
Copy link

CLAassistant commented Dec 16, 2024

CLA assistant check
All committers have signed the CLA.

* support section variable in manual url

* isoLang variable, help wording

* Revert "isoLang variable, help wording"

This reverts commit 0b000ce

* ignore path "/" for default language replacement

* Update web-ui/src/main/resources/catalog/locales/en-admin.json

Co-authored-by: Jose García <[email protected]>

* remove double slash

* remove double slash in error handler

---------

Co-authored-by: Jose García <[email protected]>
@wangf1122 wangf1122 marked this pull request as ready for review December 16, 2024 14:07
@wangf1122
Copy link
Collaborator Author

@josegar74 @ianwallen

This is for backporting #8494 and conflict resolving

@josegar74 josegar74 changed the title support section variable in manual url (#8494) [Backport 4.2.x] Support section variable in manual url (#8494) Dec 16, 2024
@josegar74 josegar74 added this to the 4.2.12 milestone Dec 16, 2024
@josegar74
Copy link
Member

@wangf1122 please execute mvn clean install -DskipTests on the root folder, so JS Prettier is executed and commit the reformatted NeedHelpDirective.js

prettier plugin reformating
@wangf1122
Copy link
Collaborator Author

@josegar74

Yes, i have rebuilt with maven and the prettier plugin reformatted this js file. Please take a look

@josegar74 josegar74 merged commit ee95560 into geonetwork:4.2.x Dec 16, 2024
6 of 7 checks passed
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.

3 participants