r23755 - gnucash/trunk/src/report/standard-reports - Drop old ampersand subsitution in a couple of reports

[Geert Janssens]

Author: gjanssens
Date: 2014-01-24 14:22:58 -0500 (Fri, 24 Jan 2014)
New Revision: 23755
Trac: http://svn.gnucash.org/trac/changeset/23755

Modified:
   gnucash/trunk/src/report/standard-reports/account-piecharts.scm
   gnucash/trunk/src/report/standard-reports/category-barchart.scm
Log:
Drop old ampersand subsitution in a couple of reports

It's not needed anymore with jqplot which already takes care of it.

Modified: gnucash/trunk/src/report/standard-reports/account-piecharts.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/account-piecharts.scm	2014-01-24 19:22:48 UTC (rev 23754)
+++ gnucash/trunk/src/report/standard-reports/account-piecharts.scm	2014-01-24 19:22:58 UTC (rev 23755)
@@ -488,13 +488,11 @@
                       (map 
                        (lambda (pair)
                          (string-append
-			  (regexp-substitute/global #f "&"
                            (if (string? (cadr pair))
 			       (cadr pair)
 			       ((if show-fullname?
 				    gnc-account-get-full-name
 				    xaccAccountGetName) (cadr pair)))
-			       'pre " " (_ "and") " " 'post)
 			   (if show-total?
 			       (string-append 
 				" - "

Modified: gnucash/trunk/src/report/standard-reports/category-barchart.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/category-barchart.scm	2014-01-24 19:22:48 UTC (rev 23754)
+++ gnucash/trunk/src/report/standard-reports/category-barchart.scm	2014-01-24 19:22:58 UTC (rev 23755)
@@ -512,13 +512,11 @@
 	     (gnc:report-percent-done 94)
              (gnc:html-barchart-set-col-labels!
               chart (map (lambda (pair)
-			  (regexp-substitute/global #f "&"
                            (if (string? (car pair))
                                (car pair)
                                ((if show-fullname?
                                     gnc-account-get-full-name
-                                    xaccAccountGetName) (car pair)))
-			   'pre " " (_ "and") " " 'post))
+                                    xaccAccountGetName) (car pair))))
                          all-data))
              (gnc:html-barchart-set-col-colors! 
               chart
@@ -589,13 +587,11 @@
                     (append
                      (list (_ "Date"))
                      (map (lambda (pair)
-                            (regexp-substitute/global #f "&"
-                                                      (if (string? (car pair))
-                                                          (car pair)
-                                                          ((if show-fullname?
-                                                               gnc-account-get-full-name
-                                                               xaccAccountGetName) (car pair)))
-                                                      'pre " " (_ "and") " " 'post))
+                           (if (string? (car pair))
+                               (car pair)
+                               ((if show-fullname?
+                                    gnc-account-get-full-name
+                                    xaccAccountGetName) (car pair))))
                           all-data)
                      (if (> (gnc:html-table-num-columns table) 2)
                          (list (_ "Grand Total"))