From 9a6eb70f12b548eca158b9f555cbb4c2ddde8d7c Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Sat, 22 Sep 2012 09:42:32 -0700
Subject: [PATCH] Try to find an English locale ID which is available
wxLANGUAGE_ENGLISH corresponds to the "en" locale on Linux, which is
generally not installed, which resulted in English actually being the
system default locale.
Updates #1508.
---
aegisub/src/aegisublocale.cpp | 36 +++++++++++++++++++++++++++++++++--
aegisub/src/aegisublocale.h | 1 +
2 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/aegisub/src/aegisublocale.cpp b/aegisub/src/aegisublocale.cpp
index 7793441ac..a04ba1078 100644
--- a/aegisub/src/aegisublocale.cpp
+++ b/aegisub/src/aegisublocale.cpp
@@ -52,9 +52,39 @@
AegisubLocale::~AegisubLocale() {
}
+int AegisubLocale::EnglishId() const {
+ static const int english_ids[] = {
+ wxLANGUAGE_ENGLISH,
+ wxLANGUAGE_ENGLISH_US,
+ wxLANGUAGE_ENGLISH_UK,
+ wxLANGUAGE_ENGLISH_AUSTRALIA,
+ wxLANGUAGE_ENGLISH_BELIZE,
+ wxLANGUAGE_ENGLISH_BOTSWANA,
+ wxLANGUAGE_ENGLISH_CANADA,
+ wxLANGUAGE_ENGLISH_CARIBBEAN,
+ wxLANGUAGE_ENGLISH_DENMARK,
+ wxLANGUAGE_ENGLISH_EIRE,
+ wxLANGUAGE_ENGLISH_JAMAICA,
+ wxLANGUAGE_ENGLISH_NEW_ZEALAND,
+ wxLANGUAGE_ENGLISH_PHILIPPINES,
+ wxLANGUAGE_ENGLISH_SOUTH_AFRICA,
+ wxLANGUAGE_ENGLISH_TRINIDAD,
+ wxLANGUAGE_ENGLISH_ZIMBABWE,
+ 0
+ };
+
+ for (const int *id = english_ids; *id; ++id) {
+ if (wxLocale::IsAvailable(*id)) {
+ return *id;
+ }
+ }
+
+ return -1;
+}
+
void AegisubLocale::Init(int language) {
if (language == -1)
- language = wxLANGUAGE_ENGLISH;
+ language = EnglishId();
if (!wxLocale::IsAvailable(language))
language = wxLANGUAGE_UNKNOWN;
@@ -78,7 +108,9 @@ int AegisubLocale::PickLanguage() {
// Check if english is in it, else add it
if (langs.Index(wxLANGUAGE_ENGLISH) == wxNOT_FOUND) {
- langs.Insert(wxLANGUAGE_ENGLISH, 0);
+ int id = EnglishId();
+ if (id)
+ langs.Insert(id, 0);
}
// Check if user local language is available, if so, make it first
diff --git a/aegisub/src/aegisublocale.h b/aegisub/src/aegisublocale.h
index fc8c2cecd..0e9d103d7 100644
--- a/aegisub/src/aegisublocale.h
+++ b/aegisub/src/aegisublocale.h
@@ -46,6 +46,7 @@ class wxLocale;
class AegisubLocale {
agi::scoped_ptr<wxLocale> locale;
wxArrayInt GetAvailableLanguages();
+ int EnglishId() const;
public:
~AegisubLocale();
--
GitLab