Merge branch 'Release_2_8_1_Branch_i18n' into try_r20b1_merge
[jalview.git] / src / jalview / gui / RestServiceEditorPane.java
index 2a6bb72..2507ceb 100644 (file)
@@ -20,6 +20,7 @@ package jalview.gui;
 
 import jalview.io.packed.DataProvider.JvDataType;
 import jalview.jbgui.GRestServiceEditorPane;
+import jalview.util.MessageManager;
 import jalview.ws.rest.InputType;
 import jalview.ws.rest.RestServiceDescription;
 
@@ -267,7 +268,7 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
     final int rdatasel = rdata.getSelectedIndex();
     if (rdatasel > -1)
     {
-      JPopupMenu popup = new JPopupMenu("Select return type");
+      JPopupMenu popup = new JPopupMenu(MessageManager.getString("label.select_return_type"));
       for (final JvDataType type : JvDataType.values())
       {
         popup.add(new JMenuItem(type.name())).addActionListener(
@@ -428,15 +429,13 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
             }
             else
             {
-              parseRes.setText("Parsing failed. Syntax errors shown below\n"
-                      + rsd.getInvalidMessage());
+              parseRes.setText(MessageManager.formatMessage("label.parsing_failed_syntax_errors_shown_below_param", new String[]{rsd.getInvalidMessage()}));
               parseWarnings.setVisible(true);
             }
           } catch (Throwable e)
           {
             e.printStackTrace();
-            parseRes.setText("\nParsing failed. An unrecoverable exception was thrown:\n"
-                    + e.toString());
+            parseRes.setText(MessageManager.formatMessage("label.parsing_failed_unrecoverable_exception_thrown_param", new String[]{e.toString()}));
             parseWarnings.setVisible(true);
           }
         }