anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enable "lyx -dbg init" to run.

Browse Source 
Tweak gettext search mechanism.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9467 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2005-01-12 12:25:30 +00:00
parent f717cb6b22
commit 412f8af4fd
5 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
po/ChangeLog
View File

@ -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

2
po/Makefile.in.in
View File

@ -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 $@

1
po/POTFILES.in
View File

@ -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

8
src/support/ChangeLog
View File

@ -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.

15
src/support/package.C.in
View File

@ -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;
}