4 files changed, 71 insertions, 44 deletions

diff --git a/library/global.cpp b/library/global.cpp
index fd7579a..dd15eb7 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -17,6 +17,7 @@
 ** not clear to you.
 **
 **********************************************************************/
+#define QTOPIA_INTERNAL_LANGLIST
 #include <qpe/qpedebug.h>
 #include <qpe/global.h>
 #include <qpe/qdawg.h>
@@ -170,12 +171,18 @@ const QDawg& Global::fixedDawg()
 
         fixed_dawg = new QDawg;
         QString dawgfilename = dictDir() + "/dawg";
-        QString lang = getenv( "LANG" );
-        QString dawgfilename_lang = dawgfilename + "." + lang;
-        QString words_lang = dictDir() + "/words." + lang;
-        if ( QFile::exists(dawgfilename_lang) ||
-             QFile::exists(words_lang) )
-            dawgfilename = dawgfilename_lang;
+        QString words_lang;
+        QStringList langs = Global::languageList();
+        for (QStringList::ConstIterator it = langs.begin(); it!=langs.end(); ++it) {
+            QString lang = *it;
+            words_lang = dictDir() + "/words." + lang;
+            QString dawgfilename_lang = dawgfilename + "." + lang;
+            if ( QFile::exists(dawgfilename_lang) ||
+                 QFile::exists(words_lang) ) {
+                dawgfilename = dawgfilename_lang;
+                break;
+            }
+        }
         QFile dawgfile(dawgfilename);
 
         if ( !dawgfile.exists() ) {
@@ -639,6 +646,42 @@ void Global::findDocuments(DocLnkSet* folder, const QString &mimefilter)
     }
 }
 
+QStringList Global::languageList()
+{
+    QString lang = getenv("LANG");
+    QStringList langs;
+    langs.append(lang);
+    int i  = lang.find(".");
+    if ( i > 0 )
+        lang = lang.left( i );
+    i = lang.find( "_" );
+    if ( i > 0 )
+        langs.append(lang.left(i));
+    return langs;
+}
+
+QStringList Global::helpPath()
+{
+    QStringList path;
+    QStringList langs = Global::languageList();
+    for (QStringList::ConstIterator it = langs.fromLast(); it!=langs.end(); --it) {
+        QString lang = *it;
+        if ( !lang.isEmpty() )
+            path += QPEApplication::qpeDir() + "/help/" + lang + "/html";
+    }
+    path += QPEApplication::qpeDir() + "/pics";
+    path += QPEApplication::qpeDir() + "/help/en/html";
+    path += QPEApplication::qpeDir() + "/docs";
+    QString dir = QDir::current().canonicalPath();
+    if ( dir == "/" )
+        dir += "/docs";
+    else {
+        path += dir + "/../pics";
+        dir += "/../docs";
+        path += dir;
+    }
+    return path;
+}
 
 
 #include "global.moc"
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 70ffec1..4dbfbd8 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -19,6 +19,7 @@
 ** $Id$
 **
 **********************************************************************/
+#define QTOPIA_INTERNAL_LANGLIST
 #include <stdlib.h>
 #include <unistd.h>
 #include <qfile.h>
@@ -137,22 +138,7 @@ class ResourceMimeFactory : public QMimeSourceFactory {
 public:
     ResourceMimeFactory()
     {
-        QStringList path;
-        QString lang = getenv("LANG");
-        if ( !lang.isEmpty() )
-            path += QPEApplication::qpeDir() + "/help/" + lang + "/html";
-        path += QPEApplication::qpeDir() + "/pics";
-        path += QPEApplication::qpeDir() + "/help/en/html";
-        path += QPEApplication::qpeDir() + "/docs";
-        QString dir = QDir::current().canonicalPath();
-        if ( dir == "/" )
-            dir += "/docs";
-        else {
-            path += dir + "/../pics";
-            dir += "/../docs";
-            path += dir;
-        }
-        setFilePath( path );
+        setFilePath( Global::helpPath() );
         setExtensionType("html","text/html;charset=UTF-8");
     }
 
@@ -537,32 +523,28 @@ QPEApplication::QPEApplication( int& argc, char **argv, Type t )
     qwsSetDecoration( new QPEDecoration() );
 
 #ifndef QT_NO_TRANSLATION
-    char *l = getenv( "LANG" );
-    QString lang;
-    if ( l ) {
-        lang = l;
+    QStringList langs = Global::languageList();
+    for (QStringList::ConstIterator it = langs.begin(); it!=langs.end(); ++it) {
+        QString lang = *it;
 
-        /*
-    Config config("qpe");
-    config.setGroup( "Appearance" );
-    lang = config.readEntry( "Language", lang );
-    */
+        QTranslator * trans;
+        QString tfn;
 
-        QTranslator * trans = new QTranslator(this);
-        QString tfn = qpeDir()+"/i18n/"+lang+"/"+d->appName+".qm";
+        trans = new QTranslator(this);
+        tfn = qpeDir()+"/i18n/"+lang+"/libqpe.qm";
         if ( trans->load( tfn ))
             installTranslator( trans );
         else
             delete trans;
 
         trans = new QTranslator(this);
-        tfn = qpeDir()+"/i18n/"+lang+"/libqpe.qm";
+        tfn = qpeDir()+"/i18n/"+lang+"/"+d->appName+".qm";
         if ( trans->load( tfn ))
             installTranslator( trans );
         else
             delete trans;
 
-    //###language/font hack; should look it up somewhere
+        //###language/font hack; should look it up somewhere
         if ( lang == "ja" || lang == "zh_CN" || lang == "zh_TW" || lang == "ko" ) {
             QFont fn = FontManager::unicodeFont( FontManager::Proportional );
             setFont( fn );
diff --git a/mkipks b/mkipks
index dedb060..d44f074 100755
--- a/mkipks
+++ b/mkipks
@@ -176,7 +176,7 @@ do
             echo >>$SPEC "%files"
             echo >>$SPEC "%defattr(-,root,root)"
             /bin/ls $RPMFILES >>$SPEC
-            rpm -bb $SPEC --target $ARCH-unknown-linux
+            rpm -bb --target $ARCH-unknown-linux $SPEC
             # rm $SPEC
         elif [ -z "$IMAGEDIR" ]
         then
diff --git a/noncore/games/minesweep/Makefile.in b/noncore/games/minesweep/Makefile.in
index 67ea94c..6df2608 100644
--- a/noncore/games/minesweep/Makefile.in
+++ b/noncore/games/minesweep/Makefile.in
@@ -69,8 +69,10 @@ $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 
 moc: $(SRCMOC)
 
-tmake:
-        tmake minesweep.pro
+tmake: Makefile.in
+
+Makefile.in: minesweep.pro
+        tmake minesweep.pro -o Makefile.in
 
 clean:
         -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
@@ -105,19 +107,19 @@ REQUIRES=
 
 main.o: main.cpp \
                 minesweep.h \
-                $(OPIEDIR)/include/qpe/qpeapplication.h
+                /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/qpeapplication.h
 
 minefield.o: minefield.cpp \
                 minefield.h \
-                $(OPIEDIR)/include/qpe/config.h
+                /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/config.h
 
 minesweep.o: minesweep.cpp \
                 minesweep.h \
                 minefield.h \
-                $(OPIEDIR)/include/qpe/resource.h \
-                $(OPIEDIR)/include/qpe/config.h \
-                $(OPIEDIR)/include/qpe/qpetoolbar.h \
-                $(OPIEDIR)/include/qpe/qpemenubar.h
+                /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/resource.h \
+                /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/config.h \
+                /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/qpetoolbar.h \
+                /home/kergoth/roms/openzaurus/buildroot-oz/build/opie/include/qpe/qpemenubar.h
 
 moc_minefield.o: moc_minefield.cpp \
                 minefield.h