diff --git a/designer_base/src/com/fr/design/gui/style/FormatPane.java b/designer_base/src/com/fr/design/gui/style/FormatPane.java
index c426bbed26..d799858776 100644
--- a/designer_base/src/com/fr/design/gui/style/FormatPane.java
+++ b/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 {
diff --git a/designer_chart/src/com/fr/design/chart/report/MapDataPane.java b/designer_chart/src/com/fr/design/chart/report/MapDataPane.java
index 26842d83ee..c317fc9f2d 100644
--- a/designer_chart/src/com/fr/design/chart/report/MapDataPane.java
+++ b/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);