immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #91 from OdyX/dev-use-installed-i18n 

Use default installation paths for i18n.
dev-ui
Erihel 2012-12-16 13:28:15 -08:00
parent 6bd37341df 4827440e73
commit 5a78b26f75
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/app.cpp
View File

@ -143,7 +143,6 @@ CApplication::CApplication()
m_dataDirs[DIR_AI] = "ai"; m_dataDirs[DIR_AI] = "ai";
m_dataDirs[DIR_FONT] = "fonts"; m_dataDirs[DIR_FONT] = "fonts";
m_dataDirs[DIR_HELP] = "help"; m_dataDirs[DIR_HELP] = "help";
m_dataDirs[DIR_I18N] = "i18n";
m_dataDirs[DIR_ICON] = "icons"; m_dataDirs[DIR_ICON] = "icons";
m_dataDirs[DIR_LEVEL] = "levels"; m_dataDirs[DIR_LEVEL] = "levels";
m_dataDirs[DIR_MODEL] = "models"; m_dataDirs[DIR_MODEL] = "models";
@ -323,8 +322,7 @@ bool CApplication::Create()
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
GetLogger()->Debug("Set locale to '%s'\n", locale.c_str()); GetLogger()->Debug("Set locale to '%s'\n", locale.c_str());
std::string trPath = m_dataPath + "/" + m_dataDirs[DIR_I18N]; bindtextdomain("colobot", CBOT_I18N_DIR);
bindtextdomain("colobot", trPath.c_str());
bind_textdomain_codeset("colobot", "UTF-8"); bind_textdomain_codeset("colobot", "UTF-8");
textdomain("colobot"); textdomain("colobot");

1
src/common/config.h.cmake
View File

@ -9,3 +9,4 @@
#cmakedefine GLEW_STATIC #cmakedefine GLEW_STATIC
#define CBOT_DEFAULT_DATADIR "@COLOBOT_DATA_DIR@" #define CBOT_DEFAULT_DATADIR "@COLOBOT_DATA_DIR@"
#define CBOT_I18N_DIR "@CMAKE_INSTALL_PREFIX@/share/locale/"