Merge branch 'Release_2_8_2_Branch_i18n' into Release_2_8_2_Branch

[jalview.git] / src / jalview / ws / AWSThread.java

diff --git a/src/jalview/ws/AWSThread.java b/src/jalview/ws/AWSThread.java
index 7ab1781..edb56a9 100644 (file)
--- a/src/jalview/ws/AWSThread.java
+++ b/src/jalview/ws/AWSThread.java
@@ -29,6 +29,7 @@ import jalview.datamodel.SequenceI;
 import jalview.gui.AlignFrame;
 import jalview.gui.WebserviceInfo;
 import jalview.gui.FeatureRenderer.FeatureRendererSettings;
+import jalview.util.MessageManager;
 
 public abstract class AWSThread extends Thread
 {
@@ -123,8 +124,8 @@ public abstract class AWSThread extends Thread
           } catch (Exception ex)
           {
             // Deal with Transaction exceptions
-            wsInfo.appendProgressText(jobs[j].jobnum, "\n" + WebServiceName
-                    + " Server exception!\n" + ex.getMessage());
+            wsInfo.appendProgressText(jobs[j].jobnum, 
+                       MessageManager.formatMessage("info.server_exception", new String[]{WebServiceName,ex.getMessage()}));
             // always output the exception's stack trace to the log
             Cache.log.warn(WebServiceName + " job(" + jobs[j].jobnum
                     + ") Server exception.");
@@ -189,7 +190,7 @@ public abstract class AWSThread extends Thread
       Cache.log
               .debug("WebServiceJob poll loop finished with no jobs created.");
       wsInfo.setStatus(wsInfo.STATE_STOPPED_ERROR);
-      wsInfo.appendProgressText("No jobs ran.");
+      wsInfo.appendProgressText(MessageManager.getString("info.no_jobs_ran"));
       wsInfo.setFinishedNoResults();
     }
   }