r16993 by fschmid - Fixed Bug 10387: "Missing German date format for PDF fields"
scribus-commit
scribus-commit at lists.scribus.net
Sun Nov 20 10:48:52 UTC 2011
Author: fschmid
Date: Sun Nov 20 10:48:52 2011
New Revision: 16993
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=16993
Log:
Fixed Bug 10387: "Missing German date format for PDF fields"
Modified:
trunk/Scribus/scribus/ui/annot.cpp
Modified: trunk/Scribus/scribus/ui/annot.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16993&path=/trunk/Scribus/scribus/ui/annot.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/annot.cpp (original)
+++ trunk/Scribus/scribus/ui/annot.cpp Sun Nov 20 10:48:52 2011
@@ -877,7 +877,7 @@
LayoutFN1c->setSpacing( 5 );
LayoutFN1c->setMargin( 0 );
Format0c = new QComboBox(DateGroup);
- QString tmp_form[] = {"m/d", "m/d/yy", "mm/dd/yy", "mm/yy", "d-mmm", "d-mmm-yy", "dd-mmm-yy", "dd/mm/yy", "dd/mm/yyyy", "yy-mm-dd",
+ QString tmp_form[] = {"m/d", "m/d/yy", "mm/dd/yy", "mm/yy", "d-mmm", "d-mmm-yy", "dd-mmm-yy", "dd/mm/yy", "dd/mm/yyyy", "dd.mm.yyyy", "yy-mm-dd",
"mmm-yy", "mmmm-yy", "mmm d, yyyy", "mmmm d, yyyy", "m/d/yy h:MM tt", "m/d/yy HH:MM", "yyyy-mm-dd"};
size_t array_form = sizeof(tmp_form) / sizeof(*tmp_form);
/* PFJ - 28/02/04 - Altered from uint to int and var name */
@@ -1469,6 +1469,8 @@
tmp = "dd-MMM-yy";
if (ds == "dd/mm/yy")
tmp = "dd/MM/yy";
+ if (ds == "dd.mm.yyyy")
+ tmp = "dd.MM.yyyy";
if (ds == "dd/mm/yyyy")
tmp = "dd/MM/yyyy";
if (ds == "yy-mm-dd")
More information about the scribus-commit
mailing list