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.

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

Update title/description of env vars in MSI installer #945

Merged
merged 4 commits into from
Jul 15, 2024
Merged

Update title/description of env vars in MSI installer #945

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
40c61e1
Update OpenJDK.Base.en-us.wxl.template
brunoborges Jul 9, 2024
9edd814
Update wix/Lang/OpenJDK.Base.en-us.wxl.template
brunoborges Jul 12, 2024
167148d
Update OpenJDK.Base.en-us.wxl.template
brunoborges Jul 12, 2024
f40db5f
Merge branch 'master' into patch-1
brunoborges Jul 13, 2024
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
9 changes: 5 additions & 4 deletions wix/Lang/OpenJDK.Base.en-us.wxl.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
<String Id="OSVersionRequired" Value="Windows 7 or later is required." />
<!-- <String Id="NewerVersionInstalled">Newer version of OpenJDK is already installed.</String> -->
<String Id="ProductIsNotSupportedOnItanium" Value="This product is not supported on Itanium 64-bit systems." />
<String Id="FeatureEnvironmentTitle" Value="Add to PATH" />
<String Id="FeatureEnvironmentDescription" Value="Add to PATH environment variable." />
<String Id="FeatureJavaHomeTitle" Value="Set JAVA_HOME variable" />
<String Id="FeatureJavaHomeDescription" Value="Set JAVA_HOME environment variable." />
<String Id="FeatureEnvironmentTitle" Value="Modify PATH variable" />
<String Id="FeatureEnvironmentDescription" Value="Modify PATH environment variable by prepending the JDK installation directory to the beginning of PATH." />
Copy link
Member

Choose a reason for hiding this comment

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

This feels pretty long? Have you built the MSI locally or downloaded one built in the GitHub workflow to see if this actually fits in the box?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It should fit based on a visual assessment :P

Copy link
Contributor

@jmjaffe37 jmjaffe37 Jul 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

@gdams, @brunoborges, here are some screenshots (ignore the logo, I made these locally just to test the visuals of the new wording):

Copy link
Contributor

Choose a reason for hiding this comment

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

image

Copy link
Contributor

Choose a reason for hiding this comment

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

image

Copy link
Contributor

Choose a reason for hiding this comment

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

Based on previous test, it must fit:
#732 (comment)

Copy link
Member

Choose a reason for hiding this comment

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

@douph1 are you able to provide the french text updates for this PR?

Also ping @hendrikebbers @CarmenDelgadoEclipse and @zdtsw who may be able to help with the other locales

Copy link
Contributor

Choose a reason for hiding this comment

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

is that to have a PR for https://github.com/brunoborges/installer/blame/patch-1/wix/Lang/OpenJDK.Base.zh-cn.wxl.template on line 10-13?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@zdtsw I believe it is easier by looking at the diff of this PR. There are now a total of 5 lines being modified here. They are related to the following Id items:

  • FeatureEnvironmentTitle
  • FeatureEnvironmentDescription
  • FeatureJavaHomeTitle
  • FeatureJavaHomeDescription
  • BrowseDlg_Title

Copy link
Contributor

Choose a reason for hiding this comment

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

ref: #951

<String Id="FeatureJavaHomeTitle" Value="Set or override JAVA_HOME variable" />
<String Id="FeatureJavaHomeDescription" Value="Sets or overrides JAVA_HOME environment variable with the JDK installation directory." />
<String Id="FeatureSourceTitle" Value="Source Code" />
<String Id="FeatureSourceDescription" Value="Source code for classes that comprise the public API of Java." />
<String Id="FeatureJarFileRunWithTitle" Value="Associate .jar" />
brunoborges marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -26,4 +26,5 @@
<String Id="CustomScopeDlgTitle" Value="{\WixUI_Font_Title}Installation Scope" />
<String Id="CustomScopeDlgPerUser" Value="Install &amp;just for you ([LogonUser])" />
<String Id="CustomScopeDlgPerMachine" Value="Install for all users of this &amp;machine" />
<String Id="BrowseDlg_Title" Value="[ProductName] Browse" />
</WixLocalization>