Changeset 5595

Timestamp:

2003-10-07T16:22:55+13:00 (21 years ago)

Author:

mdewsnip

Message:

A few more minor changes to tidy up the dictionary.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/GeneralManager.java (modified) (3 diffs)
• cdm/TranslationView.java (modified) (1 diff)
• file/FileQueue.java (modified) (2 diffs)
• gui/GProgressBar.java (modified) (1 diff)
• gui/Preferences.java (modified) (2 diffs)
• util/Utility.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/GeneralManager.java

@@ -48 +48 @@
     extends JPanel {
     /** The available subscreens. */
-    static final private String CONTENTS[] = {"General", "Plugins", "SearchTypes", "Indexes", "Subcollections", "SuperCollection", "Classifiers", "Formats", "Translation",  "MetadataSets"};
+    static final private String CONTENTS[] = { "CDM.GUI.General", "CDM.GUI.Plugins", "CDM.GUI.SearchTypes", "CDM.GUI.Indexes", "CDM.GUI.Subcollections", "CDM.GUI.SuperCollection", "CDM.GUI.Classifiers", "CDM.GUI.Formats", "CDM.GUI.Translation",  "CDM.GUI.MetadataSets" };
     /** The preferred size of the collection design module screen real-estate. */
     static final private Dimension SIZE = new Dimension(760, 500);
@@ -342 +342 @@
     public DesignTree() {
         super();
-        root = new DesignNode("Root");
+        root = new DesignNode("CDM.GUI.Root");
         this.setModel(new DefaultTreeModel(root));
         // Now add the design categories.
@@ -379 +379 @@
      */
     public String toString() {
-        return Dictionary.get("CDM.GUI." + (String)getUserObject());
+        // return Dictionary.get("CDM.GUI." + (String)getUserObject());
+        return Dictionary.get((String) getUserObject());
     }
     }

trunk/gli/src/org/greenstone/gatherer/cdm/TranslationView.java

@@ -519 +519 @@
         return 2;
         }
+
         public String getColumnName(int column) {
-        return Dictionary.get("CDM.TranslationManager.Column_Name_" + column);
+        if (column == 0) {
+            return Dictionary.get("CDM.TranslationManager.Language_Column");
+        }
+        if (column == 1) {
+            return Dictionary.get("CDM.TranslationManager.Fragment_Column");
+        }
+        return "";
         }
 

trunk/gli/src/org/greenstone/gatherer/file/FileQueue.java

@@ -377 +377 @@
                 // Else inform the users that a directory already exists and files will be copied into it
                 //else {
-                //    JOptionPane.showMessageDialog(null, Dictionary.get("Directory_Exists", target_file.toString()), Dictionary.get("General.Warning"), JOptionPane.WARNING_MESSAGE);
+                //    JOptionPane.showMessageDialog(null, Dictionary.get("FileActions.Directory_Exists", target_file.toString()), Dictionary.get("General.Warning"), JOptionPane.WARNING_MESSAGE);
                 //}
                 // Queue non-filtered child files for copying. If this directory already existed, the child records will have to generate the undo jobs, as we don't want to entirely delete this directory if it already existed.
@@ -456 +456 @@
                 String args[] = new String[1];
                 args[0] = "" + (queue.size() + 1) + "";
-                //job_status.setText(Dictionary.get("Jobs", args));
+                //job_status.setText(Dictionary.get("FileActions.Jobs", args));
                 args[0] = Utility.formatPath("FileActions.Deleting", source_file.getAbsolutePath(), file_status.getSize().width);
                 file_status.setText(Dictionary.get("FileActions.Deleting", args));

trunk/gli/src/org/greenstone/gatherer/gui/GProgressBar.java

@@ -254 +254 @@
 
     action.setIcon(Utility.getImage("vcrfastforward.gif"));
-    Dictionary.setText(action, "Mirroring.Job.Restart");
+    Dictionary.setTooltip(action, "Mirroring.Job.Restart_Tooltip");
     action.setEnabled(true);
     cancel.setEnabled(true);

trunk/gli/src/org/greenstone/gatherer/gui/Preferences.java

@@ -224 +224 @@
     view_extracted_metadata_checkbox = new JCheckBox();
     view_extracted_metadata_checkbox.setSelected(false);
-    Dictionary.registerText(view_extracted_metadata_checkbox, "Preferences.General.View_Extracted_Metadata");
     if (Gatherer.config.get("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC)) {
         view_extracted_metadata_checkbox.setSelected(true);
     }
+    Dictionary.registerBoth(view_extracted_metadata_checkbox, "Preferences.General.View_Extracted_Metadata", "Preferences.General.View_Extracted_Metadata_Tooltip");
 
     // Show file sizes
     show_file_size_checkbox = new JCheckBox();
     show_file_size_checkbox.setSelected(false);
-    Dictionary.registerText(show_file_size_checkbox, "Preferences.General.Show_File_Size");
     if (Gatherer.config.get("general.show_file_size", Configuration.COLLECTION_SPECIFIC)) {
         show_file_size_checkbox.setSelected(true);
     }
+    Dictionary.registerBoth(show_file_size_checkbox, "Preferences.General.Show_File_Size", "Preferences.General.Show_File_Size_Tooltip");
 
     // Language
@@ -243 +243 @@
     Dictionary.registerText(language_label, "Preferences.General.Interface_Language");
     language_combobox = new JComboBox(dictionary_model.toArray());
+    Dictionary.registerTooltip(language_combobox, "Preferences.General.Interface_Language_Tooltip");
 
     // Connect

trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -540 +540 @@
     String day_name = null;
     switch(current.get(Calendar.DAY_OF_WEEK)) {
-    case Calendar.MONDAY: day_name = "Mon"; break;
-    case Calendar.TUESDAY: day_name = "Tue"; break;
-    case Calendar.WEDNESDAY: day_name = "Wed"; break;
-    case Calendar.THURSDAY: day_name = "Thu"; break;
-    case Calendar.FRIDAY: day_name = "Fri"; break;
-    case Calendar.SATURDAY: day_name = "Sat"; break;
-    case Calendar.SUNDAY: day_name = "Sun"; break;
+    case Calendar.MONDAY: day_name = "Dates.Mon"; break;
+    case Calendar.TUESDAY: day_name = "Dates.Tue"; break;
+    case Calendar.WEDNESDAY: day_name = "Dates.Wed"; break;
+    case Calendar.THURSDAY: day_name = "Dates.Thu"; break;
+    case Calendar.FRIDAY: day_name = "Dates.Fri"; break;
+    case Calendar.SATURDAY: day_name = "Dates.Sat"; break;
+    case Calendar.SUNDAY: day_name = "Dates.Sun"; break;
     default: day_name = "";
     }
     String month_name = null;
     switch(current.get(Calendar.MONTH)) {
-    case Calendar.JANUARY: month_name = "Jan"; break;
-    case Calendar.FEBRUARY: month_name = "Feb"; break;
-    case Calendar.MARCH: month_name = "Mar"; break;
-    case Calendar.APRIL: month_name = "Apr"; break;
-    case Calendar.MAY: month_name = "May"; break;
-    case Calendar.JUNE: month_name = "Jun"; break;
-    case Calendar.JULY: month_name = "Jul"; break;
-    case Calendar.AUGUST: month_name = "Aug"; break;
-    case Calendar.SEPTEMBER: month_name = "Sep"; break;
-    case Calendar.OCTOBER: month_name = "Oct"; break;
-    case Calendar.NOVEMBER: month_name = "Nov"; break;
-    case Calendar.DECEMBER: month_name = "Dec"; break;
+    case Calendar.JANUARY: month_name = "Dates.Jan"; break;
+    case Calendar.FEBRUARY: month_name = "Dates.Feb"; break;
+    case Calendar.MARCH: month_name = "Dates.Mar"; break;
+    case Calendar.APRIL: month_name = "Dates.Apr"; break;
+    case Calendar.MAY: month_name = "Dates.May"; break;
+    case Calendar.JUNE: month_name = "Dates.Jun"; break;
+    case Calendar.JULY: month_name = "Dates.Jul"; break;
+    case Calendar.AUGUST: month_name = "Dates.Aug"; break;
+    case Calendar.SEPTEMBER: month_name = "Dates.Sep"; break;
+    case Calendar.OCTOBER: month_name = "Dates.Oct"; break;
+    case Calendar.NOVEMBER: month_name = "Dates.Nov"; break;
+    case Calendar.DECEMBER: month_name = "Dates.Dec"; break;
     default: month_name = "";
     }
@@ -571 +571 @@
     int year = current.get(Calendar.YEAR);
 
-    return Dictionary.get("Dates." + day_name) + " " + Dictionary.get("Dates." + month_name) + " " + day + " " + year + " " + Utility.pad(String.valueOf(hour), 2, '0', true) + ":" + Utility.pad(String.valueOf(minute), 2, '0', true) + ":" + Utility.pad(String.valueOf(second), 2, '0', true);
+    return Dictionary.get(day_name) + " " + Dictionary.get(month_name) + " " + day + " " + year + " " + Utility.pad(String.valueOf(hour), 2, '0', true) + ":" + Utility.pad(String.valueOf(minute), 2, '0', true) + ":" + Utility.pad(String.valueOf(second), 2, '0', true);
     }