diff options
Diffstat (limited to '')
| -rw-r--r-- | src/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/main.cpp | 6 |
2 files changed, 6 insertions, 11 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 79eae6ea..0c75be69 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -83,17 +83,16 @@ if (MULTI_LANG_SUPPORT) GET_FILENAME_COMPONENT(_poFileName ${_poFile} NAME) string(REGEX REPLACE "\\.[^.]*$" "" _langName ${_poFileName}) message(STATUS "_poFileName ${_langName}") - make_directory(${CMAKE_SOURCE_DIR}/resource/locale/out/${_langName}/LC_MESSAGES) + make_directory(${RESOURCE_OUTPUT_DIRECTORY}/locales) + make_directory(${RESOURCE_OUTPUT_DIRECTORY}/locales/${_langName}/LC_MESSAGES) add_custom_command( TARGET translations COMMAND echo Processing po LANG ${_langName} ) add_custom_command( TARGET translations - COMMAND msgfmt --check --verbose --output-file ${CMAKE_SOURCE_DIR}/resource/locale/out/${_langName}/LC_MESSAGES/GpgFrontend.mo ${_poFile} + COMMAND msgfmt --check --verbose --output-file ${RESOURCE_OUTPUT_DIRECTORY}/locales/${_langName}/LC_MESSAGES/GpgFrontend.mo ${_poFile} ) - add_custom_command(TARGET translations - COMMAND cp -rf ${CMAKE_SOURCE_DIR}/resource/locale/out/ ${RESOURCE_OUTPUT_DIRECTORY}/locales) endforeach () endif () @@ -109,10 +108,6 @@ if (APPLICATION_BUILD) # Copy Resource Files file(COPY ${CMAKE_SOURCE_DIR}/resource/css DESTINATION ${RESOURCE_OUTPUT_DIRECTORY}/ FOLLOW_SYMLINK_CHAIN) file(COPY ${CMAKE_SOURCE_DIR}/resource/icons DESTINATION ${RESOURCE_OUTPUT_DIRECTORY}/ FOLLOW_SYMLINK_CHAIN) - if (MULTI_LANG_SUPPORT) - make_directory(${RESOURCE_OUTPUT_DIRECTORY}/locales) - file(COPY ${CMAKE_SOURCE_DIR}/resource/locale/out/ DESTINATION ${RESOURCE_OUTPUT_DIRECTORY}/locales FOLLOW_SYMLINK_CHAIN) - endif () file(COPY ${CMAKE_SOURCE_DIR}/TRANSLATORS DESTINATION ${RESOURCE_OUTPUT_DIRECTORY} FOLLOW_SYMLINK_CHAIN) endif () diff --git a/src/main.cpp b/src/main.cpp index 8250c77b..1dbf1d5e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -43,7 +43,7 @@ int main(int argc, char* argv[]) { QApplication::setWindowIcon(QIcon(":gpgfrontend.png")); #ifdef MACOS - // support retina screen + // support retina screen QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); #endif @@ -180,14 +180,14 @@ void init_locale() { if (putenv(language_env.c_str())) { LOG(WARNING) << "set LANGUAGE failed" << language_env; }; - } + } #endif - bindtextdomain(PROJECT_NAME, GpgFrontend::UI::GlobalSettingStation::GetInstance() .GetLocaleDir() .string() .c_str()); + bind_textdomain_codeset(PROJECT_NAME, "utf-8"); textdomain(PROJECT_NAME); } |