Enable "lyx -dbg init" to run.

Tweak gettext search mechanism.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9467 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/po/ChangeLog b/po/ChangeLog
index 7c8e6e303b6a6035e7231b4812943e9fd6ca9568..7dfe10fc8e6dd394f0a426ab612160dccd3b7a9a 100644 (file)
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-12  Angus Leeming  <leeming@lyx.org>
+
+       * Makefile.in.in (POTFILES.in): replace mention of path_defines.C
+       with package.C.
+
 2004-10-18  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
        * de.po: update strings with context information

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 83d3a469db4d7c0b146e37aed90edcf34915bc7d..43af78386347f6a5991e00ce5c64ecb480ba7bb1 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -367,7 +367,7 @@ ${srcdir}/POTFILES.in: $(POTFILE_IN_DEPS)
        rm -f $@-t \
        && ( cd $(top_srcdir); \
             grep -l "_(\".*\")" `find src \( -name '*.[Cch]' -o -name '*.C.in' \) -print` |\
-            sed -e '/xforms.forms/d' | grep -v -e "src/support/path_defines.C$$" |\
+            sed -e '/xforms.forms/d'| grep -v -e "src/support/package.C$$" |\
             sort | uniq ) > $@-t \
        && mv $@-t $@
 

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 295efd9f1529fb02afdafc101c47f4d18a224700..c6b71a96474920a1a24e77035313a2358c480662 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -205,6 +205,7 @@ src/output_plaintext.C
 src/paragraph.C
 src/rowpainter.C
 src/support/filefilterlist.C
+src/support/package.C.in
 src/text.C
 src/text2.C
 src/text3.C

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index 7b90e16ec875cd22c353f23b2313d71a0cada051..84c8dbce370b0da67829341d537021f497943901 100644 (file)
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-12  Angus Leeming  <leeming@lyx.org>
+
+       * package.C.in (package): comment out the ASSERT for now.
+       (check_env_var_dir): write one of the strings to be translated
+       (any one, doesn't matter) on a single line so that the
+       gettext search mechanism in po/Makefile.in.in will register
+       package.C.in as a file containing strings that need translation.
+
 2005-01-12  Angus Leeming  <leeming@lyx.org>
 
        * os_win32.C: add #include "lstring.h" back in.

diff --git a/src/support/package.C.in b/src/support/package.C.in
index 9ad6bfe47e3c1a874e08872af54ae2f93d519a8b..50cb4daf95c6c739c2d1ea8bec4bcec7a7afc593 100644 (file)
--- a/src/support/package.C.in
+++ b/src/support/package.C.in
@@ -80,7 +80,7 @@ void init_package(string const & command_line_arg0,
 
 Package const & package()
 {
-       BOOST_ASSERT(initialised_);
+       // BOOST_ASSERT(initialised_);
        return package_;
 }
 
@@ -98,7 +98,7 @@ string const get_home_dir();
 string const get_locale_dir(string const & system_support_dir);
 
 string const get_system_support_dir(string const & abs_binary,
-                              string const & command_line_system_support_dir);
+                                   string const & command_line_system_support_dir);
 
 string const get_temp_dir();
 
@@ -659,9 +659,14 @@ bool check_env_var_dir(string const & dir,
        bool const success = (fi.isOK() && fi.isDir());
 
        if (!success) {
-               lyxerr << bformat(_("Invalid %1% environment variable.\n"
-                                   "%2% is not a directory."),
-                                 env_var, dir)
+               // Put this string on a single line so that the gettext
+               // search mechanism in po/Makefile.in.in will register
+               // package.C.in as a file containing strings that need
+               // translation.
+               string const fmt =
+               _("Invalid %1% environment variable.\n%2% is not a directory.");
+               
+               lyxerr << bformat(fmt, env_var, dir)
                       << std::endl;
        }