Added QT translator.

This commit is contained in:
Jim Evins
2017-04-02 17:16:44 -04:00
parent c926d8fd0d
commit a80b76343b
+16 -9
View File
@@ -18,12 +18,6 @@
* along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>. * along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <QApplication>
#include <QLocale>
#include <QTranslator>
#include <QtDebug>
#include "FileUtil.h" #include "FileUtil.h"
#include "Db.h" #include "Db.h"
#include "MainWindow.h" #include "MainWindow.h"
@@ -31,6 +25,12 @@
#include "Merge/Factory.h" #include "Merge/Factory.h"
#include <QApplication>
#include <QLibraryInfo>
#include <QLocale>
#include <QTranslator>
#include <QtDebug>
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
@@ -44,16 +44,23 @@ int main( int argc, char **argv )
// Setup translators // Setup translators
// //
QLocale locale = QLocale::system(); QLocale locale = QLocale::system();
QString translationsDir = glabels::FileUtil::translationsDir().canonicalPath(); QString qtTranslationsDir = QLibraryInfo::location( QLibraryInfo::TranslationsPath );
QString myTranslationsDir = glabels::FileUtil::translationsDir().canonicalPath();
QTranslator qtTranslator;
if ( qtTranslator.load( locale, "qt", "_", qtTranslationsDir ) )
{
app.installTranslator(&qtTranslator);
}
QTranslator glabelsTranslator; QTranslator glabelsTranslator;
if ( glabelsTranslator.load( locale, "glabels", "_", translationsDir ) ) if ( glabelsTranslator.load( locale, "glabels", "_", myTranslationsDir ) )
{ {
app.installTranslator(&glabelsTranslator); app.installTranslator(&glabelsTranslator);
} }
QTranslator templatesTranslator; QTranslator templatesTranslator;
if ( templatesTranslator.load( locale, "templates", "_", translationsDir ) ) if ( templatesTranslator.load( locale, "templates", "_", myTranslationsDir ) )
{ {
app.installTranslator(&templatesTranslator); app.installTranslator(&templatesTranslator);
} }