anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-11 13:46:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
10,104 Commits 31 Branches 172 Tags 616 MiB
023fb5433c
Commit Graph

32 Commits

Author SHA1 Message Date
José Matox
89a92e955d Fix from George to deal with the --disable-nls case 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14976 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-09-11 11:58:47 +00:00
Lars Gullik Bjønnes
5aa348d969 Make the l10n machinery work with ucs4. Update (as wip) callers to do manual conversion and a FIXME comment. Lots of work to do. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14951 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-09-09 11:16:28 +00:00
Bo Peng
31d4e8d00f Do not print locale warning under cygwin, from Enrico 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14942 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-09-08 14:43:50 +00:00
Peter Kümmel
df04880e55 fix crash on startup under windows by avoiding the call 
setlocale(LC_MESSAGES, ...

scons tests on LC_MESSAGES there is also an m4 file for LC_MESSAGES
so I think all build systems handle HAVE_LC_MESSAGES.



Index: src/messages.C
===================================================================
--- src/messages.C      (revision 14066)
+++ src/messages.C      (working copy)
@@ -90,7 +90,10 @@
                : lang_(l)
        {
                if ( lang_.empty() ) {
-                       char const * lc_msgs = setlocale(LC_MESSAGES, NULL);
+                       char const * lc_msgs = 0;
+#ifdef HAVE_LC_MESSAGES
+                       lc_msgs = setlocale(LC_MESSAGES, NULL);
+#endif
                        lang_ = lc_msgs ? lc_msgs : "";
                }
                // strip off any encoding suffix, i.e., assume 8-bit po files
@@ -117,8 +120,9 @@
                                        lang = "C";
                        }
                }
-
+#ifdef HAVE_LC_MESSAGES
                char const * lc_msgs = setlocale(LC_MESSAGES, lang_.c_str());
+#endif
                // setlocale fails (returns NULL) if the corresponding locale
                // is not installed.
                // On windows (mingw) it always returns NULL.
@@ -164,7 +168,9 @@
                boost::smatch sub;
                if (regex_match(translated, sub, reg))
                        translated = sub.str(1);
+#ifdef HAVE_LC_MESSAGES
                setlocale(LC_MESSAGES, lang.c_str());
+#endif
                setlocale(LC_CTYPE, oldCTYPE.c_str());
                return translated;
        }


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14067 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-10 07:05:21 +00:00
Lars Gullik Bjønnes
3b9338a3a8 Whitespace cleanup. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13565 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-04-05 23:56:29 +00:00
Georg Baum
179efb7a46 fix bug 2177 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10790 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-01-28 20:13:10 +00:00
Michael Schmitt
9e96ada08b fix crash and localization on MinGW/Windows platform 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10586 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-11-03 09:21:09 +00:00
Jean-Marc Lasgouttes
7f31131552 compilation fix for cygwin 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10559 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-10-18 13:34:51 +00:00
Jean-Marc Lasgouttes
16c957358a incluse boost/current_function.hpp when needed 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10482 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-09-26 09:20:15 +00:00
Martin Vermeer
a798566541 Help Helge debug locale problem 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10397 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-08-18 01:46:44 +00:00
Lars Gullik Bjønnes
7a23f39975 small lyxerr fix, version to 1.4.0pre1 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10328 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-07-18 15:12:15 +00:00
Martin Vermeer
baa6723a40 Second Locale patch. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10275 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-07-17 11:58:54 +00:00
André Pönitz
7e08de938a other people's work 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10248 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-07-16 15:55:36 +00:00
Angus Leeming
b5589bf6cf The package reworking. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9463 a592a061-630c-0410-9148-cb99ea01b6c8
 2005-01-10 19:17:43 +00:00
Angus Leeming
82dca177a3 Remove redundant "using lyx::support::GetEnvPath;" 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9388 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-12-16 14:53:58 +00:00
Georg Baum
e416d1aea7 enable translation of ambigous messages 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9097 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-10-19 09:11:02 +00:00
Jean-Marc Lasgouttes
384da17690 fix handling of locales with LyX/Mac 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8807 a592a061-630c-0410-9148-cb99ea01b6c8
 2004-06-08 14:06:11 +00:00
Lars Gullik Bjønnes
44cd0fc9a1 The std::string mammoth path. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7862 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-10-06 15:43:21 +00:00
Angus Leeming
57a24ea912 Replace 'using namespace abc;' with 'using abc::xyz;' 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7725 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-09-09 22:13:45 +00:00
Angus Leeming
91de22ef34 Strip 320 #includes from the files in src. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7684 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-09-05 16:31:30 +00:00
Angus Leeming
0be0fcfd59 If I ever see another licence blurb again, it'll be too soon... 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7598 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-08-23 00:17:00 +00:00
Lars Gullik Bjønnes
4a6041664e lyx_localedir fix 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7410 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-07-28 11:43:40 +00:00
Lars Gullik Bjønnes
92d522b7f1 introduce namespace lyx::support 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7224 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-06-30 23:56:22 +00:00
Lars Gullik Bjønnes
309c18fbeb the current_view patch 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7140 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-06-10 14:39:45 +00:00
Lars Gullik Bjønnes
a52a7b5895 remove one more unneeded variable 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6866 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-04-28 02:13:47 +00:00
Lars Gullik Bjønnes
64cb709f78 dummy change 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6865 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-04-28 01:52:18 +00:00
Lars Gullik Bjønnes
e2b65dec0c more messages work 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6864 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-04-27 22:11:45 +00:00
Lars Gullik Bjønnes
7eec4960de make the message stuff work better 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6853 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-04-25 01:54:04 +00:00
Lars Gullik Bjønnes
6b6f256944 fix typo 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6851 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-04-24 23:46:40 +00:00
Lars Gullik Bjønnes
4fbee58346 More messages work. Should now also 
compile on some older compilers.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6848 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-04-24 22:09:46 +00:00
Lars Gullik Bjønnes
795e9a7586 add missing char 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6842 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-04-23 20:44:53 +00:00
Lars Gullik Bjønnes
4fbd6bcd95 messge files 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6840 a592a061-630c-0410-9148-cb99ea01b6c8
 2003-04-23 18:47:21 +00:00