diff --git a/gnucash/gnome/gnc-plugin-page-account-tree.c b/gnucash/gnome/gnc-plugin-page-account-tree.c index 176e9bc0bb..5913b7513e 100644 --- a/gnucash/gnome/gnc-plugin-page-account-tree.c +++ b/gnucash/gnome/gnc-plugin-page-account-tree.c @@ -1345,9 +1345,9 @@ gnc_plugin_page_account_tree_cmd_delete_account (GtkAction *action, GncPluginPag list = qof_instance_get_referring_object_list(QOF_INSTANCE(account)); if (list != NULL) { -#define EXPLANATION "The list below shows objects which make use of the account which you want to delete.\nBefore you can delete it, you must either delete those objects or else modify them so they make use\nof another account" +#define EXPLANATION _("The list below shows objects which make use of the account which you want to delete.\nBefore you can delete it, you must either delete those objects or else modify them so they make use\nof another account") - gnc_ui_object_references_show( _(EXPLANATION), list); + gnc_ui_object_references_show(EXPLANATION, list); g_list_free(list); return; } diff --git a/libgnucash/app-utils/date-utilities.scm b/libgnucash/app-utils/date-utilities.scm index 1729d0869a..1e6b2f6a8d 100644 --- a/libgnucash/app-utils/date-utilities.scm +++ b/libgnucash/app-utils/date-utilities.scm @@ -634,10 +634,10 @@ (set-tm:mon now 11) (set-tm:year now (- (tm:year now) 1))) (set-tm:mon now (- (tm:mon now) 1))) - (let ((month-length (gnc:days-in-month (+ (tm:mon now) 1) - (+ (tm:year now) 1900)))) - (if (> month-length (tm:mday now)) - (set-tm:mday now month-length)) + (let ((month-days (gnc:days-in-month (+ (tm:mon now) 1) + (+ (tm:year now) 1900)))) + (if (< month-days (tm:mday now)) + (set-tm:mday now month-days)) (set-tm:isdst now -1) (gnc-mktime now)))) @@ -650,7 +650,7 @@ (set:tm-mon now (- (tm:mon now) 3)) (let ((month-days (gnc:days-in-month (+ (tm:mon now) 1) (+ (tm:year now) 1900)))) - (if (> month-days (tm:mday now)) + (if (< month-days (tm:mday now)) (set-tm:mday now month-days)) (set-tm:isdst now -1) (gnc-mktime now)))) @@ -664,7 +664,7 @@ (set:tm-mon now (- (tm:mon now) 6)) (let ((month-days (gnc:days-in-month (+ (tm:mon now) 1) (+ (tm:year now) 1900)))) - (if (> month-days (tm:mday now)) + (if (< month-days (tm:mday now)) (set-tm:mday now month-days)) (set-tm:isdst now -1) (gnc-mktime now)))) @@ -673,8 +673,8 @@ (let ((now (gnc-localtime (current-time)))) (set:tm-year now (- (tm:year now) 1)) (let ((month-days (gnc:days-in-month (+ (tm:mon now) 1) - (+ (tm:year now) 1900)))) - (if (> month-days (tm:mday now)) + (+ (tm:year now) 1900)))) + (if (< month-days (tm:mday now)) (set-tm:mday now month-days)) (set-tm:isdst now -1) (gnc-mktime now)))) @@ -686,10 +686,10 @@ (set-tm:mon now 0) (set-tm:year now (+ (tm:year now) 1))) (set-tm:mon now (+ (tm:mon now) 1))) - (let ((month-length (gnc:days-in-month (+ (tm:mon now) 1) - (+ (tm:year now) 1900)))) - (if (> month-length (tm:mday now)) - (set-tm:mday now month-length)) + (let ((month-days (gnc:days-in-month (+ (tm:mon now) 1) + (+ (tm:year now) 1900)))) + (if (< month-days (tm:mday now)) + (set-tm:mday now month-days)) (set-tm:isdst now -1) (gnc-mktime now)))) @@ -699,10 +699,10 @@ (begin (set:tm-mon now (- (tm:mon now) 9)) (set:tm-year now (+ (tm:year now) 1)) - (set:tm-mon now (+ (tm:mon now) 3)))) + (set:tm-mon now (+ (tm:mon now) 3)))) (let ((month-days (gnc:days-in-month (+ (tm:mon now) 1) (+ (tm:year now) 1900)))) - (if (> month-days (tm:mday now)) + (if (< month-days (tm:mday now)) (set-tm:mday now month-days)) (set-tm:isdst now -1) (gnc-mktime now)))) @@ -713,10 +713,10 @@ (begin (set:tm-mon now (- (tm:mon now) 6)) (set:tm-year now (+ (tm:year now) 1)) - (set:tm-mon now (+ (tm:mon now) 6)))) + (set:tm-mon now (+ (tm:mon now) 6)))) (let ((month-days (gnc:days-in-month (+ (tm:mon now) 1) (+ (tm:year now) 1900)))) - (if (> month-days (tm:mday now)) + (if (< month-days (tm:mday now)) (set-tm:mday now month-days)) (set-tm:isdst now -1) (gnc-mktime now)))) @@ -725,8 +725,8 @@ (let ((now (gnc-localtime (current-time)))) (set:tm-year now (+ (tm:year now) 1)) (let ((month-days (gnc:days-in-month (+ (tm:mon now) 1) - (+ (tm:year now) 1900)))) - (if (> month-days (tm:mday now)) + (+ (tm:year now) 1900)))) + (if (< month-days (tm:mday now)) (set-tm:mday now month-days)) (set-tm:isdst now -1) (gnc-mktime now))))