diff options
| author | Didier Raboud <odyx@debian.org> | 2012-12-16 21:51:12 +0100 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2012-12-16 21:56:55 +0100 |
| commit | a266692615e146246fd547c5b132a1fcc98b6a10 (patch) | |
| tree | c2611ca8f6e718725e058771c151ec674f10d1a0 /src | |
| parent | 0b78ebd0f79fa8dbdb69f748551b83cf3f1b947d (diff) | |
| download | colobot-a266692615e146246fd547c5b132a1fcc98b6a10.tar.gz colobot-a266692615e146246fd547c5b132a1fcc98b6a10.tar.bz2 colobot-a266692615e146246fd547c5b132a1fcc98b6a10.zip | |
Use default installation paths for i18n.
This finishes the work started in
19b75e174338f8e7be7486a7445d1e90e9795077 by actually using the
translation where they are installed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/app/app.cpp | 4 | ||||
| -rw-r--r-- | src/common/config.h.cmake | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/app/app.cpp b/src/app/app.cpp index 751ff21..79c0e13 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -142,7 +142,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"; @@ -322,8 +321,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 8c85df1..f76a780 100644 --- a/src/common/config.h.cmake +++ b/src/common/config.h.cmake @@ -6,4 +6,6 @@ #cmakedefine PLATFORM_OTHER @PLATFORM_OTHER@ #cmakedefine USE_GLEW @USE_GLEW@ -#cmakedefine GLEW_STATIC
\ No newline at end of file +#cmakedefine GLEW_STATIC + +#define CBOT_I18N_DIR "@CMAKE_INSTALL_PREFIX@/share/locale/" |