From cc221514954a26cd293d29c93d013357ccf552a1 Mon Sep 17 00:00:00 2001 From: rukai Date: Sun, 21 Jun 2015 13:34:09 +1000 Subject: [PATCH 1/3] Fixes translation on Linux and potentially Mac OSX, by specifying location of *.gmo files --- Source/Core/DolphinWX/Main.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index 64912416d8..97585fc85e 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -332,8 +332,13 @@ void DolphinApp::InitLanguageSupport() { m_locale = new wxLocale(language); + // Specify where dolphins *.gmo files are located on each operating system #ifdef _WIN32 - m_locale->AddCatalogLookupPathPrefix(StrToWxStr(File::GetExeDirectory() + DIR_SEP "Languages")); + m_locale->AddCatalogLookupPathPrefix(StrToWxStr(File::GetExeDirectory() + DIR_SEP "Languages")); +#elif defined(__LINUX__) + m_locale->AddCatalogLookupPathPrefix(StrToWxStr(DATA_DIR "../locale")); +#elif defined(__APPLE__) + m_locale->AddCatalogLookupPathPrefix(StrToWxStr(GetBundleDirectory() + "Contents/Resources")); #endif m_locale->AddCatalog("dolphin-emu"); From bbde9cbeaee0ecc7844b6a031c50ab2656eb306d Mon Sep 17 00:00:00 2001 From: rukai Date: Sun, 21 Jun 2015 14:32:41 +1000 Subject: [PATCH 2/3] Swapped out spaces for tabs --- Source/Core/DolphinWX/Main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index 97585fc85e..e386d99ac3 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -332,9 +332,9 @@ void DolphinApp::InitLanguageSupport() { m_locale = new wxLocale(language); - // Specify where dolphins *.gmo files are located on each operating system + // Specify where dolphins *.gmo files are located on each operating system #ifdef _WIN32 - m_locale->AddCatalogLookupPathPrefix(StrToWxStr(File::GetExeDirectory() + DIR_SEP "Languages")); + m_locale->AddCatalogLookupPathPrefix(StrToWxStr(File::GetExeDirectory() + DIR_SEP "Languages")); #elif defined(__LINUX__) m_locale->AddCatalogLookupPathPrefix(StrToWxStr(DATA_DIR "../locale")); #elif defined(__APPLE__) From c9e8179c5ab5ebee8cd1adfd64f2642aa5beaa5f Mon Sep 17 00:00:00 2001 From: rukai Date: Sun, 21 Jun 2015 20:00:28 +1000 Subject: [PATCH 3/3] Added namespace to GetBundleDirectory to compile on Mac OSX --- Source/Core/DolphinWX/Main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index e386d99ac3..7aaf2ed0a6 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -338,7 +338,7 @@ void DolphinApp::InitLanguageSupport() #elif defined(__LINUX__) m_locale->AddCatalogLookupPathPrefix(StrToWxStr(DATA_DIR "../locale")); #elif defined(__APPLE__) - m_locale->AddCatalogLookupPathPrefix(StrToWxStr(GetBundleDirectory() + "Contents/Resources")); + m_locale->AddCatalogLookupPathPrefix(StrToWxStr(File::GetBundleDirectory() + "Contents/Resources")); #endif m_locale->AddCatalog("dolphin-emu");