From 88f6179361e5b378c2938c77674d28cd1dc9a4ed Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 25 Mar 2014 14:19:43 +0000
Subject: - language packs' directory is now %miranda_path%\Languages - lang
 pack loading code restructurization

git-svn-id: http://svn.miranda-ng.org/main/trunk@8738 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/langpack/langpack.cpp | 53 ++-------------------------------------
 1 file changed, 2 insertions(+), 51 deletions(-)

(limited to 'src/modules/langpack/langpack.cpp')

diff --git a/src/modules/langpack/langpack.cpp b/src/modules/langpack/langpack.cpp
index b0beb9c673..c378373e45 100644
--- a/src/modules/langpack/langpack.cpp
+++ b/src/modules/langpack/langpack.cpp
@@ -37,7 +37,7 @@ BOOL EnumLangpacks(ENUM_PACKS_CALLBACK callback, WPARAM wParam, LPARAM lParam)
 	ptrT langpack(db_get_tsa(NULL, "Langpack", "Current"));
 
 	LANGPACK_INFO pack;
-	PathToAbsoluteT(_T("\\langpack_*.txt"), pack.tszFullPath);
+	PathToAbsoluteT(_T("\\Languages\\langpack_*.txt"), pack.tszFullPath);
 
 	BOOL fPackFound = FALSE;
 	WIN32_FIND_DATA wfd;
@@ -47,7 +47,7 @@ BOOL EnumLangpacks(ENUM_PACKS_CALLBACK callback, WPARAM wParam, LPARAM lParam)
 			if (wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) continue;
 			/* get data */
 			TCHAR tszFullPath[MAX_PATH];
-			PathToAbsoluteT(_T("\\"), tszFullPath);
+			PathToAbsoluteT(_T("\\Languages\\"), tszFullPath);
 			lstrcat(tszFullPath, wfd.cFileName);
 
 			ZeroMemory(&pack, sizeof(pack));
@@ -93,52 +93,3 @@ BOOL EnumLangpacks(ENUM_PACKS_CALLBACK callback, WPARAM wParam, LPARAM lParam)
 
 	return fPackFound;
 }
-
-/////////////////////////////////////////////////////////////////////////////////////////
-
-void Langpack_LoadLangpack(void)
-{
-	TCHAR szSearch[MAX_PATH];
-	PathToAbsoluteT(_T("\\"), szSearch);
-
-	// try to get the langpack's name from a profile first
-	ptrT langpack(db_get_tsa(NULL, "Langpack", "Current"));
-	if (langpack && langpack[0] != '\0') {
-		lstrcat(szSearch, langpack);
-
-		DWORD dwAttrib = GetFileAttributes(szSearch);
-		if (dwAttrib != INVALID_FILE_ATTRIBUTES && !(dwAttrib & FILE_ATTRIBUTE_DIRECTORY))
-			if (!LoadLangPack(szSearch))
-				return;
-	}
-	
-	// look into mirandaboot.ini
-	TCHAR tszDefaultLang[100];
-	if (GetPrivateProfileString(_T("Language"), _T("DefaultLanguage"), _T(""), tszDefaultLang, SIZEOF(tszDefaultLang), mirandabootini)) {
-		TCHAR tszLangPath[MAX_PATH];
-		PathToAbsoluteT(tszDefaultLang, tszLangPath);
-		if (!LoadLangPack(tszLangPath))
-			return;
-	}
-
-	// finally try to load first file
-	lstrcat(szSearch, _T("langpack_*.txt"));
-
-	WIN32_FIND_DATA fd;
-	HANDLE hFind = FindFirstFile(szSearch, &fd);
-	if (hFind != INVALID_HANDLE_VALUE) {
-		do {
-			/* search first langpack that could be loaded */
-			if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) continue;
-			/* load langpack */
-			PathToAbsoluteT(_T("\\"), szSearch);
-			lstrcat(szSearch, fd.cFileName);
-			if (!LoadLangPack(szSearch)) {
-				db_set_ws(NULL, "Langpack", "Current", fd.cFileName);
-				break;
-			}
-		}
-			while (FindNextFile(hFind, &fd));
-		FindClose(hFind);
-	}
-}
-- 
cgit v1.2.3