X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJDatabaseTree.java;h=e7470551addcb4c9215f755b89e69aaf936cf23f;hb=6235128370382f0fecdf3ba1cc683052c5aa11e7;hp=69f0fef7aba89e2db7565a99722fe01844440798;hpb=59d682209891099d46b960509907c79e3fb276fe;p=jalview.git

diff --git a/src/jalview/gui/JDatabaseTree.java b/src/jalview/gui/JDatabaseTree.java
index 69f0fef..e747055 100644
--- a/src/jalview/gui/JDatabaseTree.java
+++ b/src/jalview/gui/JDatabaseTree.java
@@ -18,6 +18,7 @@
 package jalview.gui;
 
 import jalview.bin.Cache;
+import jalview.util.MessageManager;
 import jalview.ws.seqfetcher.DbSourceProxy;
 
 import java.awt.BorderLayout;
@@ -58,7 +59,7 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
 
   JButton getDatabaseSelectorButton()
   {
-    final JButton viewdbs = new JButton("--- Select Database ---");
+    final JButton viewdbs = new JButton(MessageManager.getString("action.select_ddbb"));
     viewdbs.addActionListener(new ActionListener()
     {
 
@@ -361,21 +362,9 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
             }
             else
             {
-              if ((admt = dmt.getFirstLeaf()) != null
-                      && admt.getUserObject() != null)
-              {
-                // modify db selection to just first leaf.
-                if (admt.getUserObject() instanceof DbSourceProxy)
-                {
-                  srcs.add((DbSourceProxy) admt.getUserObject());
-                }
-                else
-                {
-                  srcs.add(sfetcher.getSourceProxy(
-                          (String) admt.getUserObject()).get(0));
-                }
-                forcedFirstChild = true;
-              }
+              srcs.add(sfetcher.getSourceProxy((String) dmt
+                      .getUserObject()).get(0));
+              forcedFirstChild = true;
             }
           }
         }
@@ -417,23 +406,17 @@ public class JDatabaseTree extends JalviewDialog implements KeyListener
 
     if (allowMultiSelections)
     {
-      dbstatus.setText("Selected "
-              + srcs.size()
-              + " database"
-              + (srcs.size() == 1 ? "" : "s")
-              + " to fetch from"
-              + (srcs.size() > 0 ? " with " + x + " test quer"
-                      + (x == 1 ? "y" : "ies") : "."));
+      dbstatus.setText(MessageManager.formatMessage("label.selected_database_to_fetch_from", new String[]{Integer.valueOf(srcs.size()).toString(),(srcs.size() == 1 ? "" : "s"),(srcs.size() > 0 ? " with " + x + " test quer" + (x == 1 ? "y" : "ies") : ".")}));
       dbstatex.setText(" ");
     }
     else
     {
       if (nm.length() > 0)
       {
-        dbstatus.setText("Database: " + nm);
+        dbstatus.setText(MessageManager.formatMessage("label.database_param",new String[]{nm}));
         if (qr.length() > 0)
         {
-          dbstatex.setText("Example: " + qr);
+          dbstatex.setText(MessageManager.formatMessage("label.example_param", new String[]{qr}));
         }
         else
         {