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

[JENKINS-69904] _safeRestart.jelly must not use parentheses in localizable messages #7286

Merged
merged 2 commits into from Oct 22, 2022

Conversation

dwnusbaum
Copy link
Member

@dwnusbaum dwnusbaum commented Oct 20, 2022

See JENKINS-69904 and #7091.

This PR also deletes all existing translations since #7091 made them obsolete.

Testing done

Here's a screenshot of the /safeRestart page with these changes Screen Shot 2022-10-20 at 4 33 32 PM

I could add a WebClient test that just navigates to this page if desired, but I'm not sure how valuable that would be. Let me know if you want to me to add this.

Proposed changelog entries

  • Prevent exception from being thrown when attempting to initiate a safe restart (regression in 2.374)

Proposed upgrade guidelines

N/A

Submitter checklist

  • The Jira issue, if it exists, is well-described.
  • The changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developers, depending on the change) and are in the imperative mood (see examples).
    • Fill in the Proposed upgrade guidelines section only if there are breaking changes or changes that may require extra steps from users during upgrade.
  • There is automated testing or an explanation as to why this change has no tests.
  • New public classes, fields, and methods are annotated with @Restricted or have @since TODO Javadocs, as appropriate.
  • New deprecations are annotated with @Deprecated(since = "TODO") or @Deprecated(forRemoval = true, since = "TODO"), if applicable.
  • New or substantially changed JavaScript is not defined inline and does not call eval to ease future introduction of Content Security Policy (CSP) directives (see documentation).
  • For dependency updates, there are links to external changelogs and, if possible, full differentials.
  • For new APIs and extension points, there is a link to at least one consumer.

Maintainer checklist

Before the changes are marked as ready-for-merge:

  • There are at least two (2) approvals for the pull request and no outstanding requests for change.
  • Conversations in the pull request are over, or it is explicit that a reviewer is not blocking the change.
  • Changelog entries in the pull request title and/or Proposed changelog entries are accurate, human-readable, and in the imperative mood.
  • Proper changelog labels are set so that the changelog can be generated automatically.
  • If the change needs additional upgrade steps from users, the upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the pull request title (see example).
  • If it would make sense to backport the change to LTS, a Jira issue must exist, be a Bug or Improvement, and be labeled as lts-candidate to be considered (see query).

@dwnusbaum dwnusbaum added the regression-fix Pull request that fixes a regression in one of the previous Jenkins releases label Oct 20, 2022
@NotMyFault NotMyFault requested a review from a team October 20, 2022 21:40
@timja
Copy link
Member

timja commented Oct 20, 2022

we should alter existing translation files so that the existing translations continue to be used even though they no longer reflect the current version of the English text. Let me know if you want me to make any changes.

Generally we remove all translations that no longer match the English text so that they get retranslated.

@dwnusbaum
Copy link
Member Author

Generally we remove all translations that no longer match the English text so that they get retranslated.

Ok, I think I deleted them all in e4631cc.

@timja
Copy link
Member

timja commented Oct 21, 2022

/label ready-for-merge


This PR is now ready for merge, after ~24 hours, we will merge it if there's no negative feedback.

Thanks!

@comment-ops-bot comment-ops-bot bot added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Oct 21, 2022
Copy link
Contributor

@Wadeck Wadeck left a comment

Choose a reason for hiding this comment

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

Thanks Devin 👍

@basil basil merged commit 0003896 into jenkinsci:master Oct 22, 2022
@dwnusbaum dwnusbaum deleted the JENKINS-69904 branch October 24, 2022 16:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback regression-fix Pull request that fixes a regression in one of the previous Jenkins releases
Projects
None yet
5 participants