Skip to content

8291924: jpackage: l10n for Windows context menu label #9753

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

Closed
wants to merge 3 commits into from

Conversation

akashche
Copy link
Contributor

@akashche akashche commented Aug 4, 2022

This change adds ContextMenuCommandLabel l10n property for file association context menu label. It is a follow-up to this PR comment.

Note, non-EN l10n values were filled using auto-translator and may need to be corrected.

To check the contents of the label, registry query is added to PackageTest::addHelloAppFileAssociationsVerifier.

Testing:

  • ran FileAssociationsTest with install enabled

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8291924: jpackage: l10n for Windows context menu label

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/9753/head:pull/9753
$ git checkout pull/9753

Update a local copy of the PR:
$ git checkout pull/9753
$ git pull https://git.openjdk.org/jdk pull/9753/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9753

View PR using the GUI difftool:
$ git pr show -t 9753

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/9753.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 4, 2022

👋 Welcome back akasko! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 4, 2022
@openjdk
Copy link

openjdk bot commented Aug 4, 2022

@akashche The following label will be automatically applied to this pull request:

  • core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Aug 4, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 4, 2022

Webrevs

private static String queryRegistryValue(String keyPath, String valueName) {
public static String queryRegistryValue(String keyPath, String valueName) {

Choose a reason for hiding this comment

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

It should be sufficient to make it package private, not public.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changed the modifier to package private.

Copy link
Member

@naotoj naotoj left a comment

Choose a reason for hiding this comment

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

As to the l10n files, no need to provide those. Providing the English resource is just fine. L10n will pick them up in the later translation process.

@akashche
Copy link
Contributor Author

akashche commented Aug 5, 2022

I've updated the patch, making queryRegistryValue package private, removing non-EN l10n entries and adding minor enhancements to label value check.

Copy link
Member

@naotoj naotoj left a comment

Choose a reason for hiding this comment

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

Looks good for the translation file change.

@openjdk
Copy link

openjdk bot commented Aug 5, 2022

@akashche This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8291924: jpackage: l10n for Windows context menu label

Reviewed-by: naoto, asemenyuk, almatvee

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 96 new commits pushed to the master branch:

  • 7b029ea: 8227651: Tests fail with SSLProtocolException: Input record too big
  • 35fd5d8: 8292200: Add java/io/File/GetXSpace.java to Windows problem list
  • 9825c33: 8291641: Optimize StackTraceElement.toString()
  • cb37282: 8291752: AArch64: Remove check_emit_size parameter from trampoline_call
  • 37d3146: 8289002: Minimal x86_64 VM build fails with GCC 11: 'this' pointer is null
  • ecfa38f: 8281966: Absolute path of symlink is null in JFileChooser
  • 83dc2e3: 8292062: misc javax/swing tests failing
  • 4913380: 8292007: Do not include vmSymbol.hpp in method.hpp
  • 6397d56: 8151430: (fs) BasicFileAttributeView.setTimes should support setting file create time on OS X
  • 57e0da1: 8292132: ProblemList jdk/internal/misc/TerminatingThreadLocal/TestTerminatingThreadLocal.java
  • ... and 86 more: https://git.openjdk.org/jdk/compare/af76c0c1991f6051ba95f05b79121a7eeef8e7d3...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@naotoj, @alexeysemenyukoracle, @sashamatveev) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Aug 5, 2022
@alexeysemenyukoracle
Copy link
Member

I think there was a miscommunication about l10n files.
All "MsiInstallerStrings_*.wxl" files need to be updated, but no need to provide a localized version of English string(s).
I.e. add <String Id="ContextMenuCommandLabel">Open with [ProductName]</String> to all "MsiInstallerStrings_*.wxl" files, not only to "MsiInstallerStrings_en.wxl".

@naotoj
Copy link
Member

naotoj commented Aug 6, 2022

Missing entries in localized files are automatically detected by the translation process. So modifying only the English file should be fine.

@akashche
Copy link
Contributor Author

akashche commented Aug 8, 2022

Thanks for the l10n files review! As I understand, I need a second jpackage-specific review before integrating the change. I can change non-EN .wxl files as needed - please confirm if they need to be changed.

@alexeysemenyukoracle
Copy link
Member

@naotoj , I suspect missing entries in l10n files will cause code depending on them to fail when executed in non-English locales until the next l10n drop corrects missing entries.

@naotoj
Copy link
Member

naotoj commented Aug 8, 2022

Thanks, @alexeysemenyukoracle , I was under the impression of falling back to the English resource if l10n was not available. If it is not falling back to English, please bring those non-English resources back.

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Aug 8, 2022
@akashche
Copy link
Contributor Author

akashche commented Aug 8, 2022

Thanks for clarification! I've updated the patch adding English entries to all .wxl files.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Aug 8, 2022
@akashche
Copy link
Contributor Author

I've verified that there is no fallback to EN for .wxl files (more details in this comment), so leaving EN entries that were added to all .wxl files.

@akashche
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Aug 10, 2022
@openjdk
Copy link

openjdk bot commented Aug 10, 2022

@akashche
Your change (at version ff3d8ae) is now ready to be sponsored by a Committer.

@alexeysemenyukoracle
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Aug 10, 2022

Going to push as commit e4925a3.
Since your change was applied there have been 96 commits pushed to the master branch:

  • 7b029ea: 8227651: Tests fail with SSLProtocolException: Input record too big
  • 35fd5d8: 8292200: Add java/io/File/GetXSpace.java to Windows problem list
  • 9825c33: 8291641: Optimize StackTraceElement.toString()
  • cb37282: 8291752: AArch64: Remove check_emit_size parameter from trampoline_call
  • 37d3146: 8289002: Minimal x86_64 VM build fails with GCC 11: 'this' pointer is null
  • ecfa38f: 8281966: Absolute path of symlink is null in JFileChooser
  • 83dc2e3: 8292062: misc javax/swing tests failing
  • 4913380: 8292007: Do not include vmSymbol.hpp in method.hpp
  • 6397d56: 8151430: (fs) BasicFileAttributeView.setTimes should support setting file create time on OS X
  • 57e0da1: 8292132: ProblemList jdk/internal/misc/TerminatingThreadLocal/TestTerminatingThreadLocal.java
  • ... and 86 more: https://git.openjdk.org/jdk/compare/af76c0c1991f6051ba95f05b79121a7eeef8e7d3...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 10, 2022
@openjdk openjdk bot closed this Aug 10, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Aug 10, 2022
@openjdk
Copy link

openjdk bot commented Aug 10, 2022

@alexeysemenyukoracle @akashche Pushed as commit e4925a3.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@akashche akashche deleted the JDK-8291924 branch August 10, 2022 20:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants