SOURCES (DEVEL): qt4-locale.patch - up for 4.4.0

[shadzik]

Author: shadzik                      Date: Sat Feb 23 15:23:59 2008 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- up for 4.4.0

---- Files affected:
SOURCES:
   qt4-locale.patch (1.10 -> 1.10.2.1) 

---- Diffs:

================================================================
Index: SOURCES/qt4-locale.patch
diff -u SOURCES/qt4-locale.patch:1.10 SOURCES/qt4-locale.patch:1.10.2.1
--- SOURCES/qt4-locale.patch:1.10	Tue Nov 28 20:02:04 2006
+++ SOURCES/qt4-locale.patch	Sat Feb 23 16:23:54 2008
@@ -106,9 +106,9 @@
      // realname is now the fully qualified name of a readable file.
  
      bool ok = false;
-diff -Nur qt-x11-opensource-src-4.2.1.orig/tools/assistant/main.cpp qt-x11-opensource-src-4.2.1.chng/tools/assistant/main.cpp
---- qt-x11-opensource-src-4.2.1.orig/tools/assistant/main.cpp	2006-10-20 17:35:28.000000000 +0200
-+++ qt-x11-opensource-src-4.2.1.chng/tools/assistant/main.cpp	2006-11-28 14:23:03.000000000 +0100
+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
+--- qt-x11-opensource-src-4.2.1.orig/tools/assistant/compat/main.cpp	2006-10-20 17:35:28.000000000 +0200
++++ qt-x11-opensource-src-4.2.1.chng/tools/assistant/compat/main.cpp	2006-11-28 14:23:03.000000000 +0100
 @@ -310,11 +310,11 @@
          resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
  
@@ -126,31 +126,34 @@
 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,8 +112,8 @@
+@@ -112,11 +112,11 @@
+     QTranslator *qtTranslator = new QTranslator(this);
  
-     QTranslator *translator = new QTranslator;
-     QTranslator *qtTranslator = new QTranslator;
--    translator->load(QLatin1String("designer_") + QLocale::system().name().toLower(), resourceDir);
--    qtTranslator->load(QLatin1String("qt_") + QLocale::system().name().toLower(), resourceDir);
-+    translator->load(QLatin1String("qt4-designer_") + QLocale::system().name(), resourceDir);
-+    qtTranslator->load(QLatin1String("qt4_") + QLocale::system().name(), resourceDir);
+     const QString localSysName = QLocale::system().name();
+-    QString  translatorFileName = QLatin1String("designer_");
++    QString  translatorFileName = QLatin1String("qt4-designer_");
+     translatorFileName += localSysName;
+     translator->load(translatorFileName, resourceDir);
+ 
+-    translatorFileName = QLatin1String("qt_");
++    translatorFileName = QLatin1String("qt4_");
+     translatorFileName += localSysName;
+     qtTranslator->load(translatorFileName, resourceDir);
      installTranslator(translator);
-     installTranslator(qtTranslator);
- 
 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
 @@ -41,11 +41,11 @@
-     QApplication::setOverrideCursor(Qt::WaitCursor);
+     }
  
      QTranslator translator(0);
--    translator.load(QLatin1String("linguist_") + QLocale::system().name(), ".");
-+    translator.load(QLatin1String("qt4-linguist_") + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+-    translator.load(QLatin1String("linguist_") + QLocale::system().name(), resourceDir);
++    translator.load(QLatin1String("qt4-linguist_") + QLocale::system().name(), resourceDir);
      app.installTranslator(&translator);
  
      QTranslator qtTranslator(0);
--    qtTranslator.load(QLatin1String("qt_") + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
-+    qtTranslator.load(QLatin1String("qt4_") + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+-    qtTranslator.load(QLatin1String("qt_") + QLocale::system().name(), resourceDir);
++    qtTranslator.load(QLatin1String("qt4_") + QLocale::system().name(), resourceDir);
      app.installTranslator(&qtTranslator);
  
-     app.setOrganizationName("Trolltech");
+     app.setOrganizationName(QLatin1String("Trolltech"));
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/qt4-locale.patch?r1=1.10&r2=1.10.2.1&f=u