infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8338918: Remove non translated file name from WinResources resource bundle

Browse Source 
Reviewed-by: jlu, almatvee
This commit is contained in:
Alexey Semenyuk 2024-09-24 00:13:49 +00:00
parent e97f0fe1b4
commit cd796e0aef
9 changed files with 154 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/jdk.jpackage/share/classes/jdk/jpackage/internal/I18N.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -24,36 +24,64 @@
*/
package jdk.jpackage.internal;
import java.util.ArrayList;
import java.util.List;
import java.util.ListResourceBundle;
import java.util.Map;
import jdk.internal.util.OperatingSystem;
import java.util.ResourceBundle;
import static java.util.stream.Collectors.toMap;
import java.util.stream.Stream;
class I18N {
static String getString(String key) {
if (PLATFORM.containsKey(key)) {
return PLATFORM.getString(key);
}
return SHARED.getString(key);
return BUNDLE.getString(key);
}
private static final ResourceBundle SHARED = ResourceBundle.getBundle(
"jdk.jpackage.internal.resources.MainResources");
private static class MultiResourceBundle extends ListResourceBundle {
private static final ResourceBundle PLATFORM;
MultiResourceBundle(ResourceBundle... bundles) {
contents = Stream.of(bundles).map(bundle -> {
return bundle.keySet().stream().map(key -> {
return Map.entry(key, bundle.getObject(key));
});
}).flatMap(x -> x).collect(toMap(Map.Entry::getKey, Map.Entry::getValue, (o, n) -> {
// Override old value with the new one
return n;
})).entrySet().stream().map(e -> {
return new Object[]{e.getKey(), e.getValue()};
}).toArray(Object[][]::new);
}
@Override
protected Object[][] getContents() {
return contents;
}
private final Object[][] contents;
}
private static final MultiResourceBundle BUNDLE;
static {
List<String> bundleNames = new ArrayList<>();
bundleNames.add("jdk.jpackage.internal.resources.MainResources");
if (OperatingSystem.isLinux()) {
PLATFORM = ResourceBundle.getBundle(
"jdk.jpackage.internal.resources.LinuxResources");
bundleNames.add("jdk.jpackage.internal.resources.LinuxResources");
} else if (OperatingSystem.isWindows()) {
PLATFORM = ResourceBundle.getBundle(
"jdk.jpackage.internal.resources.WinResources");
bundleNames.add("jdk.jpackage.internal.resources.WinResources");
bundleNames.add("jdk.jpackage.internal.resources.WinResourcesNoL10N");
} else if (OperatingSystem.isMacOS()) {
PLATFORM = ResourceBundle.getBundle(
"jdk.jpackage.internal.resources.MacResources");
bundleNames.add("jdk.jpackage.internal.resources.MacResources");
} else {
throw new IllegalStateException("Unknown platform");
}
BUNDLE = new MultiResourceBundle(bundleNames.stream().map(ResourceBundle::getBundle)
.toArray(ResourceBundle[]::new));
}
}

1
src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties
View File

@ -35,7 +35,6 @@ resource.setup-icon=setup dialog icon
resource.post-app-image-script=script to run after application image is populated
resource.post-msi-script=script to run after msi file for exe installer is created
resource.wxl-file=WiX localization file
resource.wxl-file-name=MsiInstallerStrings_en.wxl
resource.main-wix-file=Main WiX project file
resource.overrides-wix-file=Overrides WiX project file
resource.shortcutpromptdlg-wix-file=Shortcut prompt dialog WiX project file

28
src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResourcesNoL10N.properties Normal file
View File

@ -0,0 +1,28 @@
#
# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 only, as
# published by the Free Software Foundation. Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the LICENSE file that accompanied this code.
#
# This code is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# version 2 for more details (a copy is included in the LICENSE file that
# accompanied this code).
#
# You should have received a copy of the GNU General Public License version
# 2 along with this work; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
# or visit www.oracle.com if you need additional information or have any
# questions.
#
#
resource.wxl-file-name=MsiInstallerStrings_en.wxl

28
src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResourcesNoL10N_de.properties Normal file
View File

@ -0,0 +1,28 @@
#
# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 only, as
# published by the Free Software Foundation. Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the LICENSE file that accompanied this code.
#
# This code is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# version 2 for more details (a copy is included in the LICENSE file that
# accompanied this code).
#
# You should have received a copy of the GNU General Public License version
# 2 along with this work; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
# or visit www.oracle.com if you need additional information or have any
# questions.
#
#
resource.wxl-file-name=MsiInstallerStrings_de.wxl

28
src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResourcesNoL10N_ja.properties Normal file
View File

@ -0,0 +1,28 @@
#
# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 only, as
# published by the Free Software Foundation. Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the LICENSE file that accompanied this code.
#
# This code is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# version 2 for more details (a copy is included in the LICENSE file that
# accompanied this code).
#
# You should have received a copy of the GNU General Public License version
# 2 along with this work; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
# or visit www.oracle.com if you need additional information or have any
# questions.
#
#
resource.wxl-file-name=MsiInstallerStrings_ja.wxl

28
src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResourcesNoL10N_zh_CN.properties Normal file
View File

@ -0,0 +1,28 @@
#
# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 only, as
# published by the Free Software Foundation. Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the LICENSE file that accompanied this code.
#
# This code is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# version 2 for more details (a copy is included in the LICENSE file that
# accompanied this code).
#
# You should have received a copy of the GNU General Public License version
# 2 along with this work; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
# or visit www.oracle.com if you need additional information or have any
# questions.
#
#
resource.wxl-file-name=MsiInstallerStrings_zh_CN.wxl

1
src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_de.properties
View File

@ -35,7 +35,6 @@ resource.setup-icon=Symbol für Dialogfeld "Setup"
resource.post-app-image-script=Auszuführendes Skript nach dem Auffüllen des Anwendungsimages
resource.post-msi-script=Auszuführendes Skript nach dem Erstellen der MSI-Datei für das EXE-Installationsprogramm
resource.wxl-file=WiX-Lokalisierungsdatei
resource.wxl-file-name=MsiInstallerStrings_de.wxl
resource.main-wix-file=Haupt-WiX-Projektdatei
resource.overrides-wix-file=Überschreibt WiX-Projektdatei
resource.shortcutpromptdlg-wix-file=Dialogfeld für Verknüpfungs-Prompt der WiX-Projektdatei

1
src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties
View File

@ -35,7 +35,6 @@ resource.setup-icon=設定ダイアログ・アイコン
resource.post-app-image-script=アプリケーション・イメージを移入した後に実行するスクリプト
resource.post-msi-script=exeインストーラのmsiファイルが作成された後に実行するスクリプト
resource.wxl-file=WiXローカリゼーション・ファイル
resource.wxl-file-name=MsiInstallerStrings_ja.wxl
resource.main-wix-file=メインWiXプロジェクト・ファイル
resource.overrides-wix-file=WiXプロジェクト・ファイルのオーバーライド
resource.shortcutpromptdlg-wix-file=ショートカット・プロンプト・ダイアログWiXプロジェクト・ファイル

1
src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties
View File

@ -35,7 +35,6 @@ resource.setup-icon=设置对话框图标
resource.post-app-image-script=要在填充应用程序映像之后运行的脚本
resource.post-msi-script=在为 exe 安装程序创建 msi 文件之后要运行的脚本
resource.wxl-file=WiX 本地化文件
resource.wxl-file-name=MsiInstallerStrings_zh_CN.wxl
resource.main-wix-file=主 WiX 项目文件
resource.overrides-wix-file=覆盖 WiX 项目文件
resource.shortcutpromptdlg-wix-file=快捷方式提示对话框 WiX 项目文件