core/sm_stringutil.cpp
changeset 661 5c0988b9bf0c
parent 653 ef60870067ff
child 663 b526b82e256e
     1.1 --- a/core/sm_stringutil.cpp	Tue Apr 03 07:02:27 2007 +0000
     1.2 +++ b/core/sm_stringutil.cpp	Thu Apr 05 03:02:00 2007 +0000
     1.3 @@ -62,7 +62,7 @@
     1.4  size_t Translate(char *buffer, size_t maxlen, IPluginContext *pCtx, const char *key, cell_t target, const cell_t *params, int *arg, bool *error)
     1.5  {
     1.6  	unsigned int langid;
     1.7 -	char *langname = NULL;
     1.8 +	const char *langname = NULL;
     1.9  	*error = false;
    1.10  	Translation pTrans;
    1.11  	CPlugin *pl = (CPlugin *)g_PluginSys.FindPluginByContext(pCtx->GetContext());
    1.12 @@ -73,14 +73,14 @@
    1.13  try_serverlang:
    1.14  	if (target == LANG_SERVER)
    1.15  	{
    1.16 -		langname = "en"; //:TODO: read serverlang
    1.17 +		langname = g_Translator.GetServerLanguageCode();
    1.18  		if (!TryServerLanguage(langname ? langname : "en", &langid))
    1.19  		{
    1.20  			pCtx->ThrowNativeError("Translation failure: English language not found");
    1.21  			goto error_out;
    1.22  		}
    1.23  	} else if ((target >= 1) && (target <= g_Players.GetMaxClients())) {
    1.24 -		langname = "en"; //:TODO: read player's lang
    1.25 +		langname = g_Translator.GetServerLanguageCode(); /* :TODO: read player's lang */
    1.26  		if (!langname || !g_Translator.GetLanguageByCode(langname, &langid))
    1.27  		{
    1.28  			if (langname && !strcmp(langname, "en"))