JAL-3774 missing i18n added, overlong translation shortened

diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties
index a71268b..de7e965 100644 (file)
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@ -328,6 +328,7 @@ label.successfully_pasted_alignment_file = Successfully pasted alignment file
 label.paste_your_alignment_file = Paste your alignment file here
 label.paste_your = Paste your
 label.finished_searching = Finished searching
+label.subsequence_matches_found = {0} subsequence matches found
 label.search_results= Search results {0} : {1}
 label.found_match_for = Found match for {0}
 label.font = Font:

diff --git a/resources/lang/Messages_es.properties b/resources/lang/Messages_es.properties
index 4b46255..ec6d479 100644 (file)
--- a/resources/lang/Messages_es.properties
+++ b/resources/lang/Messages_es.properties
@@ -253,7 +253,7 @@ label.min_value = Valor m
 label.no_value = Sin valor
 label.colour_by_label = Color por etiquetas
 label.new_feature = Nueva función
-label.match_case = Hacer corresponder mayúsculas y minúsculas
+label.match_case = Distinguir A/a etc.
 label.view_alignment_editor = Ver en el editor de alineamientos
 label.labels = Etiquetas
 label.output_values = Valores de salida...
@@ -294,6 +294,7 @@ label.successfully_pasted_alignment_file = Fichero de alineamiento pegado exitos
 label.paste_your_alignment_file = Pegar su fichero de alineamiento aquí
 label.paste_your = Pegar su
 label.finished_searching = Búsqueda finalizada
+label.subsequence_matches_found = {0} resultados encontrados en subsequencias
 label.search_results= Buscar Resultados {0} : {1}
 label.found_match_for = Buscar coincidencia para {0}
 label.font = Fuente:

diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java
index 430485a..4175c64 100755 (executable)
--- a/src/jalview/gui/Finder.java
+++ b/src/jalview/gui/Finder.java
@@ -129,7 +129,7 @@ public class Finder extends GFinder
         getFocusedViewport();
       }
     });
-      
+
     addEscapeHandler();
 
     String title = MessageManager.getString("label.find");
@@ -329,19 +329,24 @@ public class Finder extends GFinder
       if (doFindAll)
       {
         // then we report the matches that were found
-        String message = (idMatch.size() > 0) ? "" + idMatch.size() + " IDs"
-                : "";
+        StringBuilder message = new StringBuilder();
+        if (idMatch.size() > 0)
+        {
+          message.append(idMatch.size()).append(" IDs");
+        }
         if (searchResults != null)
         {
           if (idMatch.size() > 0 && searchResults.getCount() > 0)
           {
-            message += " and ";
+            message.append(" ").append(
+                    MessageManager.getString("label.and").toLowerCase())
+                    .append(" ");
           }
-          message += searchResults.getCount()
-                  + " subsequence matches found.";
+          message.append(MessageManager.formatMessage(
+                  "label.subsequence_matches_found", searchResults.getCount()));
         }
-        JvOptionPane.showInternalMessageDialog(this, message, null,
-                JvOptionPane.INFORMATION_MESSAGE);
+        JvOptionPane.showInternalMessageDialog(this, message.toString(),
+                null, JvOptionPane.INFORMATION_MESSAGE);
       }
     }
     searchBox.updateCache();