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

8322041: JDK 22 RDP1 L10n resource files update #17096

Closed
wants to merge 2 commits into from

Conversation

alisenchung
Copy link
Contributor

@alisenchung alisenchung commented Dec 13, 2023

Translation drop for JDK22 RDP1


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-8322041: JDK 22 RDP1 L10n resource files update (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17096

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 13, 2023

👋 Welcome back achung! 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 Dec 13, 2023

@alisenchung The following labels will be automatically applied to this pull request:

  • compiler
  • core-libs
  • javadoc

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

@openjdk openjdk bot added javadoc javadoc-dev@openjdk.org core-libs core-libs-dev@openjdk.org compiler compiler-dev@openjdk.org labels Dec 13, 2023
@alisenchung alisenchung changed the title : JDK 22 RDP1 L10n resource files update 8322041: JDK 22 RDP1 L10n resource files update Dec 13, 2023
@alisenchung alisenchung marked this pull request as ready for review December 13, 2023 22:22
@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 13, 2023
@mlbridge
Copy link

mlbridge bot commented Dec 13, 2023

Webrevs

@victordyakov
Copy link

@alexeysemenyukoracle please review jpackage part

@alisenchung
Copy link
Contributor Author

@JoeWang-Java can u review the xml changes?

@alisenchung
Copy link
Contributor Author

@jonathan-gibbons can u review the compiler changes?

Copy link
Member

@sashamatveev sashamatveev left a comment

Choose a reason for hiding this comment

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

jpackage part looks fine.

@openjdk
Copy link

openjdk bot commented Dec 14, 2023

@alisenchung 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:

8322041: JDK 22 RDP1 L10n resource files update

Reviewed-by: almatvee, cstein, asemenyuk, joehw, jjg

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

  • dcdcd48: 8321479: java -D-D crashes
  • 87ef733: 8321958: @param/@return descriptions of ZoneRules#isDaylightSavings() are incorrect
  • 05f7f0a: 8321288: [JVMCI] HotSpotJVMCIRuntime doesn't clean up WeakReferences in resolvedJavaTypes
  • 6311dab: 8322018: Test java/lang/String/CompactString/MaxSizeUTF16String.java fails with -Xcomp
  • bdebf19: 8322175: test/langtools/tools/javac/classreader/BadMethodParameter.java doesn't compile
  • 20de541: 8322040: Missing array bounds check in ClassReader.parameter
  • b31454e: 8322098: os::Linux::print_system_memory_info enhance the THP output with /sys/kernel/mm/transparent_hugepage/hpage_pmd_size
  • 0be0775: 8320397: RISC-V: Avoid passing t0 as temp register to MacroAssembler:: cmpxchg_obj_header/cmpxchgptr
  • 6dfb812: 8321823: Remove redundant PhaseGVN transform_no_reclaim
  • a7dde57: 8322057: Memory leaks in creating jfr symbol array
  • ... and 69 more: https://git.openjdk.org/jdk/compare/4ed38f5ad5f822ab948257ed39717ea919fd32ed...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.

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

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 14, 2023
@sormuras
Copy link
Member

sormuras commented Dec 14, 2023

German translations read OK.

Nit: some layouts get lost in translated files - it would be great to have similar usage of \n\ and \ in the translated files.

For example, the English file src/java.base/share/classes/sun/launcher/resources/launcher.properties has good (easy to compare) layout:

java.launcher.opt.header  =   Usage: {0} [options] <mainclass> [args...]\n\
\           (to execute a class)\n\
\   or  {0} [options] -jar <jarfile> [args...]\n\
\           (to execute a jar file)\n\
\   or  {0} [options] -m <module>[/<mainclass>] [args...]\n\
\       {0} [options] --module <module>[/<mainclass>] [args...]\n\
\           (to execute the main class in a module)\n\
\   or  {0} [options] <sourcefile> [args]\n\
\           (to execute a source-file program)\n\n\
[...]

The German translation in src/java.base/share/classes/sun/launcher/resources/launcher_de.properties uses only a single line in its properties file:

java.launcher.opt.header  =   Verwendung: {0} [Optionen] <Hauptklasse> [args...]\n           (zur Ausführung einer Klasse)\n   oder  {0} [Optionen] -jar <JAR-Datei> [args...]\n           (zur Ausführung einer JAR-Datei)\n   oder  {0} [Optionen] -m <Modul>[/<Hauptklasse>] [args...]\n       {0} [Optionen] --module <Modul>[/<Hauptklasse>] [args...]\n            (zur Ausführung der Hauptklasse in einem Modul)\n   oder  {0} [Optionen] <Quelldatei> [args]\n           (zur Ausführung eines Programms mit einer Quelldatei)\n\n[...]

Changes in the latter are not easy to spot and review.

@@ -323,3 +326,7 @@
# Catalog 09
# Technical term, do not translate: catalog
CatalogException=JAXP00090001: CatalogResolver ist mit dem Katalog "{0}" aktiviert, eine CatalogException wird jedoch zurückgegeben.

# Implementation Property DTD
JDK_DTD_DENY = JAXP00010008: DOCTYPE ist nicht zulässig, wenn die DTD-Eigenschaft auf "Ablehnen" gesetzt wurde. Weitere Informationen: Eigenschaft jdk.xml.dtd.support in java.xml/module-summary.
Copy link
Member

Choose a reason for hiding this comment

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

This version quoted "Ablehnen" while the other two (ja - "拒否" and zh_CN - "拒绝") didn't. If we want to be consistent, "deny" would be better since that's the literal value. The English version should have quoted "deny".

The previous translations in these files have not been consistent. Some of the key words were translated. If we want to keep this translation as is, it's probably better to remove the quote in the "de" file.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

removed quotes around Ablehnen

Comment on lines +110 to +111
doclet.UnknownTag=不明なタグ。未登録のカスタム・タグ?
doclet.UnknownTagWithHint=不明なタグ。入力ミスによる@{0}または未登録のカスタム・タグ?
Copy link
Member

Choose a reason for hiding this comment

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

Simply appending a question mark may read a bit odd, although it is a straightforward translation from English.

Comment on lines +87 to +88
dc.unknown.javadoc.tag = 不明なタグ。未登録のカスタム・タグ?
dc.unknown.javadoc.tag.with.hint = 不明なタグ。入力ミスによる@{0}または未登録のカスタム・タグ?
Copy link
Member

Choose a reason for hiding this comment

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

same here

Copy link
Member

@justin-curtis-lu justin-curtis-lu left a comment

Choose a reason for hiding this comment

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

All around LGTM. From a skim I don't see any of the typical l10n related file mode issues, line ending issues, or values that should not be changed (like WixLocalization Culture). Might be worth filing a bug against the translation tool to see if it could support multi line translations for localized versions as @sormuras pointed out.


compiler.warn.underscore.as.identifier=Ab Release 9 ist "_" ein Schlüsselwort und kann nicht als ID verwendet werden

compiler.err.underscore.as.identifier=Ab Release 9 ist "_" ein Schlüsselwort und kann nicht als ID verwendet werden

compiler.err.use.of.underscore.not.allowed=Ab Release 21 ist nur das Unterstrichschlüsselwort "_" zulässig, um\nunbenannte Muster, lokale Variablen, Ausnahmeparameter oder Lambda-Parameter zu deklarieren
compiler.err.use.of.underscore.not.allowed=Unterstrich ist hier nicht zulässig\nAb Release 9 ist ''_'' ein Schlüsselwort und kann nicht als ID verwendet werden\nAb Release 22 kann ''_'' als Name in der Deklaration unbenannter Muster, lokaler Variablen, Ausnahmeparameter oder Lambda-Parameter verwendet werden
Copy link
Member

Choose a reason for hiding this comment

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

Just an observation, but the double quotes were converted to (two) single quotes. Previously, localized de files represented '' '' as " ", as different languages have different l10n rules (according to the translation contact). And this is seen with the other values on this file using "" instead of '' ''.

But here it looks like they updated the value to match the quotes in of the value in the original .properties files. Not sure if they updated the rules and this is intentional, or unintentional.

@alexeysemenyukoracle
Copy link
Member

jpackage changes look good

@alisenchung
Copy link
Contributor Author

mach5 looks green

Copy link
Member

@JoeWang-Java JoeWang-Java left a comment

Choose a reason for hiding this comment

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

The java.xml changes look good.

Copy link
Contributor

@jonathan-gibbons jonathan-gibbons left a comment

Choose a reason for hiding this comment

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

The diffs are more conveniently available here:
https://cr.openjdk.org/~jjg/jdk-l10n-diffs--15dec23/

The compiler and javadoc diffs look "ok" but I cannot read most other languages, and cannot comment on the quality of the translations. I do see that there are places where a translation has been edited where the English original has not. I also see issues with some of the English messages, but that is not for here.

My "approval" is just for jdk.compiler and jdk.javadoc files.

@alisenchung
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Dec 16, 2023

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

  • dcdcd48: 8321479: java -D-D crashes
  • 87ef733: 8321958: @param/@return descriptions of ZoneRules#isDaylightSavings() are incorrect
  • 05f7f0a: 8321288: [JVMCI] HotSpotJVMCIRuntime doesn't clean up WeakReferences in resolvedJavaTypes
  • 6311dab: 8322018: Test java/lang/String/CompactString/MaxSizeUTF16String.java fails with -Xcomp
  • bdebf19: 8322175: test/langtools/tools/javac/classreader/BadMethodParameter.java doesn't compile
  • 20de541: 8322040: Missing array bounds check in ClassReader.parameter
  • b31454e: 8322098: os::Linux::print_system_memory_info enhance the THP output with /sys/kernel/mm/transparent_hugepage/hpage_pmd_size
  • 0be0775: 8320397: RISC-V: Avoid passing t0 as temp register to MacroAssembler:: cmpxchg_obj_header/cmpxchgptr
  • 6dfb812: 8321823: Remove redundant PhaseGVN transform_no_reclaim
  • a7dde57: 8322057: Memory leaks in creating jfr symbol array
  • ... and 69 more: https://git.openjdk.org/jdk/compare/4ed38f5ad5f822ab948257ed39717ea919fd32ed...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 16, 2023
@openjdk openjdk bot closed this Dec 16, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 16, 2023
@openjdk
Copy link

openjdk bot commented Dec 16, 2023

@alisenchung Pushed as commit b061b66.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
compiler compiler-dev@openjdk.org core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated javadoc javadoc-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

9 participants