r16994 by fschmid - Fixed Bug 10387: "Missing German date format for PDF fields"

[scribus-commit]

Author: fschmid
Date: Sun Nov 20 10:49:54 2011
New Revision: 16994

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=16994
Log:
Fixed Bug 10387: "Missing German date format for PDF fields"

Modified:
    branches/Version135/Scribus/scribus/annot.cpp

Modified: branches/Version135/Scribus/scribus/annot.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16994&path=/branches/Version135/Scribus/scribus/annot.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/annot.cpp (original)
+++ branches/Version135/Scribus/scribus/annot.cpp Sun Nov 20 10:49:54 2011
@@ -876,7 +876,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 */
@@ -1472,6 +1472,8 @@
 		tmp = "M/d/yy hh:mm";
 	if (ds == "yyyy-mm-dd")
 		tmp = "yyyy-MM-dd";
+	if (ds == "dd.mm.yyyy")
+		tmp = "dd.MM.yyyy";
 	TextDa1->setText( tr("Example:")+" "+dt.toString(tmp));
 }