gnucash maint: Multiple changes pushed

[Christopher Lam]

Updated	 via  https://github.com/Gnucash/gnucash/commit/e7258ee6 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/a55d05f2 (commit)
	from  https://github.com/Gnucash/gnucash/commit/edaa0d7e (commit)



commit e7258ee6f378c5b4a80e04727c4edd5f58f9e5b4
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Fri Sep 18 21:25:50 2020 +0800

    [new-owner-report] fix unlocalizable string
    
    reuse trepengine's string

diff --git a/gnucash/report/reports/standard/new-owner-report.scm b/gnucash/report/reports/standard/new-owner-report.scm
index be6763670..8e0cbcad3 100644
--- a/gnucash/report/reports/standard/new-owner-report.scm
+++ b/gnucash/report/reports/standard/new-owner-report.scm
@@ -1080,9 +1080,7 @@ invoices and amounts.")))))
            document
            (gnc:make-html-text
             (gnc:html-markup-h2 (G_ "No transactions found."))
-            (gnc:html-markup-p
-             (format #f (G_ "No transactions were found associated with the ~a.")
-                     (string-downcase (car (get-info type)))))
+            (gnc:html-markup-p (G_ "No matching transactions found"))
             (gnc:html-make-options-link (gnc:report-id report-obj)))))
 
          (else

commit a55d05f29d8e7220983c4e09aded019252c3ea5e
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sat Sep 19 19:36:25 2020 +0800

    [report-utilities] compact functions

diff --git a/gnucash/report/report-utilities.scm b/gnucash/report/report-utilities.scm
index 7b60a060a..1bb86baf3 100644
--- a/gnucash/report/report-utilities.scm
+++ b/gnucash/report/report-utilities.scm
@@ -873,23 +873,14 @@ query instead.")
 ;; Input: account-balances
 ;; Output: commodity-collector
 (define (gnc:get-assoc-account-balances-total account-balances)
-  (let ((total (gnc:make-commodity-collector)))
-    (for-each
-     (lambda (account-balance)
-       (total 'merge (cadr account-balance) #f))
-     account-balances)
-    total))
+  (apply gnc:collector+ (map cadr account-balances)))
 
 (define (gnc:multiline-to-html-text str)
   ;; simple function - splits string containing #\newline into
   ;; substrings, and convert to a gnc:make-html-text construct which
   ;; adds gnc:html-markup-br after each substring.
-  (let loop ((list-of-substrings (string-split str #\newline))
-             (result '()))
-    (if (null? list-of-substrings)
-        (apply gnc:make-html-text (if (null? result) '() (reverse (cdr result))))
-        (loop (cdr list-of-substrings)
-              (cons* (gnc:html-markup-br) (car list-of-substrings) result)))))
+  (define (interleave a b) (cons* a (gnc:html-markup-br) b))
+  (apply gnc:make-html-text (fold-right interleave '() (string-split str #\nl))))
 
 ;; ***************************************************************************
 ;; Business Functions



Summary of changes:
 gnucash/report/report-utilities.scm                  | 15 +++------------
 gnucash/report/reports/standard/new-owner-report.scm |  4 +---
 2 files changed, 4 insertions(+), 15 deletions(-)