1.1 --- a/core/sm_stringutil.cpp	Sat Aug 18 22:51:25 2007 +0000
     1.2 +++ b/core/sm_stringutil.cpp	Sun Aug 19 13:25:42 2007 +0000
     1.3 @@ -55,10 +55,14 @@
     1.4  	Translation pTrans;
     1.5  	TransError err;
     1.6  
     1.7 -	err = g_pCorePhrases->GetTranslation(phrase, g_Translator.GetServerLanguage(), &pTrans);
     1.8 -	if (err != Trans_Okay && g_Translator.GetServerLanguage() != CORELANG_ENGLISH)
     1.9 +	err = g_pCorePhrases->GetTranslation(phrase, g_Translator.GetClientLanguage(client), &pTrans);
    1.10 +	if (err != Trans_Okay)
    1.11  	{
    1.12 -		err = g_pCorePhrases->GetTranslation(phrase, CORELANG_ENGLISH, &pTrans);
    1.13 +		err = g_pCorePhrases->GetTranslation(phrase, g_Translator.GetServerLanguage(), &pTrans);
    1.14 +		if (err != Trans_Okay && g_Translator.GetServerLanguage() != CORELANG_ENGLISH)
    1.15 +		{
    1.16 +			err = g_pCorePhrases->GetTranslation(phrase, CORELANG_ENGLISH, &pTrans);
    1.17 +		}
    1.18  	}
    1.19  
    1.20  	if (err != Trans_Okay)
    1.21 @@ -123,7 +127,7 @@
    1.22  	}
    1.23  
    1.24  	max_params = pTrans.fmt_count;
    1.25 -	
    1.26 +
    1.27  	if (max_params)
    1.28  	{
    1.29  		/* Check if we're going to over the limit */