Skip to content

Commit

Permalink
#5231: Move LanguageManager to RadiantCore module
Browse files Browse the repository at this point in the history
  • Loading branch information
@codereader
codereader committed May 1, 2020
1 parent e69b471 commit 631de3d
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 219 deletions.
9 changes: 9 additions & 0 deletions radiant/Radiant.cpp
View file
Expand Up @@ -11,6 +11,10 @@
#include "log/LogFile.h"
#include "modulesystem/ModuleRegistry.h"

#ifndef POSIX
#include "settings/LanguageManager.h"
#endif

#include <wx/version.h>

namespace radiant
Expand All @@ -32,6 +36,11 @@ Radiant::Radiant(ApplicationContext& context) :

_moduleRegistry.reset(new module::ModuleRegistry);
_moduleRegistry->setContext(_context);

#ifndef POSIX
// Initialise the language based on the settings in the user settings folder
language::LanguageManager().init(_context);
#endif
}

Radiant::~Radiant()
Expand Down
9 changes: 0 additions & 9 deletions radiant/RadiantApp.cpp
View file
Expand Up @@ -17,10 +17,6 @@
#include "ui/splash/Splash.h"
#endif

#ifndef POSIX
#include "settings/LanguageManager.h"
#endif

#ifdef POSIX
#include <libintl.h>
#endif
Expand Down Expand Up @@ -66,11 +62,6 @@ bool RadiantApp::OnInit()
throw ex;
}

#ifndef POSIX
// Initialise the language based on the settings in the user settings folder
language::LanguageManager().init(_context);
#endif

#if defined(POSIX) && !defined(__APPLE__)
// greebo: not sure if this is needed
// Other POSIX gettext initialisation
Expand Down
226 changes: 24 additions & 202 deletions radiant/settings/LanguageManager.cpp
View file
@@ -1,18 +1,19 @@
#include "LanguageManager.h"

#include <fstream>
#include <stdexcept>

#include <wx/intl.h>
#include <wx/arrstr.h>

#include "os/path.h"
#include "os/file.h"
#include "i18n.h"
#include "ipreferencesystem.h"
#include "itextstream.h"
#include <fstream>
#include <stdexcept>
#include "registry/registry.h"
#include "modulesystem/ModuleRegistry.h"

#include "os/path.h"
#include "os/file.h"
#include "os/fs.h"
#include "registry/registry.h"
#include "string/case_conv.h"

namespace language
Expand All @@ -34,6 +35,12 @@ namespace
const std::string RKEY_LANGUAGE("user/ui/language");
}

LanguageManager::LanguageManager()
{} // constructor needed for wxLocale pimpl

LanguageManager::~LanguageManager()
{} // destructor needed for wxLocale pimpl

const std::string& LanguageManager::getName() const
{
static std::string _name("LanguageManager");
Expand Down Expand Up @@ -70,8 +77,7 @@ void LanguageManager::initialiseModule(const ApplicationContext& ctx)
int index = getLanguageIndex(_curLanguage);

// Get the offset into the array of available languages
LanguageList::iterator found =
std::find(_availableLanguages.begin(), _availableLanguages.end(), index);
auto found = std::find(_availableLanguages.begin(), _availableLanguages.end(), index);

if (found != _availableLanguages.end())
{
Expand All @@ -87,11 +93,10 @@ void LanguageManager::initialiseModule(const ApplicationContext& ctx)
// Construct the list of available languages
ComboBoxValueList langs;

for (LanguageList::const_iterator i = _availableLanguages.begin();
i != _availableLanguages.end(); ++i)
for (int code : _availableLanguages)
{
const Language& lang = _supportedLanguages[*i];
langs.push_back(lang.twoDigitCode + " - " + lang.displayName);
const Language& lang = _supportedLanguages[code];
langs.emplace_back(lang.twoDigitCode + " - " + lang.displayName);
}

// Load the currently selected index into the registry
Expand Down Expand Up @@ -130,7 +135,7 @@ void LanguageManager::findAvailableLanguages()
wxFileTranslationsLoader loader;
wxArrayString translations = loader.GetAvailableTranslations(GETTEXT_PACKAGE);

std::for_each(translations.begin(), translations.end(), [&] (const wxString& lang)
for (const auto& lang : translations)
{
// Get the index (is this a known language?)
try
Expand All @@ -144,15 +149,15 @@ void LanguageManager::findAvailableLanguages()
{
rWarning() << "Skipping unknown language: " << lang << std::endl;
}
});
}

rMessage() << "Found " << _availableLanguages.size() << " language folders." << std::endl;
}

void LanguageManager::init(const ApplicationContext& ctx)
{
// Instantiate a new language manager
LanguageManagerPtr instancePtr(new LanguageManager);
auto instancePtr = std::make_shared<LanguageManager>();

// Hand that over to the module registry
module::GlobalModuleRegistry().registerModule(instancePtr);
Expand All @@ -171,9 +176,7 @@ void LanguageManager::initFromContext(const ApplicationContext& ctx)

// No handling of POSIX needed, since we don't use the LanguageManager on
// POSIX
_i18nPath = os::standardPathWithSlash(
ctx.getApplicationPath() + "i18n"
);
_i18nPath = os::standardPathWithSlash(ctx.getApplicationPath() + "i18n");

wxFileTranslationsLoader::AddCatalogLookupPathPrefix(_i18nPath);

Expand Down Expand Up @@ -214,199 +217,18 @@ void LanguageManager::loadSupportedLanguages()
int index = 0;

_supportedLanguages[index++] = Language("en", _("English"));
_supportedLanguages[index++] = Language("ab", _("Abkhazian"));
_supportedLanguages[index++] = Language("ae", _("Avestan"));
_supportedLanguages[index++] = Language("af", _("Afrikaans"));
_supportedLanguages[index++] = Language("ak", _("Akan"));
_supportedLanguages[index++] = Language("am", _("Amharic"));
_supportedLanguages[index++] = Language("an", _("Aragonese"));
_supportedLanguages[index++] = Language("ar", _("Arabic"));
_supportedLanguages[index++] = Language("as", _("Assamese"));
_supportedLanguages[index++] = Language("av", _("Avaric"));
_supportedLanguages[index++] = Language("ay", _("Aymara"));
_supportedLanguages[index++] = Language("az", _("Azerbaijani"));
_supportedLanguages[index++] = Language("ba", _("Bashkir"));
_supportedLanguages[index++] = Language("be", _("Belarusian"));
_supportedLanguages[index++] = Language("bg", _("Bulgarian"));
_supportedLanguages[index++] = Language("bh", _("Bihari languages"));
_supportedLanguages[index++] = Language("bi", _("Bislama"));
_supportedLanguages[index++] = Language("bm", _("Bambara"));
_supportedLanguages[index++] = Language("bn", _("Bengali"));
_supportedLanguages[index++] = Language("bo", _("Tibetan"));
_supportedLanguages[index++] = Language("br", _("Breton"));
_supportedLanguages[index++] = Language("bs", _("Bosnian"));
_supportedLanguages[index++] = Language("ca", _("Catalan"));
_supportedLanguages[index++] = Language("ce", _("Chechen"));
_supportedLanguages[index++] = Language("ch", _("Chamorro"));
_supportedLanguages[index++] = Language("co", _("Corsican"));
_supportedLanguages[index++] = Language("cr", _("Cree"));
_supportedLanguages[index++] = Language("cs", _("Czech"));
_supportedLanguages[index++] = Language("cv", _("Chuvash"));
_supportedLanguages[index++] = Language("cy", _("Welsh"));
_supportedLanguages[index++] = Language("cy", _("Welsh"));
_supportedLanguages[index++] = Language("da", _("Danish"));
_supportedLanguages[index++] = Language("de", _("German"));
_supportedLanguages[index++] = Language("dv", _("Divehi"));
_supportedLanguages[index++] = Language("dz", _("Dzongkha"));
_supportedLanguages[index++] = Language("ee", _("Ewe"));
_supportedLanguages[index++] = Language("el", _("Greek"));
_supportedLanguages[index++] = Language("en", _("English"));
_supportedLanguages[index++] = Language("eo", _("Esperanto"));
_supportedLanguages[index++] = Language("es", _("Spanish"));
_supportedLanguages[index++] = Language("et", _("Estonian"));
_supportedLanguages[index++] = Language("eu", _("Basque"));
_supportedLanguages[index++] = Language("fa", _("Persian"));
_supportedLanguages[index++] = Language("ff", _("Fulah"));
_supportedLanguages[index++] = Language("fi", _("Finnish"));
_supportedLanguages[index++] = Language("fj", _("Fijian"));
_supportedLanguages[index++] = Language("fo", _("Faroese"));
_supportedLanguages[index++] = Language("fr", _("French"));
_supportedLanguages[index++] = Language("fy", _("Western Frisian"));
_supportedLanguages[index++] = Language("ga", _("Irish"));
_supportedLanguages[index++] = Language("gd", _("Gaelic; Scottish Gaelic"));
_supportedLanguages[index++] = Language("gl", _("Galician"));
_supportedLanguages[index++] = Language("gn", _("Guarani"));
_supportedLanguages[index++] = Language("gu", _("Gujarati"));
_supportedLanguages[index++] = Language("gv", _("Manx"));
_supportedLanguages[index++] = Language("ha", _("Hausa"));
_supportedLanguages[index++] = Language("he", _("Hebrew"));
_supportedLanguages[index++] = Language("hi", _("Hindi"));
_supportedLanguages[index++] = Language("ho", _("Hiri Motu"));
_supportedLanguages[index++] = Language("hr", _("Croatian"));
_supportedLanguages[index++] = Language("ht", _("Haitian"));
_supportedLanguages[index++] = Language("hu", _("Hungarian"));
_supportedLanguages[index++] = Language("hy", _("Armenian"));
_supportedLanguages[index++] = Language("hz", _("Herero"));
_supportedLanguages[index++] = Language("ia", _("Interlingua"));
_supportedLanguages[index++] = Language("id", _("Indonesian"));
_supportedLanguages[index++] = Language("ie", _("Interlingue; Occidental"));
_supportedLanguages[index++] = Language("ig", _("Igbo"));
_supportedLanguages[index++] = Language("ii", _("Sichuan Yi; Nuosu"));
_supportedLanguages[index++] = Language("ik", _("Inupiaq"));
_supportedLanguages[index++] = Language("io", _("Ido"));
_supportedLanguages[index++] = Language("is", _("Icelandic"));
_supportedLanguages[index++] = Language("it", _("Italian"));
_supportedLanguages[index++] = Language("iu", _("Inuktitut"));
_supportedLanguages[index++] = Language("ja", _("Japanese"));
_supportedLanguages[index++] = Language("jv", _("Javanese"));
_supportedLanguages[index++] = Language("ka", _("Georgian"));
_supportedLanguages[index++] = Language("kg", _("Kongo"));
_supportedLanguages[index++] = Language("ki", _("Kikuyu"));
_supportedLanguages[index++] = Language("kj", _("Kuanyama"));
_supportedLanguages[index++] = Language("kk", _("Kazakh"));
_supportedLanguages[index++] = Language("kl", _("Kalaallisut; Greenlandic"));
_supportedLanguages[index++] = Language("km", _("Central Khmer"));
_supportedLanguages[index++] = Language("kn", _("Kannada"));
_supportedLanguages[index++] = Language("ko", _("Korean"));
_supportedLanguages[index++] = Language("kr", _("Kanuri"));
_supportedLanguages[index++] = Language("ks", _("Kashmiri"));
_supportedLanguages[index++] = Language("ku", _("Kurdish"));
_supportedLanguages[index++] = Language("kv", _("Komi"));
_supportedLanguages[index++] = Language("kw", _("Cornish"));
_supportedLanguages[index++] = Language("ky", _("Kirghiz"));
_supportedLanguages[index++] = Language("la", _("Latin"));
_supportedLanguages[index++] = Language("lb", _("Luxembourgish"));
_supportedLanguages[index++] = Language("lg", _("Ganda"));
_supportedLanguages[index++] = Language("li", _("Limburgan"));
_supportedLanguages[index++] = Language("ln", _("Lingala"));
_supportedLanguages[index++] = Language("lo", _("Lao"));
_supportedLanguages[index++] = Language("lt", _("Lithuanian"));
_supportedLanguages[index++] = Language("lu", _("Luba-Katanga"));
_supportedLanguages[index++] = Language("lv", _("Latvian"));
_supportedLanguages[index++] = Language("mg", _("Malagasy"));
_supportedLanguages[index++] = Language("mh", _("Marshallese"));
_supportedLanguages[index++] = Language("mi", _("Maori"));
_supportedLanguages[index++] = Language("mk", _("Macedonian"));
_supportedLanguages[index++] = Language("ml", _("Malayalam"));
_supportedLanguages[index++] = Language("mn", _("Mongolian"));
_supportedLanguages[index++] = Language("mr", _("Marathi"));
_supportedLanguages[index++] = Language("ms", _("Malay"));
_supportedLanguages[index++] = Language("mt", _("Maltese"));
_supportedLanguages[index++] = Language("my", _("Burmese"));
_supportedLanguages[index++] = Language("na", _("Nauru"));
_supportedLanguages[index++] = Language("nd", _("Ndebele, North"));
_supportedLanguages[index++] = Language("ne", _("Nepali"));
_supportedLanguages[index++] = Language("ng", _("Ndonga"));
_supportedLanguages[index++] = Language("nl", _("Dutch"));
_supportedLanguages[index++] = Language("no", _("Norwegian"));
_supportedLanguages[index++] = Language("nr", _("Ndebele, South"));
_supportedLanguages[index++] = Language("nv", _("Navajo"));
_supportedLanguages[index++] = Language("ny", _("Chichewa"));
_supportedLanguages[index++] = Language("oc", _("Occitan"));
_supportedLanguages[index++] = Language("oj", _("Ojibwa"));
_supportedLanguages[index++] = Language("om", _("Oromo"));
_supportedLanguages[index++] = Language("or", _("Oriya"));
_supportedLanguages[index++] = Language("os", _("Ossetian"));
_supportedLanguages[index++] = Language("pa", _("Panjabi"));
_supportedLanguages[index++] = Language("pi", _("Pali"));
_supportedLanguages[index++] = Language("pl", _("Polish"));
_supportedLanguages[index++] = Language("ps", _("Pushto"));
_supportedLanguages[index++] = Language("pt", _("Portuguese"));
_supportedLanguages[index++] = Language("qu", _("Quechua"));
_supportedLanguages[index++] = Language("rm", _("Romansh"));
_supportedLanguages[index++] = Language("rn", _("Rundi"));
_supportedLanguages[index++] = Language("ro", _("Romanian"));
_supportedLanguages[index++] = Language("ru", _("Russian"));
_supportedLanguages[index++] = Language("rw", _("Kinyarwanda"));
_supportedLanguages[index++] = Language("sa", _("Sanskrit"));
_supportedLanguages[index++] = Language("sc", _("Sardinian"));
_supportedLanguages[index++] = Language("sd", _("Sindhi"));
_supportedLanguages[index++] = Language("se", _("Northern Sami"));
_supportedLanguages[index++] = Language("sg", _("Sango"));
_supportedLanguages[index++] = Language("si", _("Sinhala"));
_supportedLanguages[index++] = Language("sk", _("Slovak"));
_supportedLanguages[index++] = Language("sl", _("Slovenian"));
_supportedLanguages[index++] = Language("sm", _("Samoan"));
_supportedLanguages[index++] = Language("sn", _("Shona"));
_supportedLanguages[index++] = Language("so", _("Somali"));
_supportedLanguages[index++] = Language("sq", _("Albanian"));
_supportedLanguages[index++] = Language("sr", _("Serbian"));
_supportedLanguages[index++] = Language("ss", _("Swati"));
_supportedLanguages[index++] = Language("st", _("Sotho, Southern"));
_supportedLanguages[index++] = Language("su", _("Sundanese"));
_supportedLanguages[index++] = Language("sv", _("Swedish"));
_supportedLanguages[index++] = Language("sw", _("Swahili"));
_supportedLanguages[index++] = Language("ta", _("Tamil"));
_supportedLanguages[index++] = Language("te", _("Telugu"));
_supportedLanguages[index++] = Language("tg", _("Tajik"));
_supportedLanguages[index++] = Language("th", _("Thai"));
_supportedLanguages[index++] = Language("ti", _("Tigrinya"));
_supportedLanguages[index++] = Language("tk", _("Turkmen"));
_supportedLanguages[index++] = Language("tl", _("Tagalog"));
_supportedLanguages[index++] = Language("tn", _("Tswana"));
_supportedLanguages[index++] = Language("to", _("Tonga"));
_supportedLanguages[index++] = Language("tr", _("Turkish"));
_supportedLanguages[index++] = Language("ts", _("Tsonga"));
_supportedLanguages[index++] = Language("tt", _("Tatar"));
_supportedLanguages[index++] = Language("tw", _("Twi"));
_supportedLanguages[index++] = Language("ty", _("Tahitian"));
_supportedLanguages[index++] = Language("ug", _("Uighur"));
_supportedLanguages[index++] = Language("uk", _("Ukrainian"));
_supportedLanguages[index++] = Language("ur", _("Urdu"));
_supportedLanguages[index++] = Language("uz", _("Uzbek"));
_supportedLanguages[index++] = Language("ve", _("Venda"));
_supportedLanguages[index++] = Language("vi", _("Vietnamese"));
_supportedLanguages[index++] = Language("vo", _("Volapuek"));
_supportedLanguages[index++] = Language("wa", _("Walloon"));
_supportedLanguages[index++] = Language("wo", _("Wolof"));
_supportedLanguages[index++] = Language("xh", _("Xhosa"));
_supportedLanguages[index++] = Language("yi", _("Yiddish"));
_supportedLanguages[index++] = Language("yo", _("Yoruba"));
_supportedLanguages[index++] = Language("za", _("Zhuang"));
_supportedLanguages[index++] = Language("zh", _("Chinese"));
_supportedLanguages[index++] = Language("zu", _("Zulu"));
}

int LanguageManager::getLanguageIndex(const std::string& languageCode)
{
std::string code = string::to_lower_copy(languageCode);

for (LanguageMap::const_iterator i = _supportedLanguages.begin();
i != _supportedLanguages.end(); ++i)
for (const auto& pair : _supportedLanguages)
{
if (i->second.twoDigitCode == code)
if (pair.second.twoDigitCode == code)
{
return i->first;
return pair.first;
}
}

Expand Down
3 changes: 3 additions & 0 deletions radiant/settings/LanguageManager.h
View file
Expand Up @@ -47,6 +47,9 @@ class LanguageManager :
LanguageList _availableLanguages;

public:
LanguageManager();
~LanguageManager();

// RegisterableModule implementation
const std::string& getName() const;
const StringSet& getDependencies() const;
Expand Down
2 changes: 0 additions & 2 deletions tools/msvc/DarkRadiant.vcxproj
View file
Expand Up @@ -906,7 +906,6 @@
<ClCompile Include="..\..\radiant\selection\selectionset\SelectionSetToolmenu.cpp" />
<ClCompile Include="..\..\radiant\settings\Game.cpp" />
<ClCompile Include="..\..\radiant\settings\GameManager.cpp" />
<ClCompile Include="..\..\radiant\settings\LanguageManager.cpp" />
<ClCompile Include="..\..\radiant\settings\PreferenceSystem.cpp" />
<ClCompile Include="..\..\radiant\settings\Win32Registry.cpp" />
<ClCompile Include="..\..\radiant\textool\TexTool.cpp" />
Expand Down Expand Up @@ -1405,7 +1404,6 @@
<ClInclude Include="..\..\radiant\selection\selectionset\SelectionSetToolmenu.h" />
<ClInclude Include="..\..\radiant\settings\Game.h" />
<ClInclude Include="..\..\radiant\settings\GameManager.h" />
<ClInclude Include="..\..\radiant\settings\LanguageManager.h" />
<ClInclude Include="..\..\radiant\settings\PreferenceSystem.h" />
<ClInclude Include="..\..\radiant\settings\Win32Registry.h" />
<ClInclude Include="..\..\radiant\textool\Rectangle.h" />
Expand Down
6 changes: 0 additions & 6 deletions tools/msvc/DarkRadiant.vcxproj.filters
View file
Expand Up @@ -556,9 +556,6 @@
<ClCompile Include="..\..\radiant\settings\GameManager.cpp">
<Filter>src\settings</Filter>
</ClCompile>
<ClCompile Include="..\..\radiant\settings\LanguageManager.cpp">
<Filter>src\settings</Filter>
</ClCompile>
<ClCompile Include="..\..\radiant\settings\PreferenceSystem.cpp">
<Filter>src\settings</Filter>
</ClCompile>
Expand Down Expand Up @@ -1920,9 +1917,6 @@
<ClInclude Include="..\..\radiant\settings\GameManager.h">
<Filter>src\settings</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\settings\LanguageManager.h">
<Filter>src\settings</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\settings\PreferenceSystem.h">
<Filter>src\settings</Filter>
</ClInclude>
Expand Down

0 comments on commit 631de3d

Please sign in to comment.