Addendum #2 to 86ad47c & dc0fb96

Author: Dutchman101

Client/core/CLocalization.cpp

@@ -25,6 +25,8 @@ struct NativeLanguageName
 
 CLocalization::CLocalization(const SString& strLocale, const SString& strLocalePath)
 {
+    m_pCurrentLang = NULL;
+
     // Set log callbacks so we can record problems
     Log::set_log_info_callback(NULL);
     Log::set_log_warning_callback(LogCallback);
@@ -102,8 +104,22 @@ CLanguage* CLocalization::GetLanguage(SString strLocale)
     {
         Language Lang = Language::from_name(strLocale);
         Lang = Lang ? Lang : Language::from_name("en_US");
-        pLanguage = new CLanguage(m_DictManager.get_dictionary(Lang, MTA_LOCALE_TEXTDOMAIN), Lang.str(), Lang.get_name());
-        MapSet(m_LanguageMap, strLocale, pLanguage);
+
+        try
+        {
+            pLanguage = new CLanguage(m_DictManager.get_dictionary(Lang, MTA_LOCALE_TEXTDOMAIN), Lang.str(), Lang.get_name());
+            MapSet(m_LanguageMap, strLocale, pLanguage);
+        }
+        catch (const std::exception& ex)
+        {
+            WriteDebugEvent(SString("Localization failed to load dictionary for '%s': %s", strLocale.c_str(), ex.what()));
+            return (strLocale != "en_US") ? GetLanguage("en_US") : nullptr;
+        }
+        catch (...)
+        {
+            WriteDebugEvent(SString("Localization failed to load dictionary for '%s': unknown error", strLocale.c_str()));
+            return (strLocale != "en_US") ? GetLanguage("en_US") : nullptr;
+        }
     }
     return pLanguage;
 }
@@ -124,38 +140,57 @@ SString CLocalization::GetLanguageNativeName(SString strLocale)
         return iter->name;
 
     // If not found, we fall back to the loading the language file and using the name from there.
-    SString strNativeName = GetLanguage(strLocale)->Translate(NATIVE_LANGUAGE_NAME);
+    CLanguage* pLanguage = GetLanguage(strLocale);
+    if (!pLanguage)
+        return SString();
+
+    SString strNativeName = pLanguage->Translate(NATIVE_LANGUAGE_NAME);
     if (strNativeName == "English" && strLocale != "en_US")
     {
         // If native name not available, use English version
-        strNativeName = GetLanguage(strLocale)->GetName();
+        strNativeName = pLanguage->GetName();
     }
 
     return strNativeName;
 }
 
 SString CLocalization::Translate(const SString& strMessage)
 {
+    if (!m_pCurrentLang)
+        return strMessage;
+
     return m_pCurrentLang->Translate(strMessage);
 }
 
 SString CLocalization::TranslateWithContext(const SString& strContext, const SString& strMessage)
 {
+    if (!m_pCurrentLang)
+        return strMessage;
+
     return m_pCurrentLang->TranslateWithContext(strContext, strMessage);
 }
 
 SString CLocalization::TranslatePlural(const SString& strSingular, const SString& strPlural, const int iNum)
 {
+    if (!m_pCurrentLang)
+        return (iNum == 1 ? strSingular : strPlural);
+
     return m_pCurrentLang->TranslatePlural(strSingular, strPlural, iNum);
 }
 
 SString CLocalization::TranslatePluralWithContext(const SString& strContext, const SString& strSingular, const SString& strPlural, int iNum)
 {
+    if (!m_pCurrentLang)
+        return (iNum == 1 ? strSingular : strPlural);
+
     return m_pCurrentLang->TranslatePluralWithContext(strContext, strSingular, strPlural, iNum);
 }
 
 SString CLocalization::GetTranslators()
 {
+    if (!m_pCurrentLang)
+        return "";
+
     std::map<std::string, std::string> metaData = m_pCurrentLang->GetDictionary().get_metadata();
     if (metaData.find("Translators") != metaData.end())
     {
@@ -187,18 +222,21 @@ bool CLocalization::IsLocalized()
 
 SString CLocalization::GetLanguageCode()
 {
-    return m_pCurrentLang->GetCode();
+    return m_pCurrentLang ? m_pCurrentLang->GetCode() : SString();
 }
 
 SString CLocalization::GetLanguageName()
 {
-    return m_pCurrentLang->GetName();
+    return m_pCurrentLang ? m_pCurrentLang->GetName() : SString();
 }
 
 // Get the file directory of the current language
 SString CLocalization::GetLanguageDirectory(CLanguage* pLanguage)
 {
     CLanguage* pSelectLang = pLanguage != nullptr ? pLanguage : m_pCurrentLang;
+    if (!pSelectLang)
+        return SString();
+
     SString    strFullPath = pSelectLang->GetDictionary().get_filepath();
 
     // Replace all backslashes with forward slashes