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

Jump to bottom

8351223: Update localized resources in keytool and jarsigner #23911

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

8351223: Update localized resources in keytool and jarsigner #23911

wants to merge 3 commits into from
+63 −63

Conversation

justin-curtis-lu
Copy link
Member

@justin-curtis-lu justin-curtis-lu commented Mar 5, 2025 •
edited by openjdk bot
Loading

Please review this PR which provides localization updates for resources in jarsigner and keytool.
The key/vals in this PR are updated to match the changes made in the English source files.
Further context is provided on the JBS issue.

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-8351223: Update localized resources in keytool and jarsigner (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23911

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 5, 2025

👋 Welcome back jlu! 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
Copy link

openjdk bot commented Mar 5, 2025 •
edited
Loading

@justin-curtis-lu 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:

8351223: Update localized resources in keytool and jarsigner

Reviewed-by: weijun

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 14 new commits pushed to the master branch:

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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot changed the title JDK-8351223: Update localized resources in keytool and jarsigner 8351223: Update localized resources in keytool and jarsigner Mar 5, 2025
@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 5, 2025
@openjdk
Copy link

openjdk bot commented Mar 5, 2025

@justin-curtis-lu The following label will be automatically applied to this pull request:

  • security

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.

@mlbridge
Copy link

mlbridge bot commented Mar 5, 2025

Webrevs

@mpdonova
Copy link
Contributor

mpdonova commented Mar 5, 2025

looks good to me, thanks

wangweij
wangweij reviewed Mar 5, 2025
View reviewed changes
src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java
{"size.bit.alg",
"%1$d-Bit %2$s"},
{"Generating.full.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.days.for",
"Schl\u00FCsselpaar {0} und selbstsigniertes Zertifikat ({1}) werden mit einer G\u00FCltigkeit von {2} Tagen generiert\n\tf\u00FCr: {3}"},
Copy link
Contributor

Choose a reason for hiding this comment

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

Putting {0} (which is size and type) after "Schlüsselpaar" sounds strange. I understand you don't want to put {0} in parentheses because the value itself might contain parentheses (For example, 384-Bit EC (secp384r1)). Maybe we can add a "mit" in between?

Also, Why change from active voice in the present continuous tense to passive voice in the simple present tense?

src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java
{"Generating.full.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.days.for",
"\u6B63\u5728\u4E3A {3} \u751F\u6210\u6709\u6548\u671F\u4E3A {2} \u5929\u7684 {0} \u5BC6\u94A5\u5BF9\u548C\u81EA\u7B7E\u540D\u8BC1\u4E66 ({1})\n"},
{"Generating.full.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.days.for",
"\u751F\u6210 {0} \u5BC6\u94A5\u5BF9\u548C <{2}> \u9881\u53D1\u7684\u8BC1\u4E66 ({1})\uFF0C\u6709\u6548\u671F\u4E3A {3} \u5929 \n\t \u5BF9\u4E8E\uFF1A{4}"},
Copy link
Contributor

Choose a reason for hiding this comment

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

Why not make the two strings consistent?

I think the 1st one "正在为 {3} 生成有效期为 {2} 天的 {0} 密钥对和自签名证书 ({1})\n" is very good, and suggest the 2nd one to be "正在为 {4} 生成有效期为 {3} 天的 {0} 密钥对和由 <{3}> 颁发的证书 ({2})\n".

Copy link
Member Author

Choose a reason for hiding this comment

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

As we discussed, we'll address any translation quality improvements in the JDK25 L10N drop.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 5, 2025
@artur-oracle
Copy link
Contributor

Hi @justin-curtis-lu! Just curious how urgent is this change? I'm going to finish the .java -> .properties conversion draft soon and then you can modify the properties files in plain UTF-8 text:
#22774

@justin-curtis-lu
Copy link
Member Author

Hi @justin-curtis-lu! Just curious how urgent is this change? I'm going to finish the .java -> .properties conversion draft soon and then you can modify the properties files in plain UTF-8 text: #22774

We want to get this into 24.0.2 . I think it would be preferable to get this change in now, as review has already been completed. Any updates for these files that occur in the next L10n update can be reviewed under the properties format as UTF-8 native. But please let me know otherwise.

@artur-oracle
Copy link
Contributor

Hi @justin-curtis-lu! Just curious how urgent is this change? I'm going to finish the .java -> .properties conversion draft soon and then you can modify the properties files in plain UTF-8 text: #22774

We want to get this into 24.0.2 . I think it would be preferable to get this change in now, as review has already been completed. Any updates for these files that occur in the next L10n update can be reviewed under the properties format as UTF-8 native. But please let me know otherwise.

The thing is that my draft is pretty much ready and it's converting the same Resources files that you are modifying here. So if it's urgent I'll wait until you integrate this PR and then re-convert the files being changed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wangweij wangweij wangweij approved these changes

Assignees
No one assigned
Labels
ready Pull request is ready to be integrated rfr Pull request is ready for review security [email protected]
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@justin-curtis-lu @mpdonova @artur-oracle @wangweij