diff --git a/gnucash/report/business-reports/fancy-invoice.scm b/gnucash/report/business-reports/fancy-invoice.scm index 2cc8f20973..64c36c278f 100644 --- a/gnucash/report/business-reports/fancy-invoice.scm +++ b/gnucash/report/business-reports/fancy-invoice.scm @@ -635,10 +635,10 @@ (gnc:html-table-append-row! table (list - (string-expand (gnc:owner-get-address-dep owner) #\newline "
"))) + (string-expand (gnc:owner-get-address-dep owner) #\newline "
"))) (gnc:html-table-append-row! table - (list "
")) + (list "
")) (for-each (lambda (order) (let* ((reference (gncOrderGetReference order))) @@ -722,7 +722,7 @@ 'attribute (list "align" "right") 'attribute (list "width" "33%")) (gnc:html-table-append-row! - table (list (string-expand (string-append (if addy addy "") (if id (string-append "\n" id) "")) #\newline "
") + table (list (string-expand (string-append (if addy addy "") (if id (string-append "\n" id) "")) #\newline "
") (string-expand (string-append (if phone (string-append (_ "Phone:") " " phone) @@ -730,7 +730,7 @@ (if fax (string-append (if phone "\n" "") (_ "Fax:") " " fax) "")) - #\newline "
" ) + #\newline "
" ) (if url (string-append (_ "Web:") " " url) ""))) ;; oli-custom - I didn't want today's date on the invoice. @@ -863,20 +863,20 @@ (due-date (gncInvoiceGetDateDue invoice))) (set! date-table (make-date-table)) (gnc:html-table-append-row! - ;; Translators: %s below is "Invoice" or "Bill" or even the + ;; Translators: ~a below is "Invoice" or "Bill" or even the ;; custom title from the options. The next column contains ;; the number of the document. - date-table (list (format #f (_ "~s #") title) (gncInvoiceGetID invoice))) - ;; Translators: The first %s below is "Invoice" or + date-table (list (format #f (_ "~a #") title) (gncInvoiceGetID invoice))) + ;; Translators: The first ~a below is "Invoice" or ;; "Bill" or even the custom title from the ;; options. This string sucks for i18n, but I don't ;; have a better solution right now without breaking ;; other people's invoices. - (make-date-row! date-table (format #f (_ "~s Date") title) post-date date-format) - (make-date-row! date-table (_ "Due Date") due-date date-format) + (make-date-row! date-table (format #f (_ "~a Date") title) post-date date-format) + (make-date-row! date-table (_ "Due Date") due-date date-format) date-table) (gnc:make-html-text - (string-append title "
" + (string-append title "
" (_ "Invoice in progress..."))))) (gnc:html-table-append-row! @@ -910,7 +910,7 @@ (gnc:make-html-text (string-append (_ "Reference") ": " - (string-expand billing-id #\newline "
")))) + (string-expand billing-id #\newline "
")))) (make-break! document))))) (if (opt-val "Display" "Billing Terms") @@ -922,7 +922,7 @@ (gnc:make-html-text (string-append (_ "Terms") ": " - (string-expand terms #\newline "
"))))))) + (string-expand terms #\newline "
"))))))) (make-break! document) @@ -948,7 +948,7 @@ document (gnc:make-html-text (string-append name-str ": " - (string-expand name #\newline "
"))))))) + (string-expand name #\newline "
"))))))) (make-break! document) @@ -960,13 +960,13 @@ document (gnc:make-html-text (string-append contact-str ": " - (string-expand contact #\newline "
"))))))) + (string-expand contact #\newline "
"))))))) (gnc:html-document-add-object! document (gnc:make-html-text (gnc:html-markup-br) - (string-expand (opt-val "Display" "Extra Notes") #\newline "
") + (string-expand (opt-val "Display" "Extra Notes") #\newline "
") (gnc:html-markup-br)))) ; else diff --git a/gnucash/report/business-reports/job-report.scm b/gnucash/report/business-reports/job-report.scm index 8ec2dad374..260d02aafc 100644 --- a/gnucash/report/business-reports/job-report.scm +++ b/gnucash/report/business-reports/job-report.scm @@ -478,10 +478,10 @@ (gnc:html-table-append-row! table (list - (string-expand (gnc:owner-get-name-and-address-dep owner) #\newline "
"))) + (string-expand (gnc:owner-get-name-and-address-dep owner) #\newline "
"))) (gnc:html-table-append-row! table - (list "
")) + (list "
")) (set-last-row-style! table "td" 'attribute (list "valign" "top")) @@ -521,7 +521,7 @@ (gnc:html-table-append-row! table (list (if name name ""))) (gnc:html-table-append-row! table (list (string-expand (if addy addy "") - #\newline "
"))) + #\newline "
"))) (gnc:html-table-append-row! table (list (strftime date-format diff --git a/gnucash/report/locale-specific/us/taxtxf.scm b/gnucash/report/locale-specific/us/taxtxf.scm index bb0d067ce1..321501e67f 100644 --- a/gnucash/report/locale-specific/us/taxtxf.scm +++ b/gnucash/report/locale-specific/us/taxtxf.scm @@ -3176,11 +3176,10 @@ "center" (gnc:html-markup/format (string-append (if (and (gnc-get-current-book-tax-name) - (not (string=? "" - (gnc-get-current-book-tax-name)))) - "Tax Name: %s
" + (not (string-null? (gnc-get-current-book-tax-name)))) + "Tax Name: ~a
" "~a") - "Period from ~a to ~s
Tax Year ~a
Tax Entity Type: %s
All amounts in USD unless otherwise noted") + "Period from ~a to ~a
Tax Year ~a
Tax Entity Type: ~a
All amounts in USD unless otherwise noted") (gnc-get-current-book-tax-name) from-date to-date @@ -3199,7 +3198,7 @@ doc (gnc:make-html-text (gnc:html-markup-p (gnc:html-markup/format - "
The following Account(s) have errors with their Income Tax code assignments (use 'Edit->Tax Report Options' to correct):")))) + "
The following Account(s) have errors with their Income Tax code assignments (use 'Edit->Tax Report Options' to correct):")))) (gnc:html-document-add-object! doc error-table) (gnc:html-table-append-row! error-table @@ -3262,7 +3261,7 @@ doc (gnc:make-html-text (gnc:html-markup-p (gnc:html-markup/format - "
")))) + "
")))) ) ) @@ -3453,29 +3452,29 @@ (gnc:html-markup-p (gnc:html-markup/format (string-append - "Selected Report Options:
" + "Selected Report Options:
" ;; selected accounts - "      ~a
" + "      ~a
" ;; suppress 0.00 values - "      ~a
" + "      ~a
" ;; full acct names - "      ~a
" + "      ~a
" ;; transfer detail - "      ~a
" + "      ~a
" ;; TXF detail - "      ~a
" + "      ~a
" ;; action:memo detail - "      ~a
" + "      ~a
" ;; transaction detail - "      ~a
" + "      ~a
" ;; special dates - "      ~a
" + "      ~a
" ;; currency conversion date - "      ~a
" + "      ~a
" ;; alternate transaction shading (if (gnc-html-engine-supports-css) "" - "      ~a
" + "      ~a
" )) (if (not (null? user-sel-accnts)) "Subset of accounts" diff --git a/gnucash/report/standard-reports/income-statement.scm b/gnucash/report/standard-reports/income-statement.scm index c57e2a239c..412b1d6a49 100644 --- a/gnucash/report/standard-reports/income-statement.scm +++ b/gnucash/report/standard-reports/income-statement.scm @@ -431,7 +431,7 @@ (gnc:html-document-set-title! doc (format #f (string-append "~a ~a " - (_ "For Period Covering %s to %s")) + (_ "For Period Covering ~a to ~a")) company-name report-title (qof-print-date start-date-printable) (qof-print-date end-date)))