Permalink
Browse files

Resolve ambiguity

  • Loading branch information...
1 parent 044d0b0 commit 9f669a857b54ffc99f16b9281226d837e0936db0 @TimePath TimePath committed with Kangz Jan 21, 2016
Showing with 7 additions and 6 deletions.
  1. +7 −6 daemon/src/engine/qcommon/translation.cpp
@@ -43,6 +43,7 @@ extern "C" {
#include "tinygettext/tinygettext.hpp"
#include "tinygettext/file_system.hpp"
+static Log::Logger LOG(VM_STRING_PREFIX "translation");
using namespace tinygettext;
// Ugly char buffer
@@ -159,22 +160,22 @@ Logging functions used by tinygettext
void Trans_Error( const std::string& str )
{
- Log::Notice( "^1%s^7", str.c_str() );
+ LOG.Notice( "^1%s^7", str.c_str() );
}
void Trans_Warning( const std::string& str )
{
if( trans_debug->integer != 0 )
{
- Log::Notice( "^3%s^7", str.c_str() );
+ LOG.Notice( "^3%s^7", str.c_str() );
}
}
void Trans_Info( const std::string& str )
{
if( trans_debug->integer != 0 )
{
- Log::Notice( "%s", str.c_str() );
+ LOG.Notice( "%s", str.c_str() );
}
}
@@ -211,7 +212,7 @@ void Trans_SetLanguage( const char* lang )
// language not found, display warning
if( bestScore == 0 )
{
- Log::Warn( "Language \"%s\" (%s) not found. Default to \"English\" (en)",
+ LOG.Warn( "Language \"%s\" (%s) not found. Default to \"English\" (en)",
requestLang.get_name().empty() ? "Unknown Language" : requestLang.get_name().c_str(),
lang );
}
@@ -221,7 +222,7 @@ void Trans_SetLanguage( const char* lang )
Cvar_Set( "language", bestLang.str().c_str() );
- Log::Notice( "Set language to %s" , bestLang.get_name().c_str() );
+ LOG.Notice( "Set language to %s" , bestLang.get_name().c_str() );
}
void Trans_UpdateLanguage_f()
@@ -276,7 +277,7 @@ void Trans_Init()
Cvar_Set( "trans_languages", langList );
Cvar_Set( "trans_encodings", encList );
- Log::Notice( "Loaded %lu language%s", ( unsigned long ) langs.size(), ( langs.size() == 1 ? "" : "s" ) );
+ LOG.Notice( "Loaded %lu language%s", ( unsigned long ) langs.size(), ( langs.size() == 1 ? "" : "s" ) );
}
void Trans_LoadDefaultLanguage()

0 comments on commit 9f669a8

Please sign in to comment.