1 diff -Nur qt-x11-opensource-src-4.2.1.orig/src/corelib/kernel/qtranslator.cpp qt-x11-opensource-src-4.2.1.chng/src/corelib/kernel/qtranslator.cpp
2 --- qt-x11-opensource-src-4.2.1.orig/src/corelib/kernel/qtranslator.cpp 2006-10-20 17:35:15.000000000 +0200
3 +++ qt-x11-opensource-src-4.2.1.chng/src/corelib/kernel/qtranslator.cpp 2006-11-28 14:17:12.000000000 +0100
5 #include "qalgorithms.h"
7 #include "qtranslator_p.h"
8 +#include <qlibraryinfo.h>
10 #if defined(Q_OS_UNIX)
14 delims = search_delimiters.isNull() ? QString::fromLatin1("_.") : search_delimiters;
19 - realname = prefix + fname + (suffix.isNull() ? QString::fromLatin1(".qm") : suffix);
20 - fi.setFile(realname);
21 - if (fi.isReadable())
24 - realname = prefix + fname;
25 - fi.setFile(realname);
26 - if (fi.isReadable())
28 + if (directory == QLibraryInfo::location(QLibraryInfo::TranslationsPath)) {
30 + int idelim = 0, leftmost;
33 + leftmost = filename.size();
34 + for (int i = 0; i < (int)delims.length(); i++) {
35 + int k = filename.indexOf(delims[i], idelim);
36 + if ((k > 0)&&(k < leftmost))
40 + if (leftmost == filename.size())
43 + idelim = leftmost + 1;
44 + fname = filename.left(leftmost);
45 + locale = filename.mid(leftmost+1);
47 + while (!locale.isEmpty()) {
49 + realname = prefix + locale + QString::fromLatin1("/LC_MESSAGES/") + fname + QString::fromLatin1(".qm");
51 + fi.setFile(realname);
52 + if (fi.isReadable())
56 + for (int i = 0; i < (int)delims.length(); i++) {
57 + int k = locale.lastIndexOf(delims[i]);
61 + locale.truncate(rightmost);
63 + if (!locale.isEmpty())
70 + realname = prefix + fname + (suffix.isNull() ? QString::fromLatin1(".qm") : suffix);
71 + fi.setFile(realname);
72 + if (fi.isReadable())
75 + realname = prefix + fname;
76 + fi.setFile(realname);
77 + if (fi.isReadable())
81 + for (int i = 0; i < (int)delims.length(); i++) {
82 + int k = fname.lastIndexOf(delims[i]);
87 + // no truncations? fail
92 - for (int i = 0; i < (int)delims.length(); i++) {
93 - int k = fname.lastIndexOf(delims[i]);
96 + fname.truncate(rightmost);
99 - // no truncations? fail
100 - if (rightmost == 0)
103 - fname.truncate(rightmost);
106 // realname is now the fully qualified name of a readable file.
109 diff -Nur qt-x11-opensource-src-4.2.1.orig/tools/assistant/compat/main.cpp qt-x11-opensource-src-4.2.1.chng/tools/assistant/main.cpp
110 --- qt-x11-opensource-src-4.2.1.orig/tools/assistant/compat/main.cpp 2006-10-20 17:35:28.000000000 +0200
111 +++ qt-x11-opensource-src-4.2.1.chng/tools/assistant/compat/main.cpp 2006-11-28 14:23:03.000000000 +0100
112 @@ -310,11 +310,11 @@
113 resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
115 QTranslator translator( 0 );
116 - translator.load( QLatin1String("assistant_adp_") + QLocale::system().name(), resourceDir );
117 + translator.load( QLatin1String("qt4-assistant_adp_") + QLocale::system().name(), resourceDir );
118 a.installTranslator( &translator );
120 QTranslator qtTranslator( 0 );
121 - qtTranslator.load( QLatin1String("qt_") + QLocale::system().name(), resourceDir );
122 + qtTranslator.load( QLatin1String("qt4_") + QLocale::system().name(), resourceDir );
123 a.installTranslator( &qtTranslator );
125 Config *conf = Config::loadConfig( profileName );
126 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
127 --- qt-x11-opensource-src-4.2.1.orig/tools/designer/src/designer/qdesigner.cpp 2006-10-20 17:35:40.000000000 +0200
128 +++ qt-x11-opensource-src-4.2.1.chng/tools/designer/src/designer/qdesigner.cpp 2006-11-28 14:22:20.000000000 +0100
129 @@ -112,11 +112,11 @@
130 QTranslator *qtTranslator = new QTranslator(this);
132 const QString localSysName = QLocale::system().name();
133 - QString translatorFileName = QLatin1String("designer_");
134 + QString translatorFileName = QLatin1String("qt4-designer_");
135 translatorFileName += localSysName;
136 translator->load(translatorFileName, resourceDir);
138 - translatorFileName = QLatin1String("qt_");
139 + translatorFileName = QLatin1String("qt4_");
140 translatorFileName += localSysName;
141 qtTranslator->load(translatorFileName, resourceDir);
142 installTranslator(translator);
143 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
144 --- qt-x11-opensource-src-4.2.1.orig/tools/linguist/linguist/main.cpp 2006-10-20 17:35:26.000000000 +0200
145 +++ qt-x11-opensource-src-4.2.1.chng/tools/linguist/linguist/main.cpp 2006-11-28 14:21:19.000000000 +0100
149 QTranslator translator;
150 - translator.load(QLatin1String("linguist_") + QLocale::system().name(), resourceDir);
151 + translator.load(QLatin1String("qt4-linguist_") + QLocale::system().name(), resourceDir);
152 app.installTranslator(&translator);
154 QTranslator qtTranslator;
155 - qtTranslator.load(QLatin1String("qt_") + QLocale::system().name(), resourceDir);
156 + qtTranslator.load(QLatin1String("qt4_") + QLocale::system().name(), resourceDir);
157 app.installTranslator(&qtTranslator);
159 app.setOrganizationName(QLatin1String("Trolltech"));