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

List:       kde-commits
Subject:    playground/office/kmymoney/kmymoney2/widgets
From:       Cristian Oneț <onet.cristian () gmail ! com>
Date:       2009-09-26 19:59:52
Message-ID: 1253995192.246213.11709.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1028359 by conet:

Fixed the previous commit so that the separator used in the date displayed by the \
kmymoneydateinput widget is the one defined by the locale settings.

 M  +7 -6      kmymoneydateinput.cpp  


--- trunk/playground/office/kmymoney/kmymoney2/widgets/kmymoneydateinput.cpp \
#1028358:1028359 @@ -110,7 +110,7 @@
   d->m_dateFrame->hide();
 
   QString dateFormat = KGlobal::locale()->dateFormatShort().toLower();
-  QString order;
+  QString order, separator;
   for(int i = 0; i < dateFormat.length(); ++i) {
     // DD.MM.YYYY is %d.%m.%y
     // dD.mM.YYYY is %e.%n.%y
@@ -121,20 +121,21 @@
       if(dateFormat[i] == 'e')
         dateFormat[i] = 'd';
       order += dateFormat[i];
-    }
+    } else if (dateFormat[i] != '%' && separator.isEmpty())
+      separator = dateFormat[i];
     if(order.length() == 3)
       break;
   }
 
   // see if we find a known format. If it's unknown, then we use YMD (international)
   if(order == "mdy") {
-    d->m_dateEdit->setDisplayFormat("MM.dd.yyyy");
+    d->m_dateEdit->setDisplayFormat(QString("MM") + separator + QString("dd") + \
separator + QString("yyyy"));  } else if(order == "dmy") {
-    d->m_dateEdit->setDisplayFormat("dd.MM.yyyy");
+    d->m_dateEdit->setDisplayFormat(QString("dd") + separator + QString("MM") + \
separator + QString("yyyy"));  } else if(order == "ydm") {
-    d->m_dateEdit->setDisplayFormat("yyyy.dd.MM");
+    d->m_dateEdit->setDisplayFormat(QString("yyyy") + separator + QString("dd") + \
separator + QString("MM"));  } else {
-    d->m_dateEdit->setDisplayFormat("yyyy.MM.dd");
+    d->m_dateEdit->setDisplayFormat(QString("yyyy") + separator + QString("MM") + \
separator + QString("dd"));  }
 
   d->m_datePicker = new KDatePicker(d->m_date, d->m_dateFrame);


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