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

Synchronize Messages.properties from web and test #8011

Merged
merged 2 commits into from
May 16, 2024

Conversation

tylerjmchugh
Copy link
Contributor

@tylerjmchugh tylerjmchugh commented May 2, 2024

Synchronize the Messages.properties files in the web and test directory.
Messages.properties was updated in core/src/test but some changes are missing in web.

Without this fix the arguments in messages do not match the arguments provided.

Ex. user_feedback_text requires 11 arguments in Messages.properties in web but only 10 are provided. Only 10 arguments are required in Messages.properties in core/test.

image

image

image

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

@tylerjmchugh tylerjmchugh marked this pull request as ready for review May 2, 2024 13:52
@ianwallen ianwallen added this to the 4.4.5 milestone May 2, 2024
Comment on lines 57 to 58
user_with_that_email_found=A user with this email '%s' already exists.
user_with_that_username_found=A user with this username '%s' already exists.
Copy link
Member

Choose a reason for hiding this comment

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

You are reverting this change: #6958, it should contain the previous message.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Reverted back to original and applied to test messages

@@ -45,8 +45,8 @@ user_password_sent=Si l''utilisateur existe, vous recevrez un courriel contenant
user_password_changed=Le mot de passe de %s a \u00E9t\u00E9 mis \u00E0 jour.
user_password_notchanged=\u00C9chec lors du changement de mot de passe de %s. Contactez le support.
user_password_invalid_changekey=%s est une cl\u00E9 invalide pour %s. Les cl\u00E9s ne sont valides que pendant une journ\u00E9e.
user_with_that_email_found=Un utilisateur avec cette adresse email ou ce nom d''utilisateur existe d\u00E9j\u00E0.
user_with_that_username_found=Un utilisateur avec cette adresse email ou ce nom d''utilisateur existe d\u00E9j\u00E0.
user_with_that_email_found=Un utilisateur avec cette adresse email %s existe d\u00E9j\u00E0.
Copy link
Member

Choose a reason for hiding this comment

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

You are reverting this change: #6958, it should contain the previous message.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Reverted back to original and applied to test messages

@ianwallen ianwallen requested a review from josegar74 May 10, 2024 16:06
@ianwallen ianwallen merged commit 889d36a into geonetwork:main May 16, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants