Merge pull request #752 in BA/design from ~PLOUGH/design:dev to dev

* commit 'baf564760bb4d7eefec8a6db88aa30747f854261':
  调整代码
  REPORT-2093 英文设计器启动时，右下角的鸣谢部分请去掉；关于设计器部分的鸣谢也去掉

designer/src/com/fr/start/ReportSplashPane.java

@@ -4,6 +4,7 @@
 package com.fr.start;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.FRContext;
 import com.fr.base.GraphHelper;
 import com.fr.design.mainframe.bbs.BBSConstants;
 import com.fr.general.GeneralContext;
@@ -18,6 +19,7 @@ import java.awt.*;
 import java.awt.font.FontRenderContext;
 import java.awt.font.LineMetrics;
 import java.awt.image.BufferedImage;
+import java.util.Locale;
 import java.util.Random;
 import java.util.TimerTask;
 
@@ -117,9 +119,22 @@ public class ReportSplashPane extends SplashPane{
         GraphHelper.drawString(splashG2d, showText, MODULE_INFO_X, y);
         
         //每次随机感谢一位论坛用户
-        splashG2d.setPaint(THANK_COLOR);
-        String content = Inter.getLocText("FR-Designer_Thanks-To") + GUEST;
-        GraphHelper.drawString(splashG2d, content, THANK_INFO_X, y);
+        if (shouldShowThanks()) {
+            splashG2d.setPaint(THANK_COLOR);
+            String content = Inter.getLocText("FR-Designer_Thanks-To") + GUEST;
+            GraphHelper.drawString(splashG2d, content, THANK_INFO_X, y);
+        }
+    }
+
+    // 是否显示鸣谢文字
+    private boolean shouldShowThanks() {
+        Locale[] hideLocales = {Locale.US, Locale.KOREA, Locale.JAPAN};
+        for (Locale loc : hideLocales) {
+            if (FRContext.getLocale().equals(loc)) {
+                return false;
+            }
+        }
+        return true;
     }
     
     private static String getRandomUser(){

designer_base/src/com/fr/design/actions/help/AboutPane.java

@@ -68,10 +68,7 @@ public class AboutPane extends JPanel {
                         Inter.getLocText("FR-Designer-Basic_Activation_Key_Copy_OK")
                 }));
 
-        // 英文去掉服务电话和 QQ
-        if (FRContext.getLocale().equals(Locale.US)){
-            // do nothing
-        } else {
+        if (shouldShowPhoneAndQQ()){
             if(ComparatorUtils.equals(ProductConstants.APP_NAME,FINEREPORT)){
                 boxCenterAlignmentPane = new BoxCenterAligmentPane(Inter.getLocText("FR-Designer_Service_Phone") + ProductConstants.COMPARE_TELEPHONE);
                 contentPane.add(boxCenterAlignmentPane);
@@ -85,8 +82,24 @@ public class AboutPane extends JPanel {
         
         contentPane.add(actionLabel);
         contentPane.add(emailLabel);
-        
-        addThankPane(contentPane);
+        if (shouldShowThanks()) {
+            addThankPane(contentPane);
+        }
+    }
+
+    // 是否显示服务电话和 qq
+    private boolean shouldShowPhoneAndQQ() {
+        return !FRContext.getLocale().equals(Locale.US);
+    }
+    // 是否显示鸣谢面板
+    private boolean shouldShowThanks() {
+        Locale[] hideLocales = {Locale.US, Locale.KOREA, Locale.JAPAN};
+        for (Locale loc : hideLocales) {
+            if (FRContext.getLocale().equals(loc)) {
+                return false;
+            }
+        }
+        return true;
     }
     
     //添加鸣谢面板