---- qt-x11-preview-4.0.0-tp1/tools/assistant/main.cpp.orig 2004-07-08 11:14:30.000000000 +0200
-+++ qt-x11-preview-4.0.0-tp1/tools/assistant/main.cpp 2004-07-13 22:14:09.707927256 +0200
-@@ -254,11 +254,11 @@
- resourceDir = QFile::decodeName(qInstallPathTranslations());
+diff -Nur qt-x11-opensource-src-4.2.1.orig/tools/designer/src/designer/qdesigner.cpp qt-x11-opensource-src-4.2.1.chng/tools/designer/src/designer/qdesigner.cpp
+--- qt-x11-opensource-src-4.2.1.orig/tools/designer/src/designer/qdesigner.cpp 2006-10-20 17:35:40.000000000 +0200
++++ qt-x11-opensource-src-4.2.1.chng/tools/designer/src/designer/qdesigner.cpp 2006-11-28 14:22:20.000000000 +0100
+@@ -112,11 +112,11 @@
+ QTranslator *qtTranslator = new QTranslator(this);
- QTranslator translator( 0 );
-- translator.load( QLatin1String("assistant_") + QLatin1String(QTextCodec::locale()), resourceDir );
-+ translator.load( QLatin1String("assistant"), resourceDir + QLatin1String("/") + QLatin1String(QTextCodec::locale()) + QLatin1String("/LC_MESSAGES") );
- a.installTranslator( &translator );
+ const QString localSysName = QLocale::system().name();
+- QString translatorFileName = QLatin1String("designer_");
++ QString translatorFileName = QLatin1String("qt4-designer_");
+ translatorFileName += localSysName;
+ translator->load(translatorFileName, resourceDir);
- QTranslator qtTranslator( 0 );
-- qtTranslator.load( QLatin1String("qt_") + QLatin1String(QTextCodec::locale()), resourceDir );
-+ qtTranslator.load( QLatin1String("qt"), resourceDir + QLatin1String("/") + QLatin1String(QTextCodec::locale()) + QLatin1String("/LC_MESSAGES") );
- a.installTranslator( &qtTranslator );
+- translatorFileName = QLatin1String("qt_");
++ translatorFileName = QLatin1String("qt4_");
+ translatorFileName += localSysName;
+ qtTranslator->load(translatorFileName, resourceDir);
+ installTranslator(translator);
+diff -Nur qt-x11-opensource-src-4.2.1.orig/tools/linguist/linguist/main.cpp qt-x11-opensource-src-4.2.1.chng/tools/linguist/linguist/main.cpp
+--- qt-x11-opensource-src-4.2.1.orig/tools/linguist/linguist/main.cpp 2006-10-20 17:35:26.000000000 +0200
++++ qt-x11-opensource-src-4.2.1.chng/tools/linguist/linguist/main.cpp 2006-11-28 14:21:19.000000000 +0100
+@@ -83,9 +83,9 @@
+ QTranslator translator;
+ QTranslator qtTranslator;
+ QString sysLocale = QLocale::system().name();
+- if (translator.load(QLatin1String("linguist_") + sysLocale, resourceDir)) {
++ if (translator.load(QLatin1String("qt4-linguist_") + sysLocale, resourceDir)) {
+ app.installTranslator(&translator);
+- if (qtTranslator.load(QLatin1String("qt_") + sysLocale, resourceDir))
++ if (qtTranslator.load(QLatin1String("qt4_") + sysLocale, resourceDir))
+ app.installTranslator(&qtTranslator);
+ else
+ app.removeTranslator(&translator);
+--- qt-everywhere-opensource-src-4.7.0/src/corelib/kernel/qtranslator.cpp.orig 2010-09-10 11:05:25.000000000 +0200
++++ qt-everywhere-opensource-src-4.7.0/src/corelib/kernel/qtranslator.cpp 2010-09-21 21:36:42.645202096 +0200
+@@ -55,6 +55,7 @@
+ #include "qtranslator_p.h"
+ #include "qlocale.h"
++#include <qlibraryinfo.h>
+ #include "qresource.h"
- Config *conf = Config::loadConfig( profileName );
---- qt-x11-preview-4.0.0-tp1/src/core/tools/qlocale.cpp.orig 2004-07-08 11:14:43.000000000 +0200
-+++ qt-x11-preview-4.0.0-tp1/src/core/tools/qlocale.cpp 2004-07-13 22:22:00.160407608 +0200
-@@ -1629,7 +1629,15 @@
- const char* QLocalePrivate::systemLocaleName()
- {
- static QByteArray lang;
-- lang = getenv("LANG");
-+ lang = getenv( "LC_ALL" );
-+ if ( lang.isEmpty() )
-+ {
-+ lang = getenv( "LC_MESSAGES" );
-+ }
-+ if ( lang.isEmpty() )
-+ {
-+ lang = getenv( "LANG" );
-+ }
+ #if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
+ #define QT_USE_MMAP
+@@ -445,49 +445,71 @@
+ QString delims;
+ delims = search_delimiters.isNull() ? QString::fromLatin1("_.") : search_delimiters;
- #if !defined(QWS) && defined(Q_OS_MAC)
- if (!lang.isEmpty())
---- qt-x11-preview-4.0.0-tp1/src/core/codecs/qtextcodec.cpp.orig 2004-07-08 11:14:42.000000000 +0200
-+++ qt-x11-preview-4.0.0-tp1/src/core/codecs/qtextcodec.cpp 2004-07-13 22:22:35.636014496 +0200
-@@ -2630,11 +2630,11 @@
- // Get the first nonempty value from $LC_ALL, $LC_CTYPE, and $LANG
- // environment variables.
- char * lang = qstrdup(getenv("LC_ALL"));
-- if (!lang || lang[0] == 0 || strcmp(lang, "C") == 0) {
-+ if (!lang || lang[0] == 0 ) {
- if (lang) delete [] lang;
- lang = qstrdup(getenv("LC_CTYPE"));
- }
-- if (!lang || lang[0] == 0 || strcmp(lang, "C") == 0) {
-+ if (!lang || lang[0] == 0 ) == 0) {
- if (lang) delete [] lang;
- lang = qstrdup(getenv("LANG"));
- }
+- for (;;) {
+- QFileInfo fi;
++ if (directory == QLibraryInfo::location(QLibraryInfo::TranslationsPath)) {
++ QString locale;
++ int idelim = 0, leftmost;
++
++ for (;;) {
++ leftmost = filename.size();
++ for (int i = 0; i < (int)delims.length(); i++) {
++ int k = filename.indexOf(delims[i], idelim);
++ if ((k > 0)&&(k < leftmost))
++ leftmost = k;
++ }
++
++ if (leftmost == filename.size())
++ return false;
++
++ idelim = leftmost + 1;
++ fname = filename.left(leftmost);
++ locale = filename.mid(leftmost+1);
++
++ while (!locale.isEmpty()) {
++ QFileInfo fi;
++ realname = prefix + locale + QString::fromLatin1("/LC_MESSAGES/") + fname + QString::fromLatin1(".qm");
++
++ fi.setFile(realname);
++ if (fi.isReadable())
++ break;
++
++ int rightmost = 0;
++ for (int i = 0; i < (int)delims.length(); i++) {
++ int k = locale.lastIndexOf(delims[i]);
++ if (k > rightmost)
++ rightmost = k;
++ }
++ locale.truncate(rightmost);
++ }
++ if (!locale.isEmpty())
++ break;
++ }
++ } else {
++ for (;;) {
++ QFileInfo fi;
++
++ realname = prefix + fname + (suffix.isNull() ? QString::fromLatin1(".qm") : suffix);
++ fi.setFile(realname);
++ if (fi.isReadable())
++ break;
++
++ realname = prefix + fname;
++ fi.setFile(realname);
++ if (fi.isReadable())
++ break;
++
++ int rightmost = 0;
++ for (int i = 0; i < (int)delims.length(); i++) {
++ int k = fname.lastIndexOf(delims[i]);
++ if (k > rightmost)
++ rightmost = k;
++ }
++
++ // no truncations? fail
++ if (rightmost == 0)
++ return false;
+
+-#ifdef Q_OS_SYMBIAN
+- //search for translations on other drives, e.g. Qt may be in Z, while app is in C
+- //note this uses symbian search rules, i.e. y:->a:, followed by z:
+- TFindFile finder(qt_s60GetRFs());
+- QString fname2 = fname + (suffix.isNull() ? QString::fromLatin1(".qm") : suffix);
+- TInt err = finder.FindByDir(
+- qt_QString2TPtrC(fname2),
+- qt_QString2TPtrC(nativePrefix));
+- if (err != KErrNone)
+- err = finder.FindByDir(qt_QString2TPtrC(fname), qt_QString2TPtrC(nativePrefix));
+- if (err == KErrNone) {
+- fi.setFile(qt_TDesC2QString(finder.File()));
+- realname = fi.canonicalFilePath();
+- if (fi.isReadable() && fi.isFile())
+- break;
+- }
+-#endif
+-
+- realname = prefix + fname + (suffix.isNull() ? QString::fromLatin1(".qm") : suffix);
+- fi.setFile(realname);
+- if (fi.isReadable() && fi.isFile())
+- break;
+-
+- realname = prefix + fname;
+- fi.setFile(realname);
+- if (fi.isReadable() && fi.isFile())
+- break;
+-
+- int rightmost = 0;
+- for (int i = 0; i < (int)delims.length(); i++) {
+- int k = fname.lastIndexOf(delims[i]);
+- if (k > rightmost)
+- rightmost = k;
+- }
+-
+- // no truncations? fail
+- if (rightmost == 0)
+- return false;
+-
+- fname.truncate(rightmost);
++ fname.truncate(rightmost);
++ }
+ }
+
+ // realname is now the fully qualified name of a readable file.
+
projects / packages / qt4.git / blobdiff