Merge branch 'PR_806' into maint

bindings/core-utils.i

@@ -157,6 +157,9 @@ gchar *gnc_locale_name (void);
 
 }
 
+%rename ("gnc:ngettext") ngettext;
+extern const char* ngettext (const char *msgid1, const char *msgid2,
+                             unsigned long int n);
 %rename ("gnc:gettext") gettext;
 extern const char* gettext(const char*);
 %rename ("gnc:C_gettext") wrap_C_;

bindings/guile/core-utils.scm

@@ -27,6 +27,7 @@
 (define-module (gnucash core-utils)
   #:export (N_
             G_
+            NG_
             C_
             gnc:string-locale<?
             gnc:string-locale>?
@@ -46,6 +47,7 @@
 
 ;; gettext functions
 (define G_ gnc:gettext)
+(define NG_ gnc:ngettext)
 (define C_ gnc:C-gettext)
 (define-syntax-rule (N_ x) x)
 

gnucash/report/html-utilities.scm

@@ -210,9 +210,10 @@
   (issue-deprecation-warning
    "gnc:html-make-exchangerates is deprecated. use gnc:html-make-rates-table instead.")
   (let ((comm-list (gnc:accounts-get-commodities accounts common-commodity))
+        (entries (length comm-list))
         (markup (lambda (c) (gnc:make-html-table-cell/markup "number-cell" c)))
         (table (gnc:make-html-table)))
-    (unless (null? comm-list)
+    (unless (= 0 entries)
       (for-each
        (lambda (commodity)
          (let* ((orig-amt (gnc:make-gnc-monetary commodity 1))
@@ -225,9 +226,7 @@
        comm-list)
       (gnc:html-table-set-col-headers!
        table (list (gnc:make-html-table-header-cell/size
-                    1 2 (if (null? (cdr comm-list))
-                            (G_ "Exchange rate")
-                            (G_ "Exchange rates"))))))
+                    1 2 (NG_ "Exchange rate" "Exchange rates" entries)))))
     table))
 
 ;; Create a html-table of all prices. The report-currency is
@@ -244,8 +243,7 @@
        (unless (zero? entries)
          (gnc:html-table-set-col-headers!
           table (list (gnc:make-html-table-header-cell/size
-                       1 2 (if (= entries 1) (G_ "Exchange rate")
-                               (G_ "Exchange rates"))))))
+                       1 2 (NG_ "Exchange rate" "Exchange rates" entries)))))
        table)
       ((comm . rest)
        (gnc:html-table-append-row!

po/gnucash-pot.cmake

@@ -24,6 +24,7 @@ execute_process(
                         --keyword=Q_:1g
                         --keyword=G_
                         --keyword=N_
+                        --keyword=NG_:1,2
                         --keyword=C_:1c,2
                         --keyword=NC_:1c,2
                         --keyword=translate:1,1t