JAL-3141 Added i18n for the example filenames in Preferences

[jalview.git] / src / jalview / jbgui / GPreferences.java

diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index a99d018..4477620 100755 (executable)
--- a/src/jalview/jbgui/GPreferences.java
+++ b/src/jalview/jbgui/GPreferences.java
@@ -1818,27 +1818,7 @@ public class GPreferences extends JPanel
     suffixDigitsLabel.setHorizontalAlignment(SwingConstants.LEFT);
     suffixDigitsLabel.setFont(LABEL_FONT);
     int defaultmin = 1;
-    try
-    {
-      defaultmin = Integer.parseInt(
-              MessageManager.getString("default.suffix_index_digits_min"));
-    } catch (Exception e)
-    {
-      defaultmin = 1;
-      System.out.println(
-              "Exception setting suffix digits min from default.suffix_index_digits_min label, setting to "
-                      + defaultmin);
-    }
     int defaultmax = 6;
-    try {
-      defaultmax = Integer.parseInt(
-              MessageManager.getString("default.suffix_index_digits_max"));
-    } catch (Exception e) {
-      defaultmax = 6;
-      System.out.println(
-              "Exception setting suffix digits max from default.suffix_index_digits_max label, setting to "
-                      + defaultmax);
-    }
     ChangeListener c = new ChangeListener()
     {
       @Override
@@ -2039,10 +2019,14 @@ public class GPreferences extends JPanel
     return exampleFilesPanel;
   }
 
-  private void updateBackupFilesExampleLabel()
+  protected void updateBackupFilesExampleLabel()
   {
     int exampleindex = 12;
-    String base = "filename";
+    String base = MessageManager.getString("label.filename");
+    if (base == null || base.length() > 0)
+    {
+      base = "filename";
+    }
     String extension = ".fa";
 
     String suffix = suffixTemplate.getText();
@@ -2069,7 +2053,8 @@ public class GPreferences extends JPanel
               "Failed casting (Integer) backupfilesRollMaxSpinner.getValue()");
     }
 
-    int surround = 2;
+    int lowersurround = 2;
+    int uppersurround = 0;
     StringBuilder exampleSB = new StringBuilder();
     boolean firstLine = true;
     if (reverse)
@@ -2079,11 +2064,11 @@ public class GPreferences extends JPanel
       int max = keepAll ? exampleindex : rollMax;
       for (int index = min; index <= max; index++)
       {
-        if (index == min + surround && index < max)
+        if (index == min + lowersurround && index < max - uppersurround - 1)
         {
           exampleSB.append("\n...");
         }
-        else if (index > min + surround && index < max)
+        else if (index > min + lowersurround && index < max - uppersurround)
         {
           // nothing
         }
@@ -2105,11 +2090,19 @@ public class GPreferences extends JPanel
           }
           else if (index == min)
           {
-            exampleSB.append(" (most recent)");
+            String newest = MessageManager.getString("label.braced_newest");
+            if (newest != null && newest.length() > 0)
+            {
+              exampleSB.append(" "+newest);
+            }
           }
           else if (index == max)
           {
-            exampleSB.append(" (oldest)");
+            String oldest = MessageManager.getString("label.braced_oldest");
+            if (oldest != null && oldest.length() > 0)
+            {
+              exampleSB.append(" "+oldest);
+            }
           }
         }
       }
@@ -2124,11 +2117,11 @@ public class GPreferences extends JPanel
       for (int index = min; index <= max; index++)
       {
 
-        if (index == min + surround && index < max)
+        if (index == min + lowersurround && index < max - uppersurround - 1)
         {
           exampleSB.append("\n...");
         }
-        else if (index > min + surround && index < max)
+        else if (index > min + lowersurround && index < max - uppersurround)
         {
           // nothing
         }
@@ -2150,11 +2143,19 @@ public class GPreferences extends JPanel
           }
           else if (index == min)
           {
-            exampleSB.append(" (oldest)");
+            String oldest = MessageManager.getString("label.braced_oldest");
+            if (oldest != null && oldest.length() > 0)
+            {
+              exampleSB.append(" "+oldest);
+            }
           }
           else if (index == max)
           {
-            exampleSB.append(" (most recent)");
+            String newest = MessageManager.getString("label.braced_newest");
+            if (newest != null && newest.length() > 0)
+            {
+              exampleSB.append(" "+newest);
+            }
           }
         }
       }