From fcb0476829e02db55bf9815c0e19956251b681c2 Mon Sep 17 00:00:00 2001
From: upstream svn <svn@amule.org>
Date: Sun, 6 Jun 2010 13:06:15 +0000
Subject: [PATCH] Upstream tarball 10214

---
 .svn-revision          | 2 +-
 src/OtherFunctions.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.svn-revision b/.svn-revision
index 20753a02..066ae29e 100644
--- a/.svn-revision
+++ b/.svn-revision
@@ -1 +1 @@
-10213
+10214
diff --git a/src/OtherFunctions.cpp b/src/OtherFunctions.cpp
index 7c722973..7a73de3f 100644
--- a/src/OtherFunctions.cpp
+++ b/src/OtherFunctions.cpp
@@ -1155,7 +1155,7 @@ int StrLang2wx(const wxString& language)
 	if (!lang.IsEmpty()) {
 		const wxLanguageInfo *lng = wxLocale::FindLanguageInfo(lang);
 		if (lng) {
-			int language = lng->Language;
+			int langID = lng->Language;
 			// Traditional Chinese: original Chinese, used in Taiwan, Hong Kong and Macau.
 			// Simplified Chinese: simplified Chinese characters used in Mainland China since 1950s, and in some other places such as Singapore and Malaysia.
 			//
@@ -1165,10 +1165,10 @@ int StrLang2wx(const wxString& language)
 			// (see http://forum.amule.org/index.php?topic=13208.msg98043#msg98043 )
 			//
 			// wx maps "Traditional Chinese" to "Chinese" however. This must me corrected:
-			if (language == wxLANGUAGE_CHINESE) {
-				language = wxLANGUAGE_CHINESE_TRADITIONAL;
+			if (langID == wxLANGUAGE_CHINESE) {
+				langID = wxLANGUAGE_CHINESE_TRADITIONAL;
 			}
-			return language;
+			return langID;
 		} else {
 			return wxLANGUAGE_DEFAULT;
 		}
-- 
2.11.4.GIT