AUDIT: r17249 - gnucash/trunk - Bug #532405: Make the default strftime format use %#d instead of %e on win32 platforms.
Charles Day
cedayiv at cvs.gnucash.org
Tue Jun 24 18:28:40 EDT 2008
Author: cedayiv
Date: 2008-06-24 18:28:40 -0400 (Tue, 24 Jun 2008)
New Revision: 17249
Trac: http://svn.gnucash.org/trac/changeset/17249
Modified:
gnucash/trunk/lib/libqof/qof/gnc-date.c
gnucash/trunk/lib/libqof/qof/gnc-date.h
gnucash/trunk/src/business/business-reports/easy-invoice.scm
gnucash/trunk/src/business/business-reports/fancy-invoice.scm
gnucash/trunk/src/business/business-reports/invoice.scm
gnucash/trunk/src/business/business-reports/owner-report.scm
gnucash/trunk/src/engine/engine.i
Log:
Bug #532405: Make the default strftime format use %#d instead of %e on win32 platforms.
BP
Modified: gnucash/trunk/lib/libqof/qof/gnc-date.c
===================================================================
--- gnucash/trunk/lib/libqof/qof/gnc-date.c 2008-06-24 22:08:12 UTC (rev 17248)
+++ gnucash/trunk/lib/libqof/qof/gnc-date.c 2008-06-24 22:28:40 UTC (rev 17249)
@@ -68,6 +68,15 @@
# define GNC_T_FMT "%r"
#endif
+/* The default date format for use with strftime. */
+const char *gnc_default_strftime_date_format =
+#ifdef G_OS_WIN32
+ N_("%B %#d, %Y")
+#else
+ N_("%B %e, %Y")
+#endif
+ ;
+
/* This is now user configured through the gnome options system() */
static QofDateFormat dateFormat = QOF_DATE_FORMAT_LOCALE;
static QofDateFormat prevQofDateFormat = QOF_DATE_FORMAT_LOCALE;
Modified: gnucash/trunk/lib/libqof/qof/gnc-date.h
===================================================================
--- gnucash/trunk/lib/libqof/qof/gnc-date.h 2008-06-24 22:08:12 UTC (rev 17248)
+++ gnucash/trunk/lib/libqof/qof/gnc-date.h 2008-06-24 22:28:40 UTC (rev 17249)
@@ -68,7 +68,11 @@
#define GNC_DATE_H
#include <time.h>
+#include <glib/gi18n.h>
+/** The default date format for use with strftime. */
+extern const char *gnc_default_strftime_date_format;
+
/** The maximum length of a string created by the date printers */
#define MAX_DATE_LENGTH 31
@@ -380,7 +384,7 @@
size_t qof_print_date_buff (char * buff, size_t buflen, time_t secs);
/** Convenience; calls through to qof_print_date_dmy_buff(). **/
-size_t qof_print_gdate( char *buf, size_t bufflen, const GDate *gd );
+size_t qof_print_gdate(char *buf, size_t bufflen, const GDate *gd);
/** Convenience; calls through to qof_print_date_dmy_buff().
* Return: string, which should be freed when no longer needed.
Modified: gnucash/trunk/src/business/business-reports/easy-invoice.scm
===================================================================
--- gnucash/trunk/src/business/business-reports/easy-invoice.scm 2008-06-24 22:08:12 UTC (rev 17248)
+++ gnucash/trunk/src/business/business-reports/easy-invoice.scm 2008-06-24 22:28:40 UTC (rev 17249)
@@ -361,7 +361,7 @@
(gnc:make-string-option
(N_ "Text") (N_ "Today Date Format")
"x" (N_ "The format for the date->string conversion for today's date.")
- "%B %e, %Y"))
+ (gnc-default-strftime-date-format)))
(gnc:options-set-default-section gnc:*report-options* "General")
Modified: gnucash/trunk/src/business/business-reports/fancy-invoice.scm
===================================================================
--- gnucash/trunk/src/business/business-reports/fancy-invoice.scm 2008-06-24 22:08:12 UTC (rev 17248)
+++ gnucash/trunk/src/business/business-reports/fancy-invoice.scm 2008-06-24 22:28:40 UTC (rev 17249)
@@ -375,7 +375,7 @@
; (gnc:make-string-option
; (N_ "Display") (N_ "Today Date Format")
; "v" (N_ "The format for the date->string conversion for today's date.")
-; "%B %e, %Y"))
+; (gnc-default-strftime-date-format)))
(gnc:options-set-default-section gnc:*report-options* "General")
@@ -647,7 +647,9 @@
;; oli-custom - modified to display a custom format
;; for the invoice date/due date fields
;; I could have taken the format from the report options, but... ;)
- (string-expand (strftime "%B %e, %Y" (localtime (car date))) #\space " ")
+ (string-expand (strftime (gnc-default-strftime-date-format)
+ (localtime (car date)))
+ #\space " ")
;;(string-expand (gnc-print-date date) #\space " ")
)))
Modified: gnucash/trunk/src/business/business-reports/invoice.scm
===================================================================
--- gnucash/trunk/src/business/business-reports/invoice.scm 2008-06-24 22:08:12 UTC (rev 17248)
+++ gnucash/trunk/src/business/business-reports/invoice.scm 2008-06-24 22:28:40 UTC (rev 17249)
@@ -328,7 +328,7 @@
(gnc:make-string-option
(N_ "Display") (N_ "Today Date Format")
"v" (N_ "The format for the date->string conversion for today's date.")
- "%B %e, %Y"))
+ (gnc-default-strftime-date-format)))
(gnc:options-set-default-section gnc:*report-options* "General")
Modified: gnucash/trunk/src/business/business-reports/owner-report.scm
===================================================================
--- gnucash/trunk/src/business/business-reports/owner-report.scm 2008-06-24 22:08:12 UTC (rev 17248)
+++ gnucash/trunk/src/business/business-reports/owner-report.scm 2008-06-24 22:28:40 UTC (rev 17249)
@@ -418,7 +418,7 @@
(gnc:make-string-option
gnc:pagename-general (N_ "Today Date Format")
"p" (N_ "The format for the date->string conversion for today's date.")
- "%B %e, %Y"))
+ (gnc-default-strftime-date-format)))
(gnc:options-set-default-section gnc:*report-options* "General")
Modified: gnucash/trunk/src/engine/engine.i
===================================================================
--- gnucash/trunk/src/engine/engine.i 2008-06-24 22:08:12 UTC (rev 17248)
+++ gnucash/trunk/src/engine/engine.i 2008-06-24 22:28:40 UTC (rev 17249)
@@ -106,6 +106,7 @@
// TODO: Unroll/remove
const char *qof_session_get_url (QofSession *session);
+extern const char *gnc_default_strftime_date_format;
const char *gnc_print_date (Timespec ts);
GUID guid_new_return(void);
@@ -131,6 +132,7 @@
%ignore qof_query_run;
%include <qofquery.h>
%include <qofquerycore.h>
+%include <gnc-date.h>
gnc_numeric gnc_numeric_create(gint64 num, gint64 denom);
gnc_numeric gnc_numeric_zero(void);
More information about the gnucash-changes
mailing list