[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/solid/solid/backends/hal
From:       Nickolai Shaforostoff <shafff () ukr ! net>
Date:       2008-09-12 21:14:14
Message-ID: 1221254054.315422.23537.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 860382 by shaforo:

use 850 code page for wester languages as people report cp1252 to not work
(1251 works for cyrillic though...)



 M  +16 -11    halstorageaccess.cpp  


--- trunk/KDE/kdelibs/solid/solid/backends/hal/halstorageaccess.cpp #860381:860382
@@ -259,7 +259,7 @@
     if (halOptions.contains("uid=")) {
         options << "uid="+QString::number(::getuid());
     }
-    //respect windows-enforced charsets for fat
+    //respect window$-enforced charsets for fat
     if ( m_device->property("volume.fstype").toString()=="vfat" && halOptions.contains("codepage=") ) {
         QString codepage;
         switch (QLocale::system().language()) {
@@ -269,15 +269,6 @@
             case QLocale::Bulgarian:
                 codepage = "codepage=1251";
                 break;
-            case QLocale::Hebrew:
-                codepage = "codepage=1255";
-                break;
-            case QLocale::Turkish:
-                codepage = "codepage=1254";
-            case QLocale::Greek:
-                codepage = "codepage=1253";
-            case QLocale::Arabic:
-                codepage = "codepage=1256";
             case QLocale::German:
             case QLocale::Italian:
             case QLocale::Spanish:
@@ -288,7 +279,21 @@
             case QLocale::Swedish:
             case QLocale::Norwegian:
             case QLocale::Icelandic:
-                codepage = "codepage=1252";
+            case QLocale::English:
+                codepage = "codepage=850";//1252 didn't work
+                break;
+            case QLocale::Hebrew:
+                codepage = "codepage=1255";
+                break;
+            case QLocale::Turkish:
+                codepage = "codepage=1254";
+                break;
+            case QLocale::Greek:
+                codepage = "codepage=1253";
+                break;
+            case QLocale::Arabic:
+                codepage = "codepage=1256";
+                break;
         }
         if (!codepage.isEmpty()) {
             options << codepage;
[prev in list] [next in list] [prev in thread] [next in thread]