gnucash maint: Fix format warnings by importing (ice-9 format)

Christopher Lam clam at code.gnucash.org
Sun Dec 13 17:04:44 EST 2020


Updated	 via  https://github.com/Gnucash/gnucash/commit/a0a4fc89 (commit)
	from  https://github.com/Gnucash/gnucash/commit/2c8ae267 (commit)



commit a0a4fc89aa29c3e07f8a392ce95362b599e490a6
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Mon Dec 14 06:02:41 2020 +0800

    Fix format warnings by importing (ice-9 format)
    
    and modify untranslated string

diff --git a/gnucash/report/reports/locale-specific/us/taxtxf.scm b/gnucash/report/reports/locale-specific/us/taxtxf.scm
index c6cd6527a..58c37937e 100644
--- a/gnucash/report/reports/locale-specific/us/taxtxf.scm
+++ b/gnucash/report/reports/locale-specific/us/taxtxf.scm
@@ -107,6 +107,7 @@
 (use-modules (gnucash gnome-utils))
 (use-modules (gnucash report))
 (use-modules (srfi srfi-1))
+(use-modules (ice-9 format))
 (use-modules (gnucash html))
 
 (define reportname (N_ "Tax Schedule Report/TXF Export"))
diff --git a/gnucash/report/reports/standard/account-piecharts.scm b/gnucash/report/reports/standard/account-piecharts.scm
index 42f4a4669..3a10a2a12 100644
--- a/gnucash/report/reports/standard/account-piecharts.scm
+++ b/gnucash/report/reports/standard/account-piecharts.scm
@@ -31,6 +31,7 @@
 (use-modules (gnucash app-utils))
 (use-modules (gnucash report))
 (use-modules (srfi srfi-1))
+(use-modules (ice-9 format))
 
 (define menuname-income (N_ "Income Piechart"))
 (define menuname-expense (N_ "Expense Piechart"))
diff --git a/gnucash/report/reports/standard/advanced-portfolio.scm b/gnucash/report/reports/standard/advanced-portfolio.scm
index 1147e3ae9..8f4e69396 100644
--- a/gnucash/report/reports/standard/advanced-portfolio.scm
+++ b/gnucash/report/reports/standard/advanced-portfolio.scm
@@ -33,6 +33,7 @@
 (use-modules (gnucash app-utils))
 (use-modules (gnucash report))
 (use-modules (srfi srfi-1))
+(use-modules (ice-9 format))
 
 (define reportname (N_ "Advanced Portfolio"))
 
diff --git a/gnucash/report/reports/standard/price-scatter.scm b/gnucash/report/reports/standard/price-scatter.scm
index 787bd1333..39d9c72de 100644
--- a/gnucash/report/reports/standard/price-scatter.scm
+++ b/gnucash/report/reports/standard/price-scatter.scm
@@ -30,6 +30,7 @@
 (use-modules (gnucash app-utils))
 (use-modules (gnucash report))
 (use-modules (srfi srfi-1))
+(use-modules (ice-9 format))
 (use-modules (ice-9 match))
 
 (define optname-from-date (N_ "Start Date"))
diff --git a/gnucash/report/reports/standard/test/test-cash-flow.scm b/gnucash/report/reports/standard/test/test-cash-flow.scm
index 80a49e78c..bae6e5528 100644
--- a/gnucash/report/reports/standard/test/test-cash-flow.scm
+++ b/gnucash/report/reports/standard/test/test-cash-flow.scm
@@ -4,6 +4,7 @@
 (use-modules (gnucash reports standard cash-flow))
 (use-modules (gnucash reports cash-flow-calc))
 (use-modules (gnucash report))
+(use-modules (ice-9 format))
 
 (define (run-test)
   (and (test test-one-tx-in-cash-flow)
@@ -54,17 +55,17 @@
 	     (or (equal? 10000/100
 		     (gnc:gnc-monetary-amount (gnc:sum-collector-commodity expense-acc-in-collector
 									   report-currency exchange-fn)))
-                 (begin (format #t "Failed expense-acc-in-collector ~g expected 100.00~%" (gnc:gnc-monetary-amount (gnc:sum-collector-commodity expense-acc-in-collector
+                 (begin (format #t "Failed expense-acc-in-collector ~a expected 100.00~%" (gnc:gnc-monetary-amount (gnc:sum-collector-commodity expense-acc-in-collector
 									   report-currency exchange-fn))) #f))
 	     (or (equal? 10000/100
 		     (gnc:gnc-monetary-amount (gnc:sum-collector-commodity money-in-collector
 									   report-currency exchange-fn)))
-                 (begin (format #t "Failed money-in-collector ~g expected 100.00~%" (gnc:gnc-monetary-amount (gnc:sum-collector-commodity money-in-collector
+                 (begin (format #t "Failed money-in-collector ~a expected 100.00~%" (gnc:gnc-monetary-amount (gnc:sum-collector-commodity money-in-collector
 									   report-currency exchange-fn))) #f))
 	     (or (equal? 0/1
 		     (gnc:gnc-monetary-amount (gnc:sum-collector-commodity money-out-collector
 									   report-currency exchange-fn)))
-                 (begin (format #t "Failed sum-collector-commodity ~g expected 100.00~%" (gnc:gnc-monetary-amount (gnc:sum-collector-commodity money-out-collector
+                 (begin (format #t "Failed sum-collector-commodity ~a expected 100.00~%" (gnc:gnc-monetary-amount (gnc:sum-collector-commodity money-out-collector
                                                                                                                                                report-currency exchange-fn))) #f))
              (begin (format #t "test-one-tx-in-cash-flow success~%") #t)
 	     )))))



Summary of changes:
 gnucash/report/reports/locale-specific/us/taxtxf.scm    | 1 +
 gnucash/report/reports/standard/account-piecharts.scm   | 1 +
 gnucash/report/reports/standard/advanced-portfolio.scm  | 1 +
 gnucash/report/reports/standard/price-scatter.scm       | 1 +
 gnucash/report/reports/standard/test/test-cash-flow.scm | 7 ++++---
 5 files changed, 8 insertions(+), 3 deletions(-)



More information about the gnucash-changes mailing list