Changeset 98204

Timestamp:

Sep 29, 2012, 7:34:57 AM (12 years ago)

Author:

nicos@…

Message:

djview: replacing personal patch with upstream one

File:

• trunk/dports/aqua/djview/files/patch-djview.cpp.diff (modified) (1 diff)

trunk/dports/aqua/djview/files/patch-djview.cpp.diff

@@ -1 +1 @@
 --- src/djview.cpp.orig 2012-04-10 12:56:55.000000000 +0900
-+++ src/djview.cpp      2012-09-21 02:25:07.000000000 +0900
-@@ -120,13 +120,13 @@
- #endif
-   
-   // Install translators
--  QStringList langs = getTranslationLangs();
--  QTranslator *qtTrans = new QTranslator(this);
--  if (loadTranslator(qtTrans, "qt", langs))
--    installTranslator(qtTrans);
--  QTranslator *djviewTrans = new QTranslator(this);
--  if (loadTranslator(djviewTrans, "djview", langs))
--    installTranslator(djviewTrans);
-+//  QStringList langs = getTranslationLangs();
-+//  QTranslator *qtTrans = new QTranslator(this);
-+//  if (loadTranslator(qtTrans, "qt", langs))
-+//    installTranslator(qtTrans);
-+//  QTranslator *djviewTrans = new QTranslator(this);
-+//  if (loadTranslator(djviewTrans, "djview", langs))
-+//    installTranslator(djviewTrans);
- 
-   // Application is ready
-   appReady = true;
++++ src/djview.cpp      2012-09-24 10:36:22.000000000 +0900
+@@ -242,9 +242,9 @@
+           if (qdir.exists())
+             if (trans->load(name + "_" + lang, dir, "_.-"))
+               return true;
+-          if (lang.startsWith("en_") || lang == "en" || lang == "c")
+-            break;
+         }
++               if (lang.startsWith("en_") || lang == "en" || lang == "c")
++            break;             
+     }
+   return false;
+ }