Changeset 3431

Timestamp:

2002-09-25T16:19:30+12:00 (22 years ago)

Author:

sjboddie

Message:

Extracted some english language strings from C++ code and put in macro file

Location:

trunk/gsdl

Files:

• macros/english2.dm (modified) (1 diff)
• src/recpt/collectoraction.cpp (modified) (1 diff)

trunk/gsdl/macros/english2.dm

@@ -308 +308 @@
 _textexpt_ {export collection}
 
+_textdownloadingfiles_ {Downloading files ...}
+_textimportingcollection_ {Importing collection ...}
+_textbuildingcollection_ {Building collection ...}
+_textcreatingcollection_ {creating collection ...}
+
 _textcollectorblurb_ {
 <i>The pen is mightier than the sword!

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -1015 +1015 @@
 
   if (file_exists (bld_file + ".download")) {
-    statusline = "Downloading files ...<br>\n";
-    statusline += file_tail (bld_file + ".download", 1, 0);
+    statusline = "_collector:textdownloadingfiles_<br>\n";
+    statusline += dm_safe(file_tail(bld_file + ".download", 1, 0));
   } else if (file_exists (bld_file + ".import")) {
-    statusline = "Importing collection ...<br>\n";
-    statusline += file_tail (bld_file + ".import", 1, 0);
+    statusline = "_collector:textimportingcollection_<br>\n";
+    statusline += dm_safe(file_tail(bld_file + ".import", 1, 0));
   } else if (file_exists (bld_file + ".build")) {
-    statusline = "Building collection ...<br>\n";
-    statusline += file_tail (bld_file + ".build", 1, 0);
+    statusline = "_collector:textbuildingcollection_<br>\n";
+    statusline += dm_safe(file_tail(bld_file + ".build", 1, 0));
   } else {
-    statusline += "creating collection ...<br>\n";
-    statusline += file_tail (bld_file, 1, 0);
-  }
-
-  disp.setmacro ("statusline", "collector", dm_safe(statusline));
+    statusline += "_collector:textcreatingcollection_<br>\n";
+    statusline += dm_safe(file_tail(bld_file, 1, 0));
+  }
+
+  disp.setmacro ("statusline", "collector", statusline);
 
 }