JAL-1485 JAL-1473 use compound i18n messages to construct title of tree using transla...

[jalview.git] / src / jalview / gui / AlignFrame.java

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 3f9ebaf..da34013 100644 (file)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -3945,23 +3945,30 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
   {
     calculateTree.removeAll();
     // build the calculate menu
+    
     for (final String type:new String[] {"NJ", "AV"})
     {
+      String treecalcnm = MessageManager.getString("label.tree_calc_"+type.toLowerCase());
       for (final Object pwtype: ResidueProperties.scoreMatrices.keySet())
       {
         JMenuItem tm = new JMenuItem();
         ScoreModelI sm = ResidueProperties.scoreMatrices.get(pwtype);
-        final String title="Calculate "+type+" using "+sm.getName();
-        tm.setText(title);// MessageManager.getString("label.neighbour_blosum62"));
-        tm
-                .addActionListener(new java.awt.event.ActionListener()
-                {
-                  public void actionPerformed(ActionEvent e)
-                  {
-                    NewTreePanel(type, (String) pwtype, title);
-                  }
-                });
-        calculateTree.add(tm);
+        if (sm.isProtein()==!viewport.getAlignment().isNucleotide())
+        {
+          String smn = MessageManager.getStringOrReturn(
+                  "label.score_model_", sm.getName());
+          final String title = MessageManager.formatMessage(
+                  "label.treecalc_title", treecalcnm, smn);
+          tm.setText(title);//
+          tm.addActionListener(new java.awt.event.ActionListener()
+          {
+            public void actionPerformed(ActionEvent e)
+            {
+              NewTreePanel(type, (String) pwtype, title);
+            }
+          });
+          calculateTree.add(tm);
+        }
 
       }
     }