1 files changed, 58 insertions, 46 deletions
diff --git a/src/Main/Resources.cpp b/src/Main/Resources.cpp
index d9a787a5..f00c14f7 100644
--- a/src/Main/Resources.cpp
+++ b/src/Main/Resources.cpp
@@ -1,266 +1,278 @@
 /*
  Derived from source code of TrueCrypt 7.1a, which is
  Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
  by the TrueCrypt License 3.0.
 
  Modifications and additions to the original source code (contained in this file)
  and all other portions of this file are Copyright (c) 2013-2017 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.
 */
 
 #include "System.h"
 #include "Platform/Platform.h"
 #include "Resources.h"
 
 #ifdef TC_WINDOWS
 #include "Main/resource.h"
 #else
 #ifdef TC_MACOSX
 #include "Application.h"
 #endif
 #include "Platform/File.h"
 #include "Platform/StringConverter.h"
 #include <stdio.h>
+#include "UserPreferences.h"
 #endif
 
 namespace VeraCrypt
 {
 
 #ifdef TC_WINDOWS
 	static ConstBufferPtr GetWindowsResource (const wchar_t *resourceType, const wchar_t *resourceName)
 	{
 		HGLOBAL hResL;
 		HRSRC hRes;
 
 		hRes = FindResource (NULL, resourceName, resourceType);
 		throw_sys_if (!hRes);
 		hResL = LoadResource (NULL, hRes);
 		throw_sys_if (!hResL);
 
-		const byte *resPtr = (const byte *) LockResource (hResL);
+		const uint8 *resPtr = (const uint8 *) LockResource (hResL);
 		throw_sys_if (!resPtr);
 
 		return ConstBufferPtr (resPtr, SizeofResource (NULL, hRes));
 	}
 #endif // TC_WINDOWS
 
-
 	string Resources::GetLanguageXml ()
 	{
 #ifdef TC_WINDOWS
 		ConstBufferPtr res = GetWindowsResource (L"XML", L"IDR_LANGUAGE");
 		Buffer strBuf (res.Size() + 1);
 		strBuf.Zero();
 		strBuf.CopyFrom (res);
 		return string (reinterpret_cast <char *> (strBuf.Ptr()));
 #else
 		// get language from env LANG
 		// support:  C,POSIX,
 		// support for e.g. german: de_DE.UTF-8, de.UTF8, de_DE, de
 		// not support e.g.: de@Euro
 		string defaultLang("en");
 #if defined (TC_MACOSX)
 		string filenamePrefix = StringConverter::ToSingle (Application::GetExecutableDirectory()) + "/../Resources/languages/Language.";
 #else
 		string filenamePrefix("/usr/share/veracrypt/languages/Language.");
 #endif
 		string filenamePost(".xml");
 		string filename = filenamePrefix + defaultLang + filenamePost;
-		if(const char* env_p = getenv("LANG")){
-		    string lang(env_p);
+
+		UserPreferences Preferences;
+		Preferences.Load();
+		string preferredLang = string(Preferences.Language.begin(), Preferences.Language.end());
 #ifdef DEBUG
-			std::cout << lang << std::endl;
+		std::cout << "Config language: " << preferredLang << std::endl;
 #endif
-			if ( lang.size() > 1 ){
-				int found = lang.find(".");
-				if ( found > 1 ){
-					string langTag = lang.substr (0,found);
-					string lowerLangTag(StringConverter::ToLower (langTag) );
-					int foundUnderscore = lowerLangTag.find("_");
-					if ( foundUnderscore > 0 ) {
-						lowerLangTag.replace(foundUnderscore,1,1,'-');
-						filename = filenamePrefix + lowerLangTag + filenamePost;
-						FilesystemPath xml(filename);
-						if (! xml.IsFile()){
-							string shortLangTag = lowerLangTag.substr(0,foundUnderscore);
-							filename = filenamePrefix + shortLangTag + filenamePost;
+
+		if (preferredLang == "system") {
+			if (const char *env_p = getenv("LANG")) {
+				string lang(env_p);
+#ifdef DEBUG
+				std::cout << "env $LANG: " << lang << std::endl;
+#endif
+				if (lang.size() > 1) {
+					int found = lang.find(".");
+					if (found > 1) {
+						string langTag = lang.substr(0, found);
+						string lowerLangTag(StringConverter::ToLower(langTag));
+						int foundUnderscore = lowerLangTag.find("_");
+						if (foundUnderscore > 0) {
+							lowerLangTag.replace(foundUnderscore, 1, 1, '-');
+							filename = filenamePrefix + lowerLangTag + filenamePost;
 							FilesystemPath xml(filename);
-							if (! xml.IsFile()){
+							if (!xml.IsFile()) {
+								string shortLangTag = lowerLangTag.substr(0, foundUnderscore);
+								filename = filenamePrefix + shortLangTag + filenamePost;
+								FilesystemPath xml(filename);
+								if (!xml.IsFile()) {
+									filename = filenamePrefix + defaultLang + filenamePost;
+								}
+							}
+						} else {
+							filename = filenamePrefix + langTag + filenamePost;
+							FilesystemPath xml(filename);
+							if (!xml.IsFile()) {
 								filename = filenamePrefix + defaultLang + filenamePost;
 							}
 						}
-					}else{
-						filename = filenamePrefix + langTag + filenamePost;
+					} else {
+						string lowerLang(StringConverter::ToLower(lang));
+						filename = filenamePrefix + lowerLang + filenamePost;
 						FilesystemPath xml(filename);
-						if (! xml.IsFile()){
-							filename = filenamePrefix + defaultLang + filenamePost;
-						}
-					}
-				}else{
-					string lowerLang(StringConverter::ToLower (lang) );
-					filename = filenamePrefix + lowerLang + filenamePost;
-					FilesystemPath xml(filename);
-					if (! xml.IsFile()){
-						int foundUnderscore = lowerLang.find("_");
-						if ( foundUnderscore > 0 ) {
-							lowerLang.replace(foundUnderscore,1,1,'-');
-							filename = filenamePrefix + lowerLang + filenamePost;
-							FilesystemPath xml(filename);
-							if (! xml.IsFile()){
-								filename = filenamePrefix + defaultLang + filenamePost;
+						if (!xml.IsFile()) {
+							int foundUnderscore = lowerLang.find("_");
+							if (foundUnderscore > 0) {
+								lowerLang.replace(foundUnderscore, 1, 1, '-');
+								filename = filenamePrefix + lowerLang + filenamePost;
+								FilesystemPath xml(filename);
+								if (!xml.IsFile()) {
+									filename = filenamePrefix + defaultLang + filenamePost;
+								}
 							}
 						}
 					}
 				}
 			}
+		} else {
+			filename = filenamePrefix + preferredLang + filenamePost;
 		}
 		FilesystemPath xml(filename);
 		if ( xml.IsFile() ){
 			File file;
 			file.Open (xml, File::OpenRead, File::ShareRead);
-			vector <byte> keyfileData (file.Length());
+			vector <uint8> keyfileData (file.Length());
 			BufferPtr keyfileDataBuf (&keyfileData.front(), keyfileData.size());
 			file.ReadCompleteBuffer (keyfileDataBuf);
 			file.Close();
 			string langxml(keyfileData.begin(), keyfileData.end());
 			return langxml;
 		}
-		static byte LanguageXml[] =
+		static uint8 LanguageXml[] =
 		{
 #			include "Common/Language.xml.h"
 			, 0
 		};
 
 		return string ((const char*) LanguageXml);
 #endif
 	}
 
 	string Resources::GetLegalNotices ()
 	{
 #ifdef TC_WINDOWS
 		ConstBufferPtr res = GetWindowsResource (L"TEXT", L"IDR_LICENSE");
 		Buffer strBuf (res.Size() + 1);
 		strBuf.Zero();
 		strBuf.CopyFrom (res);
 		return string (reinterpret_cast <char *> (strBuf.Ptr()));
 #else
-		static byte License[] =
+		static uint8 License[] =
 		{
 #			include "License.txt.h"
 			, 0
 		};
 
 		return string ((const char*) License);
 #endif
 	}
 
 
 #ifndef TC_NO_GUI
 
 	wxBitmap Resources::GetDriveIconBitmap ()
 	{
 #ifdef TC_WINDOWS
 		return wxBitmap (L"IDB_DRIVE_ICON", wxBITMAP_TYPE_BMP_RESOURCE).ConvertToImage().Resize (wxSize (16, 12), wxPoint (0, 0));
 #else
-		static const byte DriveIcon[] =
+		static const uint8 DriveIcon[] =
 		{
 #			include "Mount/Drive_icon_96dpi.bmp.h"
 		};
 
 		wxMemoryInputStream stream (DriveIcon, sizeof (DriveIcon));
 		return wxBitmap (wxImage (stream).Resize (wxSize (16, 12), wxPoint (0, 0)));
 #endif
 	}
 
 	wxBitmap Resources::GetDriveIconMaskBitmap ()
 	{
 #ifdef TC_WINDOWS
 		wxImage image = wxBitmap (L"IDB_DRIVE_ICON_MASK", wxBITMAP_TYPE_BMP_RESOURCE).ConvertToImage().Resize (wxSize (16, 12), wxPoint (0, 0));
 		return wxBitmap (image.ConvertToMono (0, 0, 0), 1);
 #else
-		static const byte DriveIconMask[] =
+		static const uint8 DriveIconMask[] =
 		{
 #			include "Mount/Drive_icon_mask_96dpi.bmp.h"
 		};
 
 		wxMemoryInputStream stream (DriveIconMask, sizeof (DriveIconMask));
 		wxImage image (stream);
 		image.Resize (wxSize (16, 12), wxPoint (0, 0));
 
-#	ifdef __WXGTK__
+#	if defined  __WXGTK__ || defined TC_MACOSX
 		return wxBitmap (image.ConvertToMono (0, 0, 0), 1);
 #	else
 		return wxBitmap (image);
 #	endif
 #endif
 	}
 
 
 	wxBitmap Resources::GetLogoBitmap ()
 	{
 #ifdef TC_WINDOWS
 		return wxBitmap (L"IDB_LOGO", wxBITMAP_TYPE_BMP_RESOURCE);
 #else
-		static const byte Logo[] =
+		static const uint8 Logo[] =
 		{
 #			include "Mount/Logo_96dpi.bmp.h"
 		};
 
 		wxMemoryInputStream stream (Logo, sizeof (Logo));
 		return wxBitmap (wxImage (stream));
 #endif
 	}
 
 	wxBitmap Resources::GetTextualLogoBitmap ()
 	{
 #ifdef TC_WINDOWS
 		return wxBitmap (L"IDB_TEXTUAL_LOGO", wxBITMAP_TYPE_BMP_RESOURCE);
 #else
-		static const byte Logo[] =
+		static const uint8 Logo[] =
 		{
 #			include "Common/Textual_logo_96dpi.bmp.h"
 		};
 
 		wxMemoryInputStream stream (Logo, sizeof (Logo));
 		return wxBitmap (wxImage (stream));
 #endif
 	}
 
 	wxIcon Resources::GetVeraCryptIcon ()
 	{
 #ifdef TC_WINDOWS
 		return wxIcon (L"IDI_TRUECRYPT_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
 #else
 #		include "Resources/Icons/VeraCrypt-256x256.xpm"
 		return wxIcon (VeraCryptIcon256x256);
 #endif
 	}
 
 	wxBitmap Resources::GetVolumeCreationWizardBitmap (int height)
 	{
 #ifdef TC_WINDOWS
 		return wxBitmap (L"IDB_VOLUME_WIZARD_BITMAP", wxBITMAP_TYPE_BMP_RESOURCE);
 #else
-		static const byte VolumeWizardIcon[] =
+		static const uint8 VolumeWizardIcon[] =
 		{
 #			include "Format/VeraCrypt_Wizard.bmp.h"
 		};
 
 		wxMemoryInputStream stream (VolumeWizardIcon, sizeof (VolumeWizardIcon));
 
 		wxImage image (stream);
 		if (height != -1)
 		{
 			double scaleFactor = double (height) / double (image.GetHeight());
 			image.Rescale (int (image.GetWidth() * scaleFactor), int (image.GetHeight() * scaleFactor), wxIMAGE_QUALITY_HIGH);
 		}
 
 		return wxBitmap (image);
 #endif
 	}
 
 #endif // !TC_NO_GUI
 
 }