From 1b453d04365c96991523a28df6424af2b3dd012b Mon Sep 17 00:00:00 2001 From: TellowKrinkle Date: Sun, 12 Dec 2021 15:13:51 -0600 Subject: [PATCH] GUI: Move translations to resources directory Also fixes finding translations in package mode builds --- .github/workflows/scripts/linux/appimage.sh | 1 - .../locale}/ar_SA/pcsx2_Iconized.mo | Bin .../locale}/ar_SA/pcsx2_Main.mo | Bin .../locale}/ca_ES/pcsx2_Iconized.mo | Bin .../locale}/ca_ES/pcsx2_Main.mo | Bin .../locale}/cs_CZ/pcsx2_Iconized.mo | Bin .../locale}/cs_CZ/pcsx2_Main.mo | Bin .../locale}/da_DK/pcsx2_Iconized.mo | Bin .../locale}/da_DK/pcsx2_Main.mo | Bin .../locale}/de_DE/pcsx2_Iconized.mo | Bin .../locale}/de_DE/pcsx2_Main.mo | Bin .../locale}/es_ES/pcsx2_Iconized.mo | Bin .../locale}/es_ES/pcsx2_Main.mo | Bin .../locale}/fi_FI/pcsx2_Iconized.mo | Bin .../locale}/fi_FI/pcsx2_Main.mo | Bin .../locale}/fr_FR/pcsx2_Iconized.mo | Bin .../locale}/fr_FR/pcsx2_Main.mo | Bin .../locale}/hr_HR/pcsx2_Iconized.mo | Bin .../locale}/hr_HR/pcsx2_Main.mo | Bin .../locale}/hu_HU/pcsx2_Iconized.mo | Bin .../locale}/hu_HU/pcsx2_Main.mo | Bin .../locale}/id_ID/pcsx2_Iconized.mo | Bin .../locale}/id_ID/pcsx2_Main.mo | Bin .../locale}/it_IT/pcsx2_Iconized.mo | Bin .../locale}/it_IT/pcsx2_Main.mo | Bin .../locale}/ja_JP/pcsx2_Iconized.mo | Bin .../locale}/ja_JP/pcsx2_Main.mo | Bin .../locale}/ko_KR/pcsx2_Iconized.mo | Bin .../locale}/ko_KR/pcsx2_Main.mo | Bin .../locale}/lt_LT/pcsx2_Iconized.mo | Bin .../locale}/lt_LT/pcsx2_Main.mo | Bin .../locale}/ms_MY/pcsx2_Iconized.mo | Bin .../locale}/ms_MY/pcsx2_Main.mo | Bin .../locale}/nb_NO/pcsx2_Iconized.mo | Bin .../locale}/nb_NO/pcsx2_Main.mo | Bin .../locale}/nl_NL/pcsx2_Iconized.mo | Bin .../locale}/nl_NL/pcsx2_Main.mo | Bin .../locale}/pl_PL/pcsx2_Iconized.mo | Bin .../locale}/pl_PL/pcsx2_Main.mo | Bin .../locale}/pt_BR/pcsx2_Iconized.mo | Bin .../locale}/pt_BR/pcsx2_Main.mo | Bin .../locale}/ru_RU/pcsx2_Iconized.mo | Bin .../locale}/ru_RU/pcsx2_Main.mo | Bin .../locale}/sv_SE/pcsx2_Iconized.mo | Bin .../locale}/sv_SE/pcsx2_Main.mo | Bin .../locale}/th_TH/pcsx2_Iconized.mo | Bin .../locale}/th_TH/pcsx2_Main.mo | Bin .../locale}/tr_TR/pcsx2_Iconized.mo | Bin .../locale}/tr_TR/pcsx2_Main.mo | Bin .../locale}/zh_CN/pcsx2_Iconized.mo | Bin .../locale}/zh_CN/pcsx2_Main.mo | Bin .../locale}/zh_TW/pcsx2_Iconized.mo | Bin .../locale}/zh_TW/pcsx2_Main.mo | Bin cmake/Translation.cmake | 8 ++++---- pcsx2/CMakeLists.txt | 3 +++ pcsx2/gui/AppConfig.cpp | 16 ++++++---------- pcsx2/gui/i18n.cpp | 8 +------- 57 files changed, 14 insertions(+), 22 deletions(-) rename bin/{Langs => resources/locale}/ar_SA/pcsx2_Iconized.mo (100%) rename bin/{Langs => resources/locale}/ar_SA/pcsx2_Main.mo (100%) rename bin/{Langs => resources/locale}/ca_ES/pcsx2_Iconized.mo (100%) rename bin/{Langs => resources/locale}/ca_ES/pcsx2_Main.mo (100%) rename bin/{Langs => resources/locale}/cs_CZ/pcsx2_Iconized.mo (100%) rename bin/{Langs => resources/locale}/cs_CZ/pcsx2_Main.mo (100%) rename bin/{Langs => resources/locale}/da_DK/pcsx2_Iconized.mo (100%) rename bin/{Langs => resources/locale}/da_DK/pcsx2_Main.mo (100%) rename bin/{Langs => resources/locale}/de_DE/pcsx2_Iconized.mo (100%) rename bin/{Langs => resources/locale}/de_DE/pcsx2_Main.mo (100%) rename bin/{Langs => resources/locale}/es_ES/pcsx2_Iconized.mo (100%) rename bin/{Langs => resources/locale}/es_ES/pcsx2_Main.mo (100%) rename bin/{Langs => resources/locale}/fi_FI/pcsx2_Iconized.mo (100%) rename bin/{Langs => resources/locale}/fi_FI/pcsx2_Main.mo (100%) rename bin/{Langs => resources/locale}/fr_FR/pcsx2_Iconized.mo (100%) rename bin/{Langs => resources/locale}/fr_FR/pcsx2_Main.mo (100%) rename bin/{Langs => resources/locale}/hr_HR/pcsx2_Iconized.mo (100%) rename bin/{Langs => resources/locale}/hr_HR/pcsx2_Main.mo (100%) rename bin/{Langs => resources/locale}/hu_HU/pcsx2_Iconized.mo (100%) rename bin/{Langs => resources/locale}/hu_HU/pcsx2_Main.mo (100%) rename bin/{Langs => resources/locale}/id_ID/pcsx2_Iconized.mo (100%) rename bin/{Langs => resources/locale}/id_ID/pcsx2_Main.mo (100%) rename bin/{Langs => resources/locale}/it_IT/pcsx2_Iconized.mo (100%) rename bin/{Langs => resources/locale}/it_IT/pcsx2_Main.mo (100%) rename bin/{Langs => resources/locale}/ja_JP/pcsx2_Iconized.mo (100%) rename bin/{Langs => resources/locale}/ja_JP/pcsx2_Main.mo (100%) rename bin/{Langs => resources/locale}/ko_KR/pcsx2_Iconized.mo (100%) rename bin/{Langs => resources/locale}/ko_KR/pcsx2_Main.mo (100%) rename bin/{Langs => resources/locale}/lt_LT/pcsx2_Iconized.mo (100%) rename bin/{Langs => resources/locale}/lt_LT/pcsx2_Main.mo (100%) rename bin/{Langs => resources/locale}/ms_MY/pcsx2_Iconized.mo (100%) rename bin/{Langs => resources/locale}/ms_MY/pcsx2_Main.mo (100%) rename bin/{Langs => resources/locale}/nb_NO/pcsx2_Iconized.mo (100%) rename bin/{Langs => resources/locale}/nb_NO/pcsx2_Main.mo (100%) rename bin/{Langs => resources/locale}/nl_NL/pcsx2_Iconized.mo (100%) rename bin/{Langs => resources/locale}/nl_NL/pcsx2_Main.mo (100%) rename bin/{Langs => resources/locale}/pl_PL/pcsx2_Iconized.mo (100%) rename bin/{Langs => resources/locale}/pl_PL/pcsx2_Main.mo (100%) rename bin/{Langs => resources/locale}/pt_BR/pcsx2_Iconized.mo (100%) rename bin/{Langs => resources/locale}/pt_BR/pcsx2_Main.mo (100%) rename bin/{Langs => resources/locale}/ru_RU/pcsx2_Iconized.mo (100%) rename bin/{Langs => resources/locale}/ru_RU/pcsx2_Main.mo (100%) rename bin/{Langs => resources/locale}/sv_SE/pcsx2_Iconized.mo (100%) rename bin/{Langs => resources/locale}/sv_SE/pcsx2_Main.mo (100%) rename bin/{Langs => resources/locale}/th_TH/pcsx2_Iconized.mo (100%) rename bin/{Langs => resources/locale}/th_TH/pcsx2_Main.mo (100%) rename bin/{Langs => resources/locale}/tr_TR/pcsx2_Iconized.mo (100%) rename bin/{Langs => resources/locale}/tr_TR/pcsx2_Main.mo (100%) rename bin/{Langs => resources/locale}/zh_CN/pcsx2_Iconized.mo (100%) rename bin/{Langs => resources/locale}/zh_CN/pcsx2_Main.mo (100%) rename bin/{Langs => resources/locale}/zh_TW/pcsx2_Iconized.mo (100%) rename bin/{Langs => resources/locale}/zh_TW/pcsx2_Main.mo (100%) diff --git a/.github/workflows/scripts/linux/appimage.sh b/.github/workflows/scripts/linux/appimage.sh index f124465e8e..69cf3ba391 100755 --- a/.github/workflows/scripts/linux/appimage.sh +++ b/.github/workflows/scripts/linux/appimage.sh @@ -49,7 +49,6 @@ chmod a+x ./squashfs-root/usr/optional/exec.so echo "$name" > "$GITHUB_WORKSPACE"/squashfs-root/version.txt mkdir -p "$GITHUB_WORKSPACE"/squashfs-root/usr/bin/app mkdir -p "$GITHUB_WORKSPACE"/squashfs-root/apprun-hooks -cp -r "$GITHUB_WORKSPACE"/bin/Langs "$GITHUB_WORKSPACE"/squashfs-root/usr/bin/ cp -r "$GITHUB_WORKSPACE"/bin/resources "$GITHUB_WORKSPACE"/squashfs-root/usr/bin/app/ cp "$GITHUB_WORKSPACE"/bin/docs/{Configuration_Guide.pdf,PCSX2_FAQ.pdf} "$GITHUB_WORKSPACE"/squashfs-root/usr/bin/app cp /usr/lib/$LIBARCH/libthai.so.0 "$GITHUB_WORKSPACE"/squashfs-root/usr/lib/ diff --git a/bin/Langs/ar_SA/pcsx2_Iconized.mo b/bin/resources/locale/ar_SA/pcsx2_Iconized.mo similarity index 100% rename from bin/Langs/ar_SA/pcsx2_Iconized.mo rename to bin/resources/locale/ar_SA/pcsx2_Iconized.mo diff --git a/bin/Langs/ar_SA/pcsx2_Main.mo b/bin/resources/locale/ar_SA/pcsx2_Main.mo similarity index 100% rename from bin/Langs/ar_SA/pcsx2_Main.mo rename to bin/resources/locale/ar_SA/pcsx2_Main.mo diff --git a/bin/Langs/ca_ES/pcsx2_Iconized.mo b/bin/resources/locale/ca_ES/pcsx2_Iconized.mo similarity index 100% rename from bin/Langs/ca_ES/pcsx2_Iconized.mo rename to bin/resources/locale/ca_ES/pcsx2_Iconized.mo diff --git a/bin/Langs/ca_ES/pcsx2_Main.mo b/bin/resources/locale/ca_ES/pcsx2_Main.mo similarity index 100% rename from bin/Langs/ca_ES/pcsx2_Main.mo rename to bin/resources/locale/ca_ES/pcsx2_Main.mo diff --git a/bin/Langs/cs_CZ/pcsx2_Iconized.mo b/bin/resources/locale/cs_CZ/pcsx2_Iconized.mo similarity index 100% rename from bin/Langs/cs_CZ/pcsx2_Iconized.mo rename to bin/resources/locale/cs_CZ/pcsx2_Iconized.mo diff --git a/bin/Langs/cs_CZ/pcsx2_Main.mo b/bin/resources/locale/cs_CZ/pcsx2_Main.mo similarity index 100% rename from bin/Langs/cs_CZ/pcsx2_Main.mo rename to bin/resources/locale/cs_CZ/pcsx2_Main.mo diff --git a/bin/Langs/da_DK/pcsx2_Iconized.mo b/bin/resources/locale/da_DK/pcsx2_Iconized.mo similarity index 100% rename from bin/Langs/da_DK/pcsx2_Iconized.mo rename to bin/resources/locale/da_DK/pcsx2_Iconized.mo diff --git a/bin/Langs/da_DK/pcsx2_Main.mo b/bin/resources/locale/da_DK/pcsx2_Main.mo similarity index 100% rename from bin/Langs/da_DK/pcsx2_Main.mo rename to bin/resources/locale/da_DK/pcsx2_Main.mo diff --git a/bin/Langs/de_DE/pcsx2_Iconized.mo b/bin/resources/locale/de_DE/pcsx2_Iconized.mo similarity index 100% rename from bin/Langs/de_DE/pcsx2_Iconized.mo rename to bin/resources/locale/de_DE/pcsx2_Iconized.mo diff --git a/bin/Langs/de_DE/pcsx2_Main.mo b/bin/resources/locale/de_DE/pcsx2_Main.mo similarity index 100% rename from bin/Langs/de_DE/pcsx2_Main.mo rename to bin/resources/locale/de_DE/pcsx2_Main.mo diff --git a/bin/Langs/es_ES/pcsx2_Iconized.mo b/bin/resources/locale/es_ES/pcsx2_Iconized.mo similarity index 100% rename from bin/Langs/es_ES/pcsx2_Iconized.mo rename to bin/resources/locale/es_ES/pcsx2_Iconized.mo diff --git a/bin/Langs/es_ES/pcsx2_Main.mo b/bin/resources/locale/es_ES/pcsx2_Main.mo similarity index 100% rename from bin/Langs/es_ES/pcsx2_Main.mo rename to bin/resources/locale/es_ES/pcsx2_Main.mo diff --git a/bin/Langs/fi_FI/pcsx2_Iconized.mo b/bin/resources/locale/fi_FI/pcsx2_Iconized.mo similarity index 100% rename from bin/Langs/fi_FI/pcsx2_Iconized.mo rename to bin/resources/locale/fi_FI/pcsx2_Iconized.mo diff --git a/bin/Langs/fi_FI/pcsx2_Main.mo b/bin/resources/locale/fi_FI/pcsx2_Main.mo similarity index 100% rename from bin/Langs/fi_FI/pcsx2_Main.mo rename to bin/resources/locale/fi_FI/pcsx2_Main.mo diff --git a/bin/Langs/fr_FR/pcsx2_Iconized.mo b/bin/resources/locale/fr_FR/pcsx2_Iconized.mo similarity index 100% rename from bin/Langs/fr_FR/pcsx2_Iconized.mo rename to bin/resources/locale/fr_FR/pcsx2_Iconized.mo diff --git a/bin/Langs/fr_FR/pcsx2_Main.mo b/bin/resources/locale/fr_FR/pcsx2_Main.mo similarity index 100% rename from bin/Langs/fr_FR/pcsx2_Main.mo rename to bin/resources/locale/fr_FR/pcsx2_Main.mo diff --git a/bin/Langs/hr_HR/pcsx2_Iconized.mo b/bin/resources/locale/hr_HR/pcsx2_Iconized.mo similarity index 100% rename from bin/Langs/hr_HR/pcsx2_Iconized.mo rename to bin/resources/locale/hr_HR/pcsx2_Iconized.mo diff --git a/bin/Langs/hr_HR/pcsx2_Main.mo b/bin/resources/locale/hr_HR/pcsx2_Main.mo similarity index 100% rename from bin/Langs/hr_HR/pcsx2_Main.mo rename to bin/resources/locale/hr_HR/pcsx2_Main.mo diff --git a/bin/Langs/hu_HU/pcsx2_Iconized.mo b/bin/resources/locale/hu_HU/pcsx2_Iconized.mo similarity index 100% rename from bin/Langs/hu_HU/pcsx2_Iconized.mo rename to bin/resources/locale/hu_HU/pcsx2_Iconized.mo diff --git a/bin/Langs/hu_HU/pcsx2_Main.mo b/bin/resources/locale/hu_HU/pcsx2_Main.mo similarity index 100% rename from bin/Langs/hu_HU/pcsx2_Main.mo rename to bin/resources/locale/hu_HU/pcsx2_Main.mo diff --git a/bin/Langs/id_ID/pcsx2_Iconized.mo b/bin/resources/locale/id_ID/pcsx2_Iconized.mo similarity index 100% rename from bin/Langs/id_ID/pcsx2_Iconized.mo rename to bin/resources/locale/id_ID/pcsx2_Iconized.mo diff --git a/bin/Langs/id_ID/pcsx2_Main.mo b/bin/resources/locale/id_ID/pcsx2_Main.mo similarity index 100% rename from bin/Langs/id_ID/pcsx2_Main.mo rename to bin/resources/locale/id_ID/pcsx2_Main.mo diff --git a/bin/Langs/it_IT/pcsx2_Iconized.mo b/bin/resources/locale/it_IT/pcsx2_Iconized.mo similarity index 100% rename from bin/Langs/it_IT/pcsx2_Iconized.mo rename to bin/resources/locale/it_IT/pcsx2_Iconized.mo diff --git a/bin/Langs/it_IT/pcsx2_Main.mo b/bin/resources/locale/it_IT/pcsx2_Main.mo similarity index 100% rename from bin/Langs/it_IT/pcsx2_Main.mo rename to bin/resources/locale/it_IT/pcsx2_Main.mo diff --git a/bin/Langs/ja_JP/pcsx2_Iconized.mo b/bin/resources/locale/ja_JP/pcsx2_Iconized.mo similarity index 100% rename from bin/Langs/ja_JP/pcsx2_Iconized.mo rename to bin/resources/locale/ja_JP/pcsx2_Iconized.mo diff --git a/bin/Langs/ja_JP/pcsx2_Main.mo b/bin/resources/locale/ja_JP/pcsx2_Main.mo similarity index 100% rename from bin/Langs/ja_JP/pcsx2_Main.mo rename to bin/resources/locale/ja_JP/pcsx2_Main.mo diff --git a/bin/Langs/ko_KR/pcsx2_Iconized.mo b/bin/resources/locale/ko_KR/pcsx2_Iconized.mo similarity index 100% rename from bin/Langs/ko_KR/pcsx2_Iconized.mo rename to bin/resources/locale/ko_KR/pcsx2_Iconized.mo diff --git a/bin/Langs/ko_KR/pcsx2_Main.mo b/bin/resources/locale/ko_KR/pcsx2_Main.mo similarity index 100% rename from bin/Langs/ko_KR/pcsx2_Main.mo rename to bin/resources/locale/ko_KR/pcsx2_Main.mo diff --git a/bin/Langs/lt_LT/pcsx2_Iconized.mo b/bin/resources/locale/lt_LT/pcsx2_Iconized.mo similarity index 100% rename from bin/Langs/lt_LT/pcsx2_Iconized.mo rename to bin/resources/locale/lt_LT/pcsx2_Iconized.mo diff --git a/bin/Langs/lt_LT/pcsx2_Main.mo b/bin/resources/locale/lt_LT/pcsx2_Main.mo similarity index 100% rename from bin/Langs/lt_LT/pcsx2_Main.mo rename to bin/resources/locale/lt_LT/pcsx2_Main.mo diff --git a/bin/Langs/ms_MY/pcsx2_Iconized.mo b/bin/resources/locale/ms_MY/pcsx2_Iconized.mo similarity index 100% rename from bin/Langs/ms_MY/pcsx2_Iconized.mo rename to bin/resources/locale/ms_MY/pcsx2_Iconized.mo diff --git a/bin/Langs/ms_MY/pcsx2_Main.mo b/bin/resources/locale/ms_MY/pcsx2_Main.mo similarity index 100% rename from bin/Langs/ms_MY/pcsx2_Main.mo rename to bin/resources/locale/ms_MY/pcsx2_Main.mo diff --git a/bin/Langs/nb_NO/pcsx2_Iconized.mo b/bin/resources/locale/nb_NO/pcsx2_Iconized.mo similarity index 100% rename from bin/Langs/nb_NO/pcsx2_Iconized.mo rename to bin/resources/locale/nb_NO/pcsx2_Iconized.mo diff --git a/bin/Langs/nb_NO/pcsx2_Main.mo b/bin/resources/locale/nb_NO/pcsx2_Main.mo similarity index 100% rename from bin/Langs/nb_NO/pcsx2_Main.mo rename to bin/resources/locale/nb_NO/pcsx2_Main.mo diff --git a/bin/Langs/nl_NL/pcsx2_Iconized.mo b/bin/resources/locale/nl_NL/pcsx2_Iconized.mo similarity index 100% rename from bin/Langs/nl_NL/pcsx2_Iconized.mo rename to bin/resources/locale/nl_NL/pcsx2_Iconized.mo diff --git a/bin/Langs/nl_NL/pcsx2_Main.mo b/bin/resources/locale/nl_NL/pcsx2_Main.mo similarity index 100% rename from bin/Langs/nl_NL/pcsx2_Main.mo rename to bin/resources/locale/nl_NL/pcsx2_Main.mo diff --git a/bin/Langs/pl_PL/pcsx2_Iconized.mo b/bin/resources/locale/pl_PL/pcsx2_Iconized.mo similarity index 100% rename from bin/Langs/pl_PL/pcsx2_Iconized.mo rename to bin/resources/locale/pl_PL/pcsx2_Iconized.mo diff --git a/bin/Langs/pl_PL/pcsx2_Main.mo b/bin/resources/locale/pl_PL/pcsx2_Main.mo similarity index 100% rename from bin/Langs/pl_PL/pcsx2_Main.mo rename to bin/resources/locale/pl_PL/pcsx2_Main.mo diff --git a/bin/Langs/pt_BR/pcsx2_Iconized.mo b/bin/resources/locale/pt_BR/pcsx2_Iconized.mo similarity index 100% rename from bin/Langs/pt_BR/pcsx2_Iconized.mo rename to bin/resources/locale/pt_BR/pcsx2_Iconized.mo diff --git a/bin/Langs/pt_BR/pcsx2_Main.mo b/bin/resources/locale/pt_BR/pcsx2_Main.mo similarity index 100% rename from bin/Langs/pt_BR/pcsx2_Main.mo rename to bin/resources/locale/pt_BR/pcsx2_Main.mo diff --git a/bin/Langs/ru_RU/pcsx2_Iconized.mo b/bin/resources/locale/ru_RU/pcsx2_Iconized.mo similarity index 100% rename from bin/Langs/ru_RU/pcsx2_Iconized.mo rename to bin/resources/locale/ru_RU/pcsx2_Iconized.mo diff --git a/bin/Langs/ru_RU/pcsx2_Main.mo b/bin/resources/locale/ru_RU/pcsx2_Main.mo similarity index 100% rename from bin/Langs/ru_RU/pcsx2_Main.mo rename to bin/resources/locale/ru_RU/pcsx2_Main.mo diff --git a/bin/Langs/sv_SE/pcsx2_Iconized.mo b/bin/resources/locale/sv_SE/pcsx2_Iconized.mo similarity index 100% rename from bin/Langs/sv_SE/pcsx2_Iconized.mo rename to bin/resources/locale/sv_SE/pcsx2_Iconized.mo diff --git a/bin/Langs/sv_SE/pcsx2_Main.mo b/bin/resources/locale/sv_SE/pcsx2_Main.mo similarity index 100% rename from bin/Langs/sv_SE/pcsx2_Main.mo rename to bin/resources/locale/sv_SE/pcsx2_Main.mo diff --git a/bin/Langs/th_TH/pcsx2_Iconized.mo b/bin/resources/locale/th_TH/pcsx2_Iconized.mo similarity index 100% rename from bin/Langs/th_TH/pcsx2_Iconized.mo rename to bin/resources/locale/th_TH/pcsx2_Iconized.mo diff --git a/bin/Langs/th_TH/pcsx2_Main.mo b/bin/resources/locale/th_TH/pcsx2_Main.mo similarity index 100% rename from bin/Langs/th_TH/pcsx2_Main.mo rename to bin/resources/locale/th_TH/pcsx2_Main.mo diff --git a/bin/Langs/tr_TR/pcsx2_Iconized.mo b/bin/resources/locale/tr_TR/pcsx2_Iconized.mo similarity index 100% rename from bin/Langs/tr_TR/pcsx2_Iconized.mo rename to bin/resources/locale/tr_TR/pcsx2_Iconized.mo diff --git a/bin/Langs/tr_TR/pcsx2_Main.mo b/bin/resources/locale/tr_TR/pcsx2_Main.mo similarity index 100% rename from bin/Langs/tr_TR/pcsx2_Main.mo rename to bin/resources/locale/tr_TR/pcsx2_Main.mo diff --git a/bin/Langs/zh_CN/pcsx2_Iconized.mo b/bin/resources/locale/zh_CN/pcsx2_Iconized.mo similarity index 100% rename from bin/Langs/zh_CN/pcsx2_Iconized.mo rename to bin/resources/locale/zh_CN/pcsx2_Iconized.mo diff --git a/bin/Langs/zh_CN/pcsx2_Main.mo b/bin/resources/locale/zh_CN/pcsx2_Main.mo similarity index 100% rename from bin/Langs/zh_CN/pcsx2_Main.mo rename to bin/resources/locale/zh_CN/pcsx2_Main.mo diff --git a/bin/Langs/zh_TW/pcsx2_Iconized.mo b/bin/resources/locale/zh_TW/pcsx2_Iconized.mo similarity index 100% rename from bin/Langs/zh_TW/pcsx2_Iconized.mo rename to bin/resources/locale/zh_TW/pcsx2_Iconized.mo diff --git a/bin/Langs/zh_TW/pcsx2_Main.mo b/bin/resources/locale/zh_TW/pcsx2_Main.mo similarity index 100% rename from bin/Langs/zh_TW/pcsx2_Main.mo rename to bin/resources/locale/zh_TW/pcsx2_Main.mo diff --git a/cmake/Translation.cmake b/cmake/Translation.cmake index 9a9e66ee26..b1dffcda48 100644 --- a/cmake/Translation.cmake +++ b/cmake/Translation.cmake @@ -62,8 +62,8 @@ MACRO(GETTEXT_CREATE_TRANSLATIONS_PCSX2 _potFile _firstPoFileArg) SET(_mnemonicless "${CMAKE_BINARY_DIR}/${_lang}__${_gmoBase}.nomnemonic.po") SET(_extraCommands COMMAND sed -e "\"s/[(]&[A-Za-z][)]//g\"" "${_absFile}" > "${_mnemonicless}" - COMMAND ${CMAKE_COMMAND} -E make_directory "$/../Resources/${_lang}/" - COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o "$/../Resources/${_lang}/${_potBasename}.mo" ${_mnemonicless}) + COMMAND ${CMAKE_COMMAND} -E make_directory "$/../Resources/locale/${_lang}/" + COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o "$/../Resources/locale/${_lang}/${_potBasename}.mo" ${_mnemonicless}) ELSE (APPLE) SET(_extraCommands) ENDIF (APPLE) @@ -86,9 +86,9 @@ MACRO(GETTEXT_CREATE_TRANSLATIONS_PCSX2 _potFile _firstPoFileArg) ENDIF (CMAKE_BUILD_PO) IF (PACKAGE_MODE) - INSTALL(FILES ${_gmoFile} DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/${_lang}/LC_MESSAGES RENAME ${_potBasename}.mo) + INSTALL(FILES ${_gmoFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/PCSX2/resources/locale/${_lang} RENAME ${_potBasename}.mo) ELSE (PACKAGE_MODE) - INSTALL(FILES ${_gmoFile} DESTINATION ${CMAKE_SOURCE_DIR}/bin/Langs/${_lang} RENAME ${_potBasename}.mo) + INSTALL(FILES ${_gmoFile} DESTINATION ${CMAKE_SOURCE_DIR}/bin/resources/locale/${_lang} RENAME ${_potBasename}.mo) ENDIF (PACKAGE_MODE) SET(_gmoFiles ${_gmoFiles} ${_gmoFile}) diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index 0febfda954..eafdf34a9c 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -1646,6 +1646,9 @@ foreach(path IN LISTS RESOURCE_FILES) if (NOT WIN32 AND "${path}" MATCHES "/dx11/") # Don't include unneccessary stuff continue() endif() + if ((GETTEXT_FOUND OR NO_TRANSLATION) AND "${path}" MATCHES "/locale/") # Generate locales with gettext instead of copying them from bin + continue() + endif() pcsx2_resource(${path} ${CMAKE_SOURCE_DIR}/bin/resources/) endforeach() diff --git a/pcsx2/gui/AppConfig.cpp b/pcsx2/gui/AppConfig.cpp index f3ffa9ac47..caa23d21c9 100644 --- a/pcsx2/gui/AppConfig.cpp +++ b/pcsx2/gui/AppConfig.cpp @@ -87,7 +87,7 @@ namespace PathDefs const wxDirName& Langs() { - static const wxDirName retval(L"Langs"); + static const wxDirName retval(L"locale"); return retval; } @@ -240,15 +240,6 @@ namespace PathDefs return GetDocuments() + Base::Logs(); } - wxDirName GetLangs() - { -#ifdef __APPLE__ - return wxDirName(wxStandardPaths::Get().GetResourcesDir()); -#else - return AppRoot() + Base::Langs(); -#endif - } - wxDirName GetResources() { // ifdef is only needed here because mac doesn't put its resources in a subdirectory.. @@ -259,6 +250,11 @@ namespace PathDefs #endif } + wxDirName GetLangs() + { + return GetResources() + Base::Langs(); + } + wxDirName GetCache() { return GetDocuments() + Base::Cache(); diff --git a/pcsx2/gui/i18n.cpp b/pcsx2/gui/i18n.cpp index 5042b31ec0..61dc131369 100644 --- a/pcsx2/gui/i18n.cpp +++ b/pcsx2/gui/i18n.cpp @@ -359,11 +359,5 @@ bool i18n_SetLanguage( wxLanguage wxLangId, const wxString& langCode ) // This method sets the lookup path to search l10n files void i18n_SetLanguagePath() { - // default location for windows - wxLocale::AddCatalogLookupPathPrefix( wxGetCwd() ); - // additional location for linux -#if defined(__unix__) || defined(__APPLE__) - wxLocale::AddCatalogLookupPathPrefix( PathDefs::GetLangs().ToString() ); -#endif - + wxLocale::AddCatalogLookupPathPrefix(PathDefs::GetLangs().ToString()); }