- trolltech incorporated better checking if the locale was found,

 still its locale finding  mechanism lacks locale.alias database
 support, i will add it later  (i ported it from my qt3's locale.patch
 but it segfaulted and its not like we're releasing qt4 rpms)
- use proper translation driectory i qt4 assistant

Changed files:
    qt4-locale.patch -> 1.7

diff --git a/qt4-locale.patch b/qt4-locale.patch
index 05fa86b23599877b67d5b5cf5dd65491ca4228b6..c0a1e21709398c0bda22e40f6b942dcdee081db5 100644 (file)
--- a/qt4-locale.patch
+++ b/qt4-locale.patch
@@ -1,55 +1,17 @@
---- qt-copy/tools/assistant/main.cpp.orig      2005-05-13 16:39:06.000000000 +0200
-+++ qt-copy/tools/assistant/main.cpp   2005-05-13 19:58:41.956418200 +0200
-@@ -272,11 +272,11 @@
+--- qt-copy/tools/assistant/main.cpp.niedakh   2005-05-13 16:39:06.000000000 +0200
++++ qt-copy/tools/assistant/main.cpp   2005-05-14 14:34:40.000000000 +0200
+@@ -272,11 +272,12 @@
          resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
  
      QTranslator translator( 0 );
 -    translator.load( QLatin1String("assistant_") + QLocale::system().name().toLower(), resourceDir );
-+    translator.load( QLatin1String("assistant"), resourceDir + QLatin1String("/") + QLatin1String(QTextCodec::locale()) + QLatin1String("/LC_MESSAGES") );
++    QLocale locale = QLocale::system();
++    translator.load( QLatin1String("assistant"), resourceDir + QLatin1String("/") + QLocale::languageToString(locale.language())  + QLatin1String("/LC_MESSAGES") );
      a.installTranslator( &translator );
  
      QTranslator qtTranslator( 0 );
 -    qtTranslator.load( QLatin1String("qt_") + QLocale::system().name().toLower(), resourceDir );
-+    qtTranslator.load( QLatin1String("qt"), resourceDir + QLatin1String("/") + QLatin1String(QTextCodec::locale()) + QLatin1String("/LC_MESSAGES") );
++    qtTranslator.load( QLatin1String("qt"), resourceDir + QLatin1String("/") + QLocale::languageToString(locale.language()) + QLatin1String("/LC_MESSAGES") );
      a.installTranslator( &qtTranslator );
  
      Config *conf = Config::loadConfig( profileName );
---- qt-copy/src/corelib/codecs/qtextcodec.cpp.niedakh  2005-05-13 16:34:37.000000000 +0200
-+++ qt-copy/src/corelib/codecs/qtextcodec.cpp  2005-05-13 22:31:48.036921696 +0200
-@@ -63,6 +63,9 @@
- #include <langinfo.h>
- #endif
- 
-+#include <qfile.h>
-+#include <qtextstream.h>
-+
- 
- #ifndef QT_NO_COMPONENT
- Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
-@@ -359,6 +362,26 @@
-             lang = qstrdup(qgetenv("LANG"));
-         }
- 
-+         QString lang_s (lang);
-+
-+         QFile * plik = new QFile("/usr/share/locale/locale.alias");
-+         if (plik->open(QIODevice::ReadOnly))
-+         {
-+                 QTextStream stream(plik);
-+                 QString line;
-+                 while (!stream.atEnd()) {
-+                         line = stream.readLine();
-+                         if (!line.startsWith("#") && ( line.left(line.indexOf(QChar('t'))) == lang_s.toLower() ) )
-+                         {
-+                               if (lang) delete [] lang;
-+                                lang = qstrdup((line.mid(line.lastIndexOf(QChar('t')))).toLatin1());
-+                         }
-+                }
-+              plik->close();
-+         }
-+        if (plik) delete plik;
-+                                      
-+
-         // Now try these in order:
-         // 1. CODESET from ctype if it contains a .CODESET part (e.g. en_US.ISO8859-15)
-         // 2. CODESET from lang if it contains a .CODESET part