diff options
author | Erihel <erihel@gmail.com> | 2012-12-16 13:28:15 -0800 |
---|---|---|
committer | Erihel <erihel@gmail.com> | 2012-12-16 13:28:15 -0800 |
commit | 5a78b26f758ed0fa4b603ef086d21965e15010cd (patch) | |
tree | 68b48c2c64746bf9ee38d18ad9d9c973b8d23ea3 /src | |
parent | 6bd37341dfe2eb382d654f34a2b89db7fa30d8c2 (diff) | |
parent | 4827440e737248aff2c756444108a4be0b0d63e6 (diff) | |
download | colobot-5a78b26f758ed0fa4b603ef086d21965e15010cd.tar.gz colobot-5a78b26f758ed0fa4b603ef086d21965e15010cd.tar.bz2 colobot-5a78b26f758ed0fa4b603ef086d21965e15010cd.zip |
Merge pull request #91 from OdyX/dev-use-installed-i18n
Use default installation paths for i18n.
Diffstat (limited to 'src')
-rw-r--r-- | src/app/app.cpp | 4 | ||||
-rw-r--r-- | src/common/config.h.cmake | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/app/app.cpp b/src/app/app.cpp index 980ecc1..04f8d2a 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -143,7 +143,6 @@ CApplication::CApplication() m_dataDirs[DIR_AI] = "ai"; m_dataDirs[DIR_FONT] = "fonts"; m_dataDirs[DIR_HELP] = "help"; - m_dataDirs[DIR_I18N] = "i18n"; m_dataDirs[DIR_ICON] = "icons"; m_dataDirs[DIR_LEVEL] = "levels"; m_dataDirs[DIR_MODEL] = "models"; @@ -323,8 +322,7 @@ bool CApplication::Create() setlocale(LC_ALL, ""); GetLogger()->Debug("Set locale to '%s'\n", locale.c_str()); - std::string trPath = m_dataPath + "/" + m_dataDirs[DIR_I18N]; - bindtextdomain("colobot", trPath.c_str()); + bindtextdomain("colobot", CBOT_I18N_DIR); bind_textdomain_codeset("colobot", "UTF-8"); textdomain("colobot"); diff --git a/src/common/config.h.cmake b/src/common/config.h.cmake index 7cc2386..23b6de8 100644 --- a/src/common/config.h.cmake +++ b/src/common/config.h.cmake @@ -9,3 +9,4 @@ #cmakedefine GLEW_STATIC #define CBOT_DEFAULT_DATADIR "@COLOBOT_DATA_DIR@" +#define CBOT_I18N_DIR "@CMAKE_INSTALL_PREFIX@/share/locale/" |