1.1 --- a/core/Translator.cpp	Wed Mar 12 02:13:08 2008 +0000
     1.2 +++ b/core/Translator.cpp	Wed Mar 12 03:33:52 2008 +0000
     1.3 @@ -949,25 +949,19 @@
     1.4  	return gnprintf(buffer, maxlength, pTrans->szPhrase, new_params);
     1.5  }
     1.6  
     1.7 -TransError Translator::CoreTrans(int client, 
     1.8 -								  char *buffer, 
     1.9 -								  size_t maxlength, 
    1.10 -								  const char *phrase, 
    1.11 -								  void **params, 
    1.12 -								  size_t *outlen)
    1.13 +TransError Translator::CoreTransEx(CPhraseFile *pFile,
    1.14 +								   int client, 
    1.15 +								   char *buffer, 
    1.16 +								   size_t maxlength, 
    1.17 +								   const char *phrase, 
    1.18 +								   void **params, 
    1.19 +								   size_t *outlen)
    1.20  {
    1.21 -	/* :TODO: do language stuff here */
    1.22 -
    1.23 -	if (!g_pCorePhrases)
    1.24 -	{
    1.25 -		return Trans_BadPhraseFile;
    1.26 -	}
    1.27 -
    1.28  	Translation trans;
    1.29  	TransError err;
    1.30 -	
    1.31 +
    1.32  	/* Using server lang temporarily until client lang stuff is implemented */
    1.33 -	if ((err=g_pCorePhrases->GetTranslation(phrase, m_ServerLang, &trans)) != Trans_Okay)
    1.34 +	if ((err = pFile->GetTranslation(phrase, m_ServerLang, &trans)) != Trans_Okay)
    1.35  	{
    1.36  		return err;
    1.37  	}
    1.38 @@ -982,6 +976,21 @@
    1.39  	return Trans_Okay;
    1.40  }
    1.41  
    1.42 +TransError Translator::CoreTrans(int client, 
    1.43 +								  char *buffer, 
    1.44 +								  size_t maxlength, 
    1.45 +								  const char *phrase, 
    1.46 +								  void **params, 
    1.47 +								  size_t *outlen)
    1.48 +{
    1.49 +	if (!g_pCorePhrases)
    1.50 +	{
    1.51 +		return Trans_BadPhraseFile;
    1.52 +	}
    1.53 +
    1.54 +	return CoreTransEx(g_pCorePhrases, client, buffer, maxlength, phrase, params, outlen);
    1.55 +}
    1.56 +
    1.57  unsigned int Translator::GetServerLanguage()
    1.58  {
    1.59  	return m_ServerLang;