Pull request #14918: REPORT-135046 feat:设计器语言切换支持扩展新语种

Merge in DESIGN/design from ~OBO/design:feature/x to feature/x

* commit '83ad455a6794b2661942849b12b965f32c8c3f51':
  配置放在设计器模块
  配置放在设计器模块
  REPORT-135046 feat:设计器语言切换支持扩展新语种

designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@@ -40,19 +40,17 @@ import com.fr.design.mainframe.vcs.ui.UIPositiveIntEditor;
 import com.fr.design.mainframe.vcs.ui.VcsMovePanel;
 import com.fr.design.os.impl.SupportOSImpl;
 import com.fr.design.unit.UnitConvertUtil;
+import com.fr.design.utils.DesignUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.design.widget.FRWidgetFactory;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRFont;
-import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
 import com.fr.general.Inter;
 import com.fr.general.log.Log4jConfig;
 import com.fr.io.attr.ImageExportAttr;
-import com.fr.locale.InterProviderFactory;
 import com.fr.log.FineLoggerFactory;
 import com.fr.report.ReportConfigManager;
-import com.fr.scheduler.tool.FineScheduler;
 import com.fr.stable.Constants;
 import com.fr.stable.os.OperatingSystem;
 import com.fr.third.apache.logging.log4j.Level;
@@ -76,7 +74,6 @@ import javax.swing.ButtonGroup;
 import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JFileChooser;
-import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JProgressBar;
@@ -89,7 +86,15 @@ import javax.swing.UIManager;
 import javax.swing.border.EmptyBorder;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dialog;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyAdapter;
@@ -816,7 +821,7 @@ public class PreferencePane extends BasicPane {
     }
 
     private UIDictionaryComboBox<Locale> createLanguageComboBox() {
-        Map<Locale, String> map = InterProviderFactory.getProvider().getSupportLocaleMap();
+        Map<Locale, String> map = DesignUtils.getAvailableLanguages();
         int size = map.size();
         Locale[] keys = new Locale[size];
         String[] values = new String[size];

designer-base/src/main/java/com/fr/design/i18n/DesignExtendLanguageConfig.java

@@ -0,0 +1,56 @@
+package com.fr.design.i18n;
+
+import com.fr.config.ConfigContext;
+import com.fr.config.DefaultConfiguration;
+import com.fr.config.Identifier;
+import com.fr.config.holder.factory.Holders;
+import com.fr.config.holder.impl.MapConf;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 设计器语言扩展配置
+ *
+ * @author obo
+ * @since 11.0
+ * Created on 2024/09/26
+ */
+public class DesignExtendLanguageConfig extends DefaultConfiguration {
+
+    private static volatile DesignExtendLanguageConfig designExtendLanguageConfig = null;
+
+    /**
+     * 获取实例
+     */
+    public static DesignExtendLanguageConfig getInstance() {
+        if (designExtendLanguageConfig == null) {
+            designExtendLanguageConfig = ConfigContext.getConfigInstance(DesignExtendLanguageConfig.class);
+        }
+        return designExtendLanguageConfig;
+    }
+
+    /**
+     * 设计器扩展的语言
+     * key为localeString，例如en_US或en；value为改语言对应的国际化翻译key
+     */
+    @Identifier("extendDesignLocales")
+    private MapConf<Map<String, String>> extendDesignLocales = Holders.map(new HashMap<>(), String.class, String.class);
+
+    public Map<String, String> getExtendedDesignLocales() {
+        return Collections.unmodifiableMap(extendDesignLocales.get());
+    }
+
+    public void setExtendedDesignLocales(Map<String, String> map) {
+        extendDesignLocales.set(map);
+    }
+
+    @Override
+    public Object clone() throws CloneNotSupportedException {
+        DesignExtendLanguageConfig cloned = (DesignExtendLanguageConfig) super.clone();
+        cloned.extendDesignLocales = ( MapConf<Map<String, String>>) extendDesignLocales.clone();
+        return cloned;
+    }
+
+}

designer-base/src/main/java/com/fr/design/utils/DesignUtils.java

@@ -11,6 +11,7 @@ import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.fun.DefaultValueAdjustProvider;
 import com.fr.design.fun.DesignerEnvProcessor;
 import com.fr.design.gui.UILookAndFeel;
+import com.fr.design.i18n.DesignExtendLanguageConfig;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.ui.util.UIUtil;
@@ -19,10 +20,12 @@ import com.fr.file.FileFILE;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRFont;
 import com.fr.general.GeneralContext;
+import com.fr.general.SupportLocale;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.injectable.PluginModule;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.CommonCodeUtils;
+import com.fr.stable.CommonUtils;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.bridge.ObjectHolder;
@@ -50,8 +53,11 @@ import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
+import java.util.Collections;
 import java.util.Enumeration;
+import java.util.LinkedHashMap;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
@@ -496,4 +502,15 @@ public class DesignUtils {
         return Utils.getAvailableFontFamilyNames4Report();
     }
 
+    /**
+     * 获取设计器可用的开放的语言配置，包括默认开放的五种语言和finedb扩展项
+     * @return Locale和翻译对应的key
+     */
+    public static Map<Locale, String> getAvailableLanguages() {
+        Map<Locale, String> map = new LinkedHashMap<>(SupportLocale.getInstance().getLocaleMap());
+        for (Map.Entry<String, String> entry : DesignExtendLanguageConfig.getInstance().getExtendedDesignLocales().entrySet()) {
+            map.put(CommonUtils.stringToLocale(entry.getKey()), entry.getValue());
+        }
+        return Collections.unmodifiableMap(map);
+    }
 }