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.

Sign up for GitHub

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
akashche wants to merge 3 commits into from
Closed

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f76267
8291924: jpackage: l10n for Windows context menu label
akashche Aug 4, 2022
227ad5d
reg method access, drop l10n entries, label check enhancement
akashche Aug 5, 2022
ff3d8ae
add english entries to l10n files
akashche Aug 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixAppImageFragmentBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ private List<String> addFaComponents(XMLStreamWriter xml,

xml.writeStartElement("Verb");
xml.writeAttribute("Id", "open");
xml.writeAttribute("Command", "Open");
xml.writeAttribute("Command", "!(loc.ContextMenuCommandLabel)");
xml.writeAttribute("Argument", "\"%1\" %*");
xml.writeAttribute("TargetFile", Id.File.of(fa.launcherPath));
xml.writeEndElement(); // <Verb>
Expand Down
1 change: 1 addition & 0 deletions src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_en.wxl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@
<String Id="ShortcutPromptDlgDesktopShortcutControlLabel">Create desktop shortcut(s)</String>
<String Id="ShortcutPromptDlgStartMenuShortcutControlLabel">Create start menu shortcut(s)</String>
<String Id="InstallDirNotEmptyDlg_Title">[ProductName] Setup</String>
<String Id="ContextMenuCommandLabel">Open with [ProductName]</String>
</WixLocalization>
12 changes: 12 additions & 0 deletions test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,18 @@ PackageTest addHelloAppFileAssociationsVerifier(FileAssociations fa) {
HelloApp.verifyOutputFile(appOutput, expectedArgs,
Collections.emptyMap());
});

if (TKit.isWindows()) {
// Verify context menu label in registry.
String progId = WindowsHelper.queryRegistryValue(
String.format("HKEY_LOCAL_MACHINE\\SOFTWARE\\Classes\\%s", fa.getSuffix()), "");
TKit.assertNotNull(progId, "context menu progId found");
String contextMenuLabel = WindowsHelper.queryRegistryValue(
String.format("HKEY_CLASSES_ROOT\\%s\\shell\\open", progId), "");
TKit.assertNotNull(contextMenuLabel, "context menu label found");
String appName = cmd.getArgumentValue("--name");
TKit.assertTrue(String.format("Open with %s", appName).equals(contextMenuLabel), "context menu label text");
}
});

return this;
Expand Down
2 changes: 1 addition & 1 deletion test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ private void verifyFileAssociations(boolean exists, String suffix,
private final String name;
}

private static String queryRegistryValue(String keyPath, String valueName) {
static String queryRegistryValue(String keyPath, String valueName) {
var status = Executor.of("reg", "query", keyPath, "/v", valueName)
.saveOutput()
.executeWithoutExitCodeCheck();
Expand Down