Guile module structure cleanup

- fix circular dependency between business-reports.scm and owner-report.scm
- split out gettext routines to properly handle N_ for all files that use it
- remove some unused module inclusions
- tax module depends on app-utils -> fix build order

src/Makefile.am

@@ -10,8 +10,7 @@ NONGUI_SUBDIRS = \
   engine \
   backend \
   scm \
-  quotes \
-  tax
+  quotes
 
 if WITH_PYTHON
    PYTHON_DIR = python
@@ -22,6 +21,7 @@ endif
 # app-utils. It should go away in the long run, though.
 ALMOST_NONGUI_SUBDIRS = \
   app-utils \
+  tax \
   ${PYTHON_DIR}
 
 # These directories contain the code with gtk dependency

src/app-utils/Makefile.am

@@ -137,7 +137,9 @@ libgncmod_app_utils_python_la_LIBADD = \
 endif
 
 gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
-gncscmmod_DATA = app-utils.scm 
+gncscmmod_DATA = \
+  gettext.scm \
+  app-utils.scm
 
 gncscmdir = ${GNC_SCM_INSTALL_DIR}
 gncscm_DATA = \

src/app-utils/app-utils.scm

@@ -20,7 +20,7 @@
 (use-modules (srfi srfi-1))
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash gnc-module))
-(use-modules (ice-9 syncase))
+(use-modules (gnucash gettext))
 
 ;; Guile 2 needs to find the symbols from the c module at compile time already
 (cond-expand
@@ -31,6 +31,11 @@
   (else
     (gnc:module-load "gnucash/engine" 0)))
 
+;; gettext.scm
+(re-export gnc:gettext)
+(re-export _)
+(re-export N_)
+
 ;; c-interface.scm
 (export gnc:error->string)
 (export gnc:make-string-database)
@@ -279,27 +284,6 @@
 (define gnc:*kvp-option-path* (list KVP-OPTION-PATH))
 (export gnc:*kvp-option-path*)
 
-;; gettext functions
-(define gnc:gettext gnc-gettext-helper)
-(define _ gnc:gettext)
-(define-syntax N_
-  (syntax-rules ()
-    ((_ x) x)))
-
-(export gnc:gettext)
-(export _)
-
-(if (< (string->number (major-version)) 2)
-    (export-syntax N_))
-
-;; A lot of Gnucash's code uses procedural interfaces to load modules.
-;; This normally works, for procedures -- but for values that need to be
-;; known at expand time, like macros, it doesn't work (in Guile 2.0 at
-;; least). So instead of auditing all the code, since N_ is really the
-;; only Gnucash-defined macro in use, the surgical solution is just to
-;; make N_ available everywhere.
-(module-define! the-root-module 'N_ (module-ref (current-module) 'N_))
-
 (load-from-path "c-interface")
 (load-from-path "config-var")
 (load-from-path "options")

src/app-utils/business-prefs.scm

@@ -19,6 +19,8 @@
 ;; 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 
+(use-modules (gnucash gettext))
+
 (define gnc:*option-section-counters* (N_ "Counters"))
 
 ;; This defines all available counter types to show options for. This a

src/app-utils/date-utilities.scm

@@ -21,7 +21,8 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 
 (use-modules (gnucash core-utils)
-             (gnucash printf))
+             (gnucash printf)
+             (gnucash gettext))
 
 (define gnc:reldate-list '())
 

src/app-utils/gettext.scm

@@ -0,0 +1,46 @@
+;; This program is free software; you can redistribute it and/or    
+;; modify it under the terms of the GNU General Public License as   
+;; published by the Free Software Foundation; either version 2 of   
+;; the License, or (at your option) any later version.              
+;;                                                                  
+;; This program is distributed in the hope that it will be useful,  
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of   
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    
+;; GNU General Public License for more details.                     
+;;                                                                  
+;; You should have received a copy of the GNU General Public License
+;; along with this program; if not, contact:
+;;
+;; Free Software Foundation           Voice:  +1-617-542-5942
+;; 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652
+;; Boston, MA  02110-1301,  USA       gnu@gnu.org
+
+(define-module (gnucash gettext))
+
+;; Load a few different modules depending on the version of guile
+(cond-expand
+  (guile-2
+    ;; Our app-utils gnc module must be evaluated at compile time
+    ;; Without it sw_app_utils can't be evaluated below
+    (eval-when
+      (compile load eval expand)
+      (load-extension "libgncmod-app-utils.so" "scm_init_sw_app_utils_module")))
+  (else
+    ;; Syncase is deprecated and redundant in guile 2
+    (use-modules (ice-9 syncase))))
+(use-modules (sw_app_utils))
+
+;; gettext functions
+(define gnc:gettext gnc-gettext-helper)
+(define _ gnc:gettext)
+(define-syntax N_
+  (syntax-rules ()
+    ((_ x) x)))
+
+
+(if (< (string->number (major-version)) 2)
+    (export-syntax N_))
+
+(export gnc:gettext)
+(export _)
+(export N_)

src/app-utils/prefs.scm

@@ -52,7 +52,7 @@
 ;;        #f)))
 ;;    eq?
 ;;    #f))
-
+(use-modules (gnucash gettext))
 
 ;; Old-school config files depend on this API
  (define (gnc:config-file-format-version version) #t)

src/app-utils/test/test-load-module

@@ -37,7 +37,7 @@ exec ${GUILE} -s "$0"
       (display "Failed - procedure gnc-default-currency not found\n")
       (set! exit-code -1)))
 
-(if (macro? (module-ref the-root-module 'N_))
+(if (macro? (module-ref (current-module) 'N_))
     (display "Macro N_ defined\n")
     (begin
       (display "Failed - macro N_ not defined\n")

src/report/business-reports/aging.scm

@@ -29,6 +29,7 @@
 (use-modules (gnucash main))
 (use-modules (gnucash printf))
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/report/report-system" 0)
 

src/report/business-reports/balsheet-eg.scm

@@ -34,7 +34,7 @@
 (define-module (gnucash report balsheet-eg))
 (use-modules (gnucash main))
 (use-modules (gnucash gnc-module))
-(use-modules (gnucash app-utils))
+(use-modules (gnucash gettext))
 (use-modules (gnucash report eguile-gnc))
 (use-modules (gnucash report eguile-utilities))
 

src/report/business-reports/business-reports.scm

@@ -25,23 +25,13 @@
 
 (define-module (gnucash report business-reports))
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash app-utils))
+(use-modules (gnucash report report-system))
 (gnc:module-load "gnucash/report/standard-reports" 0)
-(gnc:module-load "gnucash/app-utils" 0)
 
 ;; to define gnc-build-url
 (gnc:module-load "gnucash/html" 0)
 
-;; Guile 2 needs to find this macro at compile time already
-(cond-expand
-  (guile-2
-    (eval-when
-      (compile load eval expand)
-      (define gnc:menuname-business-reports (N_ "_Business"))))
-  (else
-    (define gnc:menuname-business-reports (N_ "_Business"))))
-
-(define gnc:optname-invoice-number (N_ "Invoice Number"))
-
 (define (guid-ref idstr type guid)
   (gnc-build-url type (string-append idstr guid) ""))
 
@@ -120,8 +110,6 @@
         0
         ))
 
-(export gnc:menuname-business-reports gnc:optname-invoice-number)
-
 (use-modules (gnucash report fancy-invoice))
 (use-modules (gnucash report invoice))
 (use-modules (gnucash report easy-invoice))
@@ -139,8 +127,14 @@
 (define (gnc:receivables-report-create account title show-zeros?)
   (receivables-report-create-internal account title show-zeros?))
 
+(define (gnc:owner-report-create owner account)
+  ; Figure out an account to use if nothing exists here.
+  (if (null? account)
+      (set! account (find-first-account-for-owner owner)))
+  (owner-report-create owner account))
+
 (export gnc:invoice-report-create
 	gnc:customer-anchor-text gnc:job-anchor-text gnc:vendor-anchor-text
 	gnc:invoice-anchor-text gnc:owner-anchor-text gnc:owner-report-text
-	gnc:payables-report-create gnc:receivables-report-create)
-(re-export gnc:owner-report-create)
+	gnc:payables-report-create gnc:receivables-report-create
+	gnc:owner-report-create)

src/report/business-reports/customer-summary.scm

@@ -32,10 +32,9 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash printf))
 (use-modules (gnucash main))                ; for gnc:debug
+(use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/report/report-system" 0)
-(gnc:module-load "gnucash/app-utils" 0)
-
 (use-modules (gnucash report standard-reports))
 (use-modules (gnucash report business-reports))
 

src/report/business-reports/easy-invoice.scm

@@ -33,10 +33,9 @@
 (use-modules (srfi srfi-1))
 (use-modules (gnucash printf))
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/report/report-system" 0)
-(gnc:module-load "gnucash/app-utils" 0)
-
 (use-modules (gnucash report standard-reports))
 (use-modules (gnucash report business-reports))
 

src/report/business-reports/fancy-invoice.scm

@@ -51,10 +51,9 @@
 (use-modules (srfi srfi-1))
 (use-modules (gnucash printf))
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/report/report-system" 0)
-(gnc:module-load "gnucash/app-utils" 0)
-
 (use-modules (gnucash report standard-reports))
 (use-modules (gnucash report business-reports))
 

src/report/business-reports/invoice.scm

@@ -27,10 +27,9 @@
 (use-modules (srfi srfi-1))
 (use-modules (gnucash printf))
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/report/report-system" 0)
-(gnc:module-load "gnucash/app-utils" 0)
-
 (use-modules (gnucash report standard-reports))
 (use-modules (gnucash report business-reports))
 

src/report/business-reports/job-report.scm

@@ -30,10 +30,9 @@
 (use-modules (gnucash printf))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash main))		; for gnc:debug
+(use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/report/report-system" 0)
-(gnc:module-load "gnucash/app-utils" 0)
-
 (use-modules (gnucash report standard-reports))
 (use-modules (gnucash report business-reports))
 

src/report/business-reports/owner-report.scm

@@ -29,10 +29,9 @@
 (use-modules (srfi srfi-1))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash main))        ; for gnc:debug
+(use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/report/report-system" 0)
-(gnc:module-load "gnucash/app-utils" 0)
-
 (use-modules (gnucash report standard-reports))
 (use-modules (gnucash report business-reports))
 
@@ -866,13 +865,6 @@
 
       (else #f))))
 
-(define (gnc:owner-report-create owner account)
-  ; Figure out an account to use if nothing exists here.
-  (if (null? account)
-      (set! account (find-first-account-for-owner owner)))
-
-  (owner-report-create owner account))
-
 (define (gnc:owner-report-create-internal
      account split query journal? double? title
      debit-string credit-string)
@@ -893,4 +885,4 @@
 (gnc:register-report-hook ACCT-TYPE-PAYABLE #t
               gnc:owner-report-create-internal)
 
-(export gnc:owner-report-create)
+(export find-first-account-for-owner owner-report-create)

src/report/business-reports/payables.scm

@@ -27,9 +27,9 @@
 
 (use-modules (gnucash main))
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/report/report-system" 0)
-(gnc:module-load "gnucash/app-utils" 0)
 
 (use-modules (gnucash report aging))
 (use-modules (gnucash report standard-reports))

src/report/business-reports/receivables.scm

@@ -27,9 +27,9 @@
 
 (use-modules (gnucash main))
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/report/report-system" 0)
-(gnc:module-load "gnucash/app-utils" 0)
 
 (use-modules (gnucash report aging))
 (use-modules (gnucash report standard-reports))

src/report/business-reports/taxinvoice.scm

@@ -30,9 +30,8 @@
   (else ))
 (use-modules (gnucash main))
 (use-modules (gnucash gnc-module))
-(use-modules (gnucash app-utils))
+(use-modules (gnucash gettext))
 (gnc:module-load "gnucash/report/report-system" 0)
-(gnc:module-load "gnucash/app-utils" 0)
 (gnc:module-load "gnucash/html" 0)
 (gnc:module-load "gnucash/engine" 0)
 

src/report/locale-specific/us/taxtxf-de_DE.scm

@@ -52,6 +52,7 @@
 (use-modules (srfi srfi-1))
 (use-modules (gnucash printf))
 (use-modules (gnucash core-utils)) ; for gnc:version
+(use-modules (gnucash gettext))
 
 (use-modules (gnucash gnc-module))
 (gnc:module-load "gnucash/tax/de_DE" 0)

src/report/locale-specific/us/taxtxf.scm

@@ -76,6 +76,7 @@
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (srfi srfi-1))
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 (use-modules (sw_gnome_utils)) ;; to get to gnc-error-dialog
 
 (use-modules (gnucash printf))

src/report/report-gnome/report-gnome.scm

@@ -9,6 +9,7 @@
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gnome-utils))
+(use-modules (gnucash gettext))
 
 (use-modules (gnucash printf))
 

src/report/report-system/eguile-html-utilities.scm

@@ -31,8 +31,6 @@
 (use-modules (gnucash app-utils))
 (gnc:module-load "gnucash/report/report-system" 0)
 (gnc:module-load "gnucash/app-utils" 0)
-(use-modules (gnucash report standard-reports))
-(use-modules (gnucash report business-reports))
 
 (use-modules (ice-9 regex))  ; for regular expressions
 (use-modules (srfi srfi-13)) ; for extra string functions

src/report/report-system/eguile-utilities.scm

@@ -32,8 +32,6 @@
 (use-modules (gnucash core-utils))
 (gnc:module-load "gnucash/report/report-system" 0)
 (gnc:module-load "gnucash/app-utils" 0)
-(use-modules (gnucash report standard-reports))
-(use-modules (gnucash report business-reports))
 ; Syncase is deprecated and redundant in guile 2
 (cond-expand
   (guile-2 )

src/report/report-system/html-fonts.scm

@@ -6,6 +6,8 @@
 ;;  Copyright (c) Phil Longstaff <plongstaff@rogers.com>
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(use-modules (gnucash gettext))
+
 ;; Converts a font name to css style information
 (define (font-name-to-style-info font-name)
     (let*

src/report/report-system/html-style-sheet.scm

@@ -21,6 +21,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(use-modules (gnucash gettext))
 
 (define *gnc:_style-sheet-templates_* (make-hash-table 23))
 (define *gnc:_style-sheets_* (make-hash-table 23))

src/report/report-system/options-utilities.scm

@@ -21,6 +21,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(use-modules (gnucash gettext))
 
 ;; These are just a bunch of options which were useful in several
 ;; reports and hence they got defined in a seperate function.

src/report/report-system/report-system.scm

@@ -109,10 +109,12 @@
 (export gnc:menuname-taxes)
 (export gnc:menuname-utility)
 (export gnc:menuname-custom)
+(export gnc:menuname-business-reports)
 (export gnc:pagename-general)
 (export gnc:pagename-accounts)
 (export gnc:pagename-display)
 (export gnc:optname-reportname)
+(export gnc:optname-invoice-number)
 
 (export gnc:define-report)
 (export <report>)

src/report/report-system/report.scm

@@ -22,6 +22,7 @@
 
 (use-modules (gnucash main))
 (use-modules (gnucash printf))
+(use-modules (gnucash gettext))
 (use-modules (sw_report_system))
 
 ;; Terminology in this file:
@@ -66,6 +67,8 @@
 (define gnc:pagename-display (N_ "Display"))
 (define gnc:optname-reportname (N_ "Report name"))
 (define gnc:optname-stylesheet (N_ "Stylesheet"))
+(define gnc:menuname-business-reports (N_ "_Business"))
+(define gnc:optname-invoice-number (N_ "Invoice Number"))
 
 ;; We want to warn users if they've got an old-style, non-guid custom
 ;; report-template, but only once

src/report/standard-reports/account-piecharts.scm

@@ -29,6 +29,7 @@
 (use-modules (srfi srfi-1))
 (use-modules (ice-9 regex))
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 (use-modules (gnucash printf))
 

src/report/standard-reports/account-summary.scm

@@ -53,6 +53,7 @@
 (use-modules (srfi srfi-1))
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/report/report-system" 0)
 

src/report/standard-reports/advanced-portfolio.scm

@@ -30,6 +30,7 @@
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (srfi srfi-1))
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 (use-modules (gnucash printf))
 

src/report/standard-reports/average-balance.scm

@@ -11,6 +11,7 @@
 (use-modules (srfi srfi-1))
 (use-modules (gnucash main))
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 (gnc:module-load "gnucash/report/report-system" 0)
 
 (define reportname (N_ "Average Balance"))

src/report/standard-reports/balance-sheet.scm

@@ -65,7 +65,7 @@
 (define-module (gnucash report standard-reports balance-sheet))
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash gnc-module))
-(use-modules (gnucash app-utils))
+(use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/report/report-system" 0)
 

src/report/standard-reports/budget-balance-sheet.scm

@@ -31,7 +31,7 @@
 (define-module (gnucash report standard-reports budget-balance-sheet))
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash gnc-module))
-(use-modules (gnucash app-utils))
+(use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/report/report-system" 0)
 

src/report/standard-reports/budget-barchart.scm

@@ -29,6 +29,7 @@
 (use-modules (srfi srfi-1))
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 (use-modules (gnucash printf))
 

src/report/standard-reports/budget-flow.scm

@@ -28,6 +28,7 @@
 (define-module (gnucash report standard-reports budget-flow))
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 (use-modules (gnucash printf))
 

src/report/standard-reports/budget-income-statement.scm

@@ -44,7 +44,7 @@
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash printf))
 (use-modules (gnucash gnc-module))
-(use-modules (gnucash app-utils))
+(use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/report/report-system" 0)
 

src/report/standard-reports/budget.scm

@@ -28,6 +28,7 @@
 (define-module (gnucash report standard-reports budget))
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 (use-modules (gnucash printf))
 

src/report/standard-reports/cash-flow.scm

@@ -30,6 +30,7 @@
 (define-module (gnucash report standard-reports cash-flow))
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 (use-modules (gnucash printf))
 

src/report/standard-reports/category-barchart.scm

@@ -30,6 +30,7 @@
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (ice-9 regex))
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 (use-modules (gnucash printf))
 

src/report/standard-reports/daily-reports.scm

@@ -32,6 +32,7 @@
 (use-modules (srfi srfi-1))
 (use-modules (ice-9 regex))
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 (use-modules (gnucash printf))
 

src/report/standard-reports/equity-statement.scm

@@ -48,7 +48,7 @@
 (define-module (gnucash report standard-reports equity-statement))
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash gnc-module))
-(use-modules (gnucash app-utils))
+(use-modules (gnucash gettext))
 
 (use-modules (gnucash printf))
 

src/report/standard-reports/general-journal.scm

@@ -30,6 +30,7 @@
 (export gnc:make-general-journal-report)
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/report/report-system" 0)
 

src/report/standard-reports/general-ledger.scm

@@ -33,6 +33,7 @@
 (export gnc:make-general-ledger-report)
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/report/report-system" 0)
 

src/report/standard-reports/income-statement.scm

@@ -45,7 +45,7 @@
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash printf))
 (use-modules (gnucash gnc-module))
-(use-modules (gnucash app-utils))
+(use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/report/report-system" 0)
 

src/report/standard-reports/net-barchart.scm

@@ -29,6 +29,7 @@
 (use-modules (srfi srfi-1))
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 (use-modules (gnucash printf))
 (use-modules (gnucash report report-system report-collectors))

src/report/standard-reports/net-linechart.scm

@@ -30,6 +30,7 @@
 (use-modules (srfi srfi-1))
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 (use-modules (gnucash printf))
 (use-modules (gnucash report report-system report-collectors))

src/report/standard-reports/portfolio.scm

@@ -26,6 +26,7 @@
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (srfi srfi-1))
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 (use-modules (gnucash printf))
 

src/report/standard-reports/price-scatter.scm

@@ -28,6 +28,7 @@
 (use-modules (srfi srfi-1))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash core-utils))
+(use-modules (gnucash gettext))
 
 (use-modules (gnucash printf))
 

src/report/standard-reports/register.scm

@@ -6,6 +6,7 @@
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (srfi srfi-1))
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/report/report-system" 0)
 

src/report/standard-reports/sx-summary.scm

@@ -37,6 +37,7 @@
 (use-modules (gnucash main))
 (use-modules (gnucash printf))
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/report/report-system" 0)
 

src/report/standard-reports/transaction.scm

@@ -34,6 +34,7 @@
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (srfi srfi-1))
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 (use-modules (gnucash printf))
 

src/report/standard-reports/trial-balance.scm

@@ -54,7 +54,7 @@
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash printf))
 (use-modules (gnucash gnc-module))
-(use-modules (gnucash app-utils))
+(use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/report/report-system" 0)
 

src/report/stylesheets/stylesheet-easy.scm

@@ -31,6 +31,7 @@
 
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/html" 0)   ; added for 'gnc-html-engine-supports-css'
 (gnc:module-load "gnucash/report/report-system" 0)

src/report/stylesheets/stylesheet-fancy.scm

@@ -25,6 +25,7 @@
 
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/html" 0)   ; added for 'gnc-html-engine-supports-css'
 (gnc:module-load "gnucash/report/report-system" 0)

src/report/stylesheets/stylesheet-footer.scm

@@ -36,6 +36,7 @@
 
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/html" 0)   ; added for 'gnc-html-engine-supports-css'
 (gnc:module-load "gnucash/report/report-system" 0)

src/report/stylesheets/stylesheet-plain.scm

@@ -27,7 +27,7 @@
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash core-utils))
-(use-modules (gnucash report report-system))
+(use-modules (gnucash gettext))
 (use-modules (srfi srfi-13))
 (use-modules (srfi srfi-14))
 

src/report/utility-reports/hello-world.scm

@@ -7,6 +7,7 @@
 (define-module (gnucash report hello-world))
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 ;; 'debug is deprecated and unused since guile 2
 (cond-expand

src/report/utility-reports/view-column.scm

@@ -29,6 +29,7 @@
 (define-module (gnucash report view-column))
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 (use-modules (sw_report_system))
 
 (use-modules (gnucash printf))

src/report/utility-reports/welcome-to-gnucash.scm

@@ -25,6 +25,7 @@
 
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash core-utils)) ; for gnc:version
+(use-modules (gnucash gettext))
 (use-modules (gnucash gnc-module))
 (use-modules (sw_report_system))
 

src/tax/us/de_DE.scm

@@ -1,7 +1,7 @@
 (define-module (gnucash tax de_DE))
 
 (use-modules (gnucash gnc-module))
-(gnc:module-load "gnucash/app-utils" 0)
+(use-modules (gnucash gettext))
 
 (export gnc:txf-get-payer-name-source)
 (export gnc:txf-get-form)

src/tax/us/txf-de_DE.scm

@@ -26,6 +26,8 @@
 ;; http://www.felfri.de/winston/schnittstellen.htm
 ;;
 
+(use-modules (gnucash gettext))
+
 (define txf-tax-entity-types
   (list
    (cons 'Ind #("Individual, Joint, etc." "Umsatzsteuer-Kennzahlen"))