[QTerm-cvs] SF.net SVN: qterm:[1161] trunk/qterm-qt4/src/qtermglobal.cpp

[<hep...@us...>]

Revision: 1161
          http://qterm.svn.sourceforge.net/qterm/?rev=1161&view=rev
Author:   hephooey
Date:     2010-01-25 00:32:26 +0000 (Mon, 25 Jan 2010)

Log Message:
-----------
Rearrange the order of qm files

Modified Paths:
--------------
    trunk/qterm-qt4/src/qtermglobal.cpp

Modified: trunk/qterm-qt4/src/qtermglobal.cpp
===================================================================
--- trunk/qterm-qt4/src/qtermglobal.cpp	2010-01-24 04:06:54 UTC (rev 1160)
+++ trunk/qterm-qt4/src/qtermglobal.cpp	2010-01-25 00:32:26 UTC (rev 1161)
@@ -566,23 +566,23 @@
         m_language = Global::English;
     }
     if (lang != "eng" && !lang.isEmpty()) {
-        // look in $HOME/.qterm/po/ first
-        QString qterm_qm = QDir::homePath() + "/.qterm/po/qterm_" + lang + ".qm";
-        if (!QFile::exists(qterm_qm))
-            qterm_qm = m_pathLib + "po/qterm_" + lang + ".qm";
-        static QTranslator * translator = new QTranslator(0);
-        translator->load(qterm_qm);
-        qApp->installTranslator(translator);
-
         QString qt_qm;
         if (lang == "chs")
             qt_qm = QLibraryInfo::location(QLibraryInfo::TranslationsPath)+"/qt_zh_CN.qm";
         else
             qt_qm = QLibraryInfo::location(QLibraryInfo::TranslationsPath)+"/qt_zh_TW.qm";
 
-        translator = new QTranslator(0);
+        static QTranslator * translator = new QTranslator(0);
         translator->load(qt_qm);
         qApp->installTranslator(translator);
+
+        // look in $HOME/.qterm/po/ first
+        QString qterm_qm = QDir::homePath() + "/.qterm/po/qterm_" + lang + ".qm";
+        if (!QFile::exists(qterm_qm))
+            qterm_qm = m_pathLib + "po/qterm_" + lang + ".qm";
+        translator = new QTranslator(0);
+        translator->load(qterm_qm);
+        qApp->installTranslator(translator);
     }
     //set font
     QString family = m_config->getItemValue("global", "font").toString();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.