[Wesnoth-cvs-commits] wesnoth ./Makefile.am src/language.cpp

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    05/06/03 20:19:29

Modified files:
        .              : Makefile.am 
        src            : language.cpp 

Log message:
        Fix dummy locales not working on Debian for Japanese and Korean.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/Makefile.am.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/language.cpp.diff?tr1=1.89&tr2=1.90&r1=text&r2=text

Patches:
Index: wesnoth/Makefile.am
diff -u wesnoth/Makefile.am:1.40 wesnoth/Makefile.am:1.41
--- wesnoth/Makefile.am:1.40    Thu May 26 13:41:17 2005
+++ wesnoth/Makefile.am Fri Jun  3 20:19:29 2005
@@ -57,8 +57,9 @@
        if test -d "$(DESTDIR)$(pkgdatadir)/locales/C" ; then rm -r 
"$(DESTDIR)$(pkgdatadir)/locales/C" ; fi
        echo | localedef --force "$(DESTDIR)$(pkgdatadir)/locales/C" 2> 
/dev/null; \
        for loc in `sed -n 's/^.*language_def..\(.._..\).*$$/\1/p' 
"$(srcdir)/src/language.cpp"`; do \
-         if test -L "$(DESTDIR)$(pkgdatadir)/locales/$$loc" ; then rm 
"$(DESTDIR)$(pkgdatadir)/locales/$$loc" ; fi; \
-         ln -s C "$(DESTDIR)$(pkgdatadir)/locales/$$loc"; done; \
+         loclnk="$(DESTDIR)$(pkgdatadir)/locales/$$loc"@wesnoth; \
+         if test -L "$$loclnk" ; then rm "$$loclnk" ; fi; \
+         ln -s C "$$loclnk"; done; \
        true
 endif
 if TINYGUI
Index: wesnoth/src/language.cpp
diff -u wesnoth/src/language.cpp:1.89 wesnoth/src/language.cpp:1.90
--- wesnoth/src/language.cpp:1.89       Mon May 16 22:44:19 2005
+++ wesnoth/src/language.cpp    Fri Jun  3 20:19:29 2005
@@ -1,4 +1,4 @@
-/* $Id: language.cpp,v 1.89 2005/05/16 22:44:19 ydirson Exp $ */
+/* $Id: language.cpp,v 1.90 2005/06/03 20:19:29 silene Exp $ */
 /* vim:set encoding=utf-8: */
 /*
    Copyright (C) 2003 by David White <address@hidden>
@@ -156,6 +156,12 @@
                else
                        setenv("LOCPATH", locpath.c_str(), 1);
        else setenv("LOCPATH", (game_config::path + "/locales").c_str(), 1);
+       std::string xlocale;
+       if (!slocale.empty()) {
+               // dummy suffix to prevent locale aliasing from kicking in
+               xlocale = slocale + "@wesnoth";
+               locale = xlocale.c_str();
+       }
 #endif
        char* res = setlocale (category, locale);
        if (res == NULL)