[wip #52, #41, #36] marking more strings for translations

.gitignore

@@ -16,7 +16,7 @@ debian
 *.1
 config.status
 htdoc/attrs.html
-htsearch/qtest
+hlsearch/qtest
 httools/htmerge
 include/config.h
 installdir/htdigconfig.8

.travis.yml

@@ -2,26 +2,15 @@ language: cpp
 
 os:
   - linux
-  - osx
+  #- osx
 
 compiler:
   - clang
   - gcc
 
 script:
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then xcode-select --install; fi
   - ./configure --prefix=$PWD/tempbuild --with-ssl --with-zlib --enable-bigfile && make && make install
 
-allow_failures:
-    - os: osx
-
-# blocklist
-#branches:
-#  except:
-#  - legacy
-#  - experimental
-
-# safelist
 branches:
   only:
   - master

hldig/.gitignore

@@ -5,4 +5,4 @@ Makefile
 .pure
 .deps
 .libs
-htdig
+hldig

hldig/hldig.cc

@@ -415,8 +415,7 @@ main (int ac, char **av)
     }
     else
     {
-      cerr << "Could not open argument '" << minimalFile << "' of flag -m\n";
-      // fprintf (stderr, _("Could not open argument '%s' of flag -m\n"), minimalFile.c_str());
+      fprintf (stderr, _("Could not open argument '%s' of flag -m\n"), &minimalFile[0]);
       exit (1);
     }
   }
@@ -485,9 +484,10 @@ void
 usage ()
 {
   Usage help;
-  printf (_("usage: hldig [-v][-i][-c configfile][-t][-m minimalfile]\n\
-This program is part of hl://Dig %s\n\n\
-Options:\n"), VERSION);
+  cout << _("usage:");
+  cout << " hldig [-v][-i][-c configfile][-t][-m minimalfile]\n";
+  printf (_("This program is part of hl://Dig %s\n\n"), VERSION);
+  cout << _("Options:\n");
 
   help.verbose ();
 
@@ -518,8 +518,8 @@ Options:\n"), VERSION);
 \tThere *HAS* to be a colon (:) between the username\n\
 \tand password.\n\n"));
 
+  help.alternate_common();
   printf (_("\
- -a\tUse alternate work files.\n\
 \tTells hldig to append .work to database files, causing\n\
 \ta second copy of the database to be built.  This allows\n\
 \tthe original files to be used by hlsearch during the\n\

hlsearch/.gitignore

@@ -5,4 +5,4 @@ Makefile
 .pure
 .deps
 .libs
-htsearch
+hlsearch

hlsearch/hlsearch.cc

@@ -972,9 +972,9 @@ void
 usage ()
 {
   Usage help;
-  printf (_("\
-usage: hlsearch [-v][-d][-c configfile] [query_string]\n\
-This program is part of hl://Dig %s\n\n"), VERSION);
+  cout << _("usage:");
+  cout << " hlsearch [-v][-d][-c configfile] [query_string]\n";
+  printf (_("This program is part of hl://Dig %s\n\n"), VERSION);
   cout << _("Options:\n");
 
   help.verbose ();

htcommon/messages.cc

@@ -29,13 +29,17 @@ void Usage::verbose (void) {
 }
 
 void Usage::config (void) {
-
   printf (_("\
  -c\tconfigfile\n\
 \tUse the specified configuration file instead of the\n\
 \tdefault.\n\n"));
 }
 
+void Usage::alternate_common (void) {
+  printf (_("\
+ -a\tUse alternate work files.\n"));
+}
+
 Usage::Usage (void) {}
 
 Usage::~Usage (void) {}

htcommon/messages.h

@@ -17,6 +17,7 @@ class Usage {
   public:
     void config (void);
     void verbose (void);
+    void alternate_common (void);
     Usage ();
     ~Usage ();
 };

htfuzzy/htfuzzy.cc

@@ -229,25 +229,22 @@ main(int ac, char **av)
 void
 usage()
 {
-    cout << "usage: hlfuzzy [-c configfile][-v] algorithm ...\n";
-    cout << "This program is part of ht://Dig " << VERSION << "\n\n";
-    cout << "Supported algorithms:\n";
+    Usage help;
+    cout << _("usage:");
+    cout << " hlfuzzy [-c configfile][-v] algorithm ...\n";
+    printf (_("This program is part of hl://Dig %s\n\n"), VERSION);
+    cout << _("Supported algorithms:\n");
     cout << "\tsoundex\n";
     cout << "\tmetaphone\n";
     cout << "\taccents\n";
     cout << "\tendings\n";
     cout << "\tsynonyms\n";
     cout << "\n";
 
-    cout << "Options:\n";
+    cout << _("Options:\n");
 
-    cout << "\t-c configfile\n";
-    cout << "\t\tUse the specified configuration file instead of the\n";
-    cout << "\t\tdefault.\n\n";
-
-    cout << "\t-v\tVerbose mode.  This increases the verbosity of the\n";
-    cout << "\t\tprogram.  Using more than 2 is probably only useful\n";
-    cout << "\t\tfor debugging purposes.\n\n";
+    help.config ();
+    help.verbose ();
 
     exit(0);
 }

httools/htdump.cc

@@ -180,14 +180,14 @@ void
 usage ()
 {
   Usage help;
-  printf (_("\
-usage: hldump [-v][-d][-w][-a][-c configfile]\n\
-This program is part of hl://Dig %s\n\n"), VERSION);
+  cout << _("usage:");
+  cout << "hldump [-v][-d][-w][-a][-c configfile]\n";
+  printf (_("This program is part of hl://Dig %s\n\n"), VERSION);
   cout << _("Options:\n");
   help.verbose ();
   cout << "\t-d\tDo NOT dump the document database.\n\n";
   cout << "\t-w\tDo NOT dump the word database.\n\n";
-  cout << "\t-a\tUse alternate work files.\n";
+  help.alternate_common ();
   cout << "\t\tTells hldump to append .work to the database files \n";
   cout << "\t\tallowing it to operate on a second set of databases.\n";
   help.config ();

httools/htload.cc

@@ -174,21 +174,22 @@ main (int ac, char **av)
 void
 usage ()
 {
-  cout << "usage: hlload [-v][-d][-w][-a][-c configfile]\n";
-  cout << "This program is part of ht://Dig " << VERSION << "\n\n";
-  cout << "Options:\n";
-  cout << "\t-v\tVerbose mode.  This increases the verbosity of the\n";
-  cout << "\t\tprogram.  Using more than 2 is probably only useful\n";
-  cout << "\t\tfor debugging purposes.  The default verbose mode\n";
-  cout << "\t\tgives a progress on what it is doing and where it is.\n\n";
+  Usage help;
+  cout << _("usage:");
+  cout << " hlload [-v][-d][-w][-a][-c configfile]\n";
+  printf (_("This program is part of hl://Dig %s\n\n"), VERSION);
+  cout << _("Options:\n");
+
+  help.verbose ();
+
   cout << "\t-d\tDo NOT load the document database.\n\n";
   cout << "\t-w\tDo NOT load the word database.\n\n";
-  cout << "\t-a\tUse alternate work files.\n";
+
+  help.alternate_common ();
   cout << "\t\tTells hlload to append .work to the database files \n";
   cout << "\t\tallowing it to operate on a second set of databases.\n";
-  cout << "\t-c configfile\n";
-  cout << "\t\tUse the specified configuration file instead on the\n";
-  cout << "\t\tdefault.\n\n";
+
+  help.config ();
   exit (0);
 }
 

httools/htmerge.cc

@@ -383,23 +383,20 @@ mergeDB ()
 void
 usage ()
 {
-  cout << "usage: hlmerge [-v][-c configfile][-m merge_configfile]\n";
-  cout << "This program is part of ht://Dig " << VERSION << "\n\n";
-  cout << "Options:\n";
-  cout << "\t-v\tVerbose mode.  This increases the verbosity of the\n";
-  cout << "\t\tprogram.  Using more than 2 is probably only useful\n";
-  cout << "\t\tfor debugging purposes.  The default verbose mode\n";
-  cout << "\t\tgives a progress on what it is doing and where it is.\n\n";
+  Usage help;
+  cout << _("usage:");
+  cout << " hlmerge [-v][-c configfile][-m merge_configfile]\n";
+  printf (_("This program is part of hl://Dig %s\n\n"), VERSION);
+  cout << _("Options:\n");
+  help.verbose ();
   cout << "\t-m merge_configfile\n";
   cout << "\t\tMerge the databases specified into the databases specified\n";
   cout << "\t\tby -c or the default.\n\n";
-  cout << "\t-c configfile\n";
-  cout << "\t\tUse the specified configuration file instead on the\n";
-  cout << "\t\tdefault.\n\n";
-  cout << "\t-a\tUse alternate work files.\n";
+  help.config ();
+  help.alternate_common ();
   cout << "\t\tTells hlmerge to append .work to database files causing\n";
   cout << "\t\ta second copy of the database to be built.  This allows\n";
-  cout << "\t\toriginal files to be used by htsearch during the indexing\n";
+  cout << "\t\toriginal files to be used by hlsearch during the indexing\n";
   cout << "\t\trun.\n\n";
   exit (0);
 }

httools/htnotify.cc

@@ -557,18 +557,20 @@ send_email (List * notifList, String & command,
 void
 usage ()
 {
-  cout << "usage: hlnotify [-c configfile][-b db_base]\n";
-  cout << "This program is part of ht://Dig " << VERSION << "\n\n";
-  cout << "There can be any number or words.\n";
-  cout << "Options:\n";
-  cout << "\t-c configfile\n";
-  cout <<
-    "\t\tUse the specified configuration file instead of the default.\n\n";
+  Usage help;
+  cout << _("usage:");
+  cout << " hlnotify [-c configfile][-b db_base]\n";
+  printf (_("This program is part of hl://Dig %s\n\n"), VERSION);
+
+  // Why is this here?
+  // cout << "There can be any number or words.\n";
+  cout << _("Options:\n");
+
+  help.verbose ();
+  help.config ();
+
   cout << "\t-b db_base\n";
   cout << "\t\tSet the base path of the document database.\n";
-  cout << "\t-v\n";
-  cout << "\t\tIncrease the verbose level. Use two or three times for\n";
-  cout << "\t\tmore output.\n";
   cout << "\t-n\n";
   cout << "\t\tDon't send any email, just list what has expired.\n";
   exit (0);

httools/htpurge.cc

@@ -384,23 +384,23 @@ purgeWords (Dictionary * discard_list)
 void
 usage ()
 {
-  cout << "usage: hlpurge [-][-u url][-v][-a][-c configfile]\n";
-  cout << "This program is part of ht://Dig " << VERSION << "\n\n";
-  cout << "Options:\n";
+  Usage help;
+  cout << _("usage:");
+  cout << " hlpurge [-][-u url][-v][-a][-c configfile]\n";
+  printf (_("This program is part of hl://Dig %s\n\n"), VERSION);
+  cout << _("Options:\n");
   cout <<
     "\t-\tURL input. Read in a list of URLs to remove, one per line.\n\n";
   cout << "\t-u\tURL input. Add this url to the list of URLs to remove.\n";
   cout << "\t\t(can be specified multiple times)\n\n";
-  cout << "\t-v\tVerbose mode.  This increases the verbosity of the\n";
-  cout << "\t\tprogram.  Using more than 2 is probably only useful\n";
-  cout << "\t\tfor debugging purposes.  The default verbose mode\n";
-  cout << "\t\tgives a progress on what it is doing and where it is.\n\n";
-  cout << "\t-a\tUse alternate work files.\n";
+
+  help.verbose ();
+
+  help.alternate_common ();
   cout << "\t\tTells hlpurge to append .work to the database files \n";
   cout << "\t\tallowing it to operate on a second set of databases.\n\n";
-  cout << "\t-c configfile\n";
-  cout << "\t\tUse the specified configuration file instead on the\n";
-  cout << "\t\tdefault.\n\n";
+  help.config ();
+
   exit (0);
 }
 

httools/htstat.cc

@@ -176,19 +176,16 @@ main (int ac, char **av)
 void
 usage ()
 {
-  cout << "usage: hlstat [-v][-a][-c configfile][-u]\n";
-  cout << "This program is part of ht://Dig " << VERSION << "\n\n";
-  cout << "Options:\n";
-  cout << "\t-v\tVerbose mode.  This increases the verbosity of the\n";
-  cout << "\t\tprogram.  Using more than 2 is probably only useful\n";
-  cout << "\t\tfor debugging purposes.  The default verbose mode\n";
-  cout << "\t\tgives a progress on what it is doing and where it is.\n\n";
-  cout << "\t-a\tUse alternate work files.\n";
+  Usage help;
+  cout << _("usage:");
+  cout << " hlstat [-v][-a][-c configfile][-u]\n";
+  printf (_("This program is part of hl://Dig %s\n\n"), VERSION);
+  cout << _("Options:\n");
+  help.verbose ();
+  help.alternate_common ();
   cout << "\t\tTells hlstat to append .work to the database files \n";
   cout << "\t\tallowing it to operate on a second set of databases.\n";
-  cout << "\t-c configfile\n";
-  cout << "\t\tUse the specified configuration file instead on the\n";
-  cout << "\t\tdefault.\n\n";
+  help.config ();
   cout << "\t-u\tGive a list of URLs in the document database.\n\n";
   exit (0);
 }