StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

No more PRs shall be merged until the new_api branch in my repo is merged. Contributions are welcome.

Browse Source 
This commit fixes some minor style issues with #1406
This commit is contained in:
Dubslow 2015-03-27 15:15:51 -05:00
parent 72e78ff6cd
commit 885dc0638a
No known key found for this signature in database
GPG Key ID: 3DB8E05315C220AA
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/widget/widget.cpp
View File

@ -59,7 +59,7 @@
#include <QList>
#include <QDesktopServices>
#include <QProcess>
#include <qlibraryinfo.h>
#include <QLibraryInfo>
#include <tox/tox.h>
#ifdef Q_OS_ANDROID
@ -84,7 +84,7 @@ Widget::Widget(QWidget *parent)
activeChatroomWidget{nullptr},
eventFlag(false),
eventIcon(false)
{
{
installEventFilter(this);
translator = new QTranslator;
setTranslation();
@ -214,7 +214,7 @@ void Widget::setTranslation()
QString locale;
if ((locale = Settings::getInstance().getTranslation()).isEmpty())
locale = QLocale::system().name().section('_', 0, 0);
if (locale == "en")
return;
@ -225,16 +225,20 @@ void Widget::setTranslation()
// system menu translation
QTranslator *qtTranslator = new QTranslator();
QString s_locale = "qt_"+locale;
if ( qtTranslator->load(s_locale, QLibraryInfo::location(QLibraryInfo::TranslationsPath)) )
if (qtTranslator->load(s_locale, QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
{
QApplication::installTranslator(qtTranslator);
qDebug() << "System translation loaded" << locale;
}
else
{
qDebug() << "System translation not loaded" << locale;
}
}
else
{
qDebug() << "Error loading translation" << locale;
}
QCoreApplication::installTranslator(translator);
}