Merge pull request #1495 in BA/design from ~PAUL/design:8.0 to 8.0

* commit '2e70e2de315e5a4a9fd37905751233c6b38a4388':
  CHART-1759  国际化问题
  REPORT-5687 日期选择了yyyy-M-d但是设计器里显示的不对.

designer_base/src/com/fr/design/gui/style/FormatPane.java

@@ -222,7 +222,7 @@ public class FormatPane extends AbstractBasicStylePane {
 
     private void setPatternComboBoxAndList(int formatStyle, String pattern) {
         this.typeComboBox.setSelectedItem(formatStyle);
-        int i = isArrayContainPattern(FormatField.getInstance().getFormatArray(formatStyle), pattern);
+        int i = isArrayContainPattern(FormatField.getInstance().getFormatArray(formatStyle, false), pattern);
         if (i == -1) {
             this.patternList.setSelectedIndices(ArrayUtils.EMPTY_INT_ARRAY);
         } else {

designer_chart/src/com/fr/design/chart/report/MapDataPane.java

@@ -88,7 +88,7 @@ public class MapDataPane extends DataContentsPane {
 					protected void initLayout() {
 						this.setLayout(new BorderLayout(0, 6));
 						JPanel northPane = new JPanel(new FlowLayout(FlowLayout.LEFT));
-						northPane.add(new BoldFontTextLabel(Inter.getLocText("Map Show Type") + ":"));
+						northPane.add(new BoldFontTextLabel(Inter.getLocText("FR-Chart-Map_ShowWay") + ":"));
 						northPane.add(jcb);
 						this.add(northPane, BorderLayout.NORTH);
 						this.add(cardPane, BorderLayout.CENTER);