[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src game.cpp language.cpp preferences.c...
From: |
Guillaume Melquiond |
Subject: |
[Wesnoth-cvs-commits] wesnoth/src game.cpp language.cpp preferences.c... |
Date: |
Mon, 27 Dec 2004 12:42:34 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Guillaume Melquiond <address@hidden> 04/12/27 17:23:32
Modified files:
src : game.cpp language.cpp preferences.cpp
preferences.hpp
Log message:
Switched from 'locale' to 'language', and let's hope IRIX headers do
not conflict anymore now.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.176&tr2=1.177&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/language.cpp.diff?tr1=1.61&tr2=1.62&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/preferences.cpp.diff?tr1=1.127&tr2=1.128&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/preferences.hpp.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
Patches:
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.176 wesnoth/src/game.cpp:1.177
--- wesnoth/src/game.cpp:1.176 Sun Dec 19 22:06:32 2004
+++ wesnoth/src/game.cpp Mon Dec 27 17:23:32 2004
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.176 2004/12/19 22:06:32 silene Exp $ */
+/* $Id: game.cpp,v 1.177 2004/12/27 17:23:32 silene Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1320,7 +1320,7 @@
gui::OK_CANCEL,&langs);
if(size_t(res) < langs.size()) {
set_language(known_languages[res]);
- preferences::set_locale(known_languages[res].localename);
+ preferences::set_language(known_languages[res].localename);
//force a reload of configuration information
const bool old_cache = use_caching_;
Index: wesnoth/src/language.cpp
diff -u wesnoth/src/language.cpp:1.61 wesnoth/src/language.cpp:1.62
--- wesnoth/src/language.cpp:1.61 Mon Dec 20 20:41:55 2004
+++ wesnoth/src/language.cpp Mon Dec 27 17:23:32 2004
@@ -1,4 +1,4 @@
-/* $Id: language.cpp,v 1.61 2004/12/20 20:41:55 isaaccp Exp $ */
+/* $Id: language.cpp,v 1.62 2004/12/27 17:23:32 silene Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -177,7 +177,7 @@
{
//TODO: Add in support for querying the locale on Windows
- const std::string& prefs_locale = preferences::locale();
+ const std::string& prefs_locale = preferences::language();
if(prefs_locale.empty() == false) {
char* setlocaleres = wesnoth_setlocale (LC_MESSAGES,
prefs_locale.c_str());
if(setlocaleres == NULL)
Index: wesnoth/src/preferences.cpp
diff -u wesnoth/src/preferences.cpp:1.127 wesnoth/src/preferences.cpp:1.128
--- wesnoth/src/preferences.cpp:1.127 Mon Dec 13 05:40:44 2004
+++ wesnoth/src/preferences.cpp Mon Dec 27 17:23:32 2004
@@ -1,4 +1,4 @@
-/* $Id: preferences.cpp,v 1.127 2004/12/13 05:40:44 isaaccp Exp $ */
+/* $Id: preferences.cpp,v 1.128 2004/12/27 17:23:32 silene Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -227,12 +227,12 @@
}
}
-const std::string& locale()
+const std::string& language()
{
return prefs["locale"];
}
-void set_locale(const std::string& s)
+void set_language(const std::string& s)
{
prefs["locale"] = s;
}
Index: wesnoth/src/preferences.hpp
diff -u wesnoth/src/preferences.hpp:1.43 wesnoth/src/preferences.hpp:1.44
--- wesnoth/src/preferences.hpp:1.43 Mon Dec 13 05:40:44 2004
+++ wesnoth/src/preferences.hpp Mon Dec 27 17:23:32 2004
@@ -1,4 +1,4 @@
-/* $Id: preferences.hpp,v 1.43 2004/12/13 05:40:44 isaaccp Exp $ */
+/* $Id: preferences.hpp,v 1.44 2004/12/27 17:23:32 silene Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -52,8 +52,8 @@
bool turbo();
void set_turbo(bool ison);
- const std::string& locale();
- void set_locale(const std::string& s);
+ const std::string& language();
+ void set_language(const std::string& s);
int music_volume();
void set_music_volume(int vol);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/src game.cpp language.cpp preferences.c...,
Guillaume Melquiond <=