|
|
@ -167,19 +167,19 @@ TZLoader::tryLoad( QTranslator* translator )
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
static void
|
|
|
|
loadSingletonTranslator( TranslationLoader&& loader, QTranslator*& translator_p )
|
|
|
|
loadSingletonTranslator( TranslationLoader&& loader, QTranslator*& translator_p )
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if ( !translator_p )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
QTranslator* translator = new QTranslator();
|
|
|
|
QTranslator* translator = new QTranslator();
|
|
|
|
loader.tryLoad( translator );
|
|
|
|
loader.tryLoad( translator );
|
|
|
|
|
|
|
|
|
|
|
|
if ( translator_p )
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
QCoreApplication::removeTranslator( translator_p );
|
|
|
|
|
|
|
|
delete translator_p;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
QCoreApplication::installTranslator( translator );
|
|
|
|
QCoreApplication::installTranslator( translator );
|
|
|
|
translator_p = translator;
|
|
|
|
translator_p = translator;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
loader.tryLoad( translator_p );
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
namespace CalamaresUtils
|
|
|
|
namespace CalamaresUtils
|
|
|
|
{
|
|
|
|
{
|
|
|
|