Define variables for standard report menu names. Use those variables

instead of raw strings.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@3961 57a11ea4-9604-0410-9ed3-97b8803252fd

src/scm/report.scm

@@ -38,18 +38,26 @@
 (define *gnc:_reports_* (make-hash-table 23))
 (define *gnc:_report-next-serial_* 0)
 
+(define gnc:menuname-asset-liability
+  (N_ "_Assets & Liabilities"))
+(define gnc:menuname-income-expense
+  (N_ "_Income & Expense"))
+(define gnc:menuname-taxes
+  (N_ "_Taxes"))
+
 (define (gnc:report-menu-setup)
   ;; since this menu gets added to every child window, we say it 
   ;; comes after the "_File" menu. 
-  (define menu (gnc:make-menu "New _Report" 
+  (define menu (gnc:make-menu (N_ "New _Report")
                               (list "_File" "New _Account Tree")))
   (define menu-namer (gnc:new-menu-namer))
-  (define tax-menu (gnc:make-menu (N_ "_Taxes") 
+  (define tax-menu (gnc:make-menu gnc:menuname-taxes
                                   (list "_File" "New _Report" "")))
   (define income-expense-menu
-    (gnc:make-menu (N_ "_Income & Expense") (list "_File" "New _Report" "")))
+    (gnc:make-menu gnc:menuname-income-expense
+                   (list "_File" "New _Report" "")))
   (define asset-liability-menu
-    (gnc:make-menu (N_ "_Assets & Liabilities") 
+    (gnc:make-menu gnc:menuname-asset-liability
                    (list "_File" "New _Report" "")))
   (define menu-hash (make-hash-table 23))
 
@@ -60,20 +68,20 @@
               (menu-name (gnc:report-menu-name report))
               (menu-tip (gnc:report-menu-tip report))
               (item #f))
-          
+
           (if (not menu-path)
               (set! menu-path '(""))
               (set! menu-path
                     (append menu-path '(""))))
-          
+
           (set! menu-path (append (list "_File" "New _Report") menu-path))
-          
+
           (if menu-name (set! name menu-name))
-          
+
           (if (not menu-tip)
               (set! menu-tip
                     (sprintf #f (_ "Display the %s report") name)))
-          
+
           (set! item
                 (gnc:make-menu-item
                  ((menu-namer 'add-name) name)
@@ -99,7 +107,7 @@
   (gnc:add-extension tax-menu)
   (gnc:add-extension income-expense-menu)
   (gnc:add-extension asset-liability-menu)
-  
+
   ;; push reports (new items added on top of menu)
   (hash-for-each add-report-menu-item *gnc:_report-templates_*))
 

src/scm/report/account-piecharts.scm

@@ -394,8 +394,8 @@ the global Preference \"Display Tip of the Day\"."))))
       'version 1
       'name (car l)
       'menu-path (if (caddr l)
-		     (list "_Income & Expense")
-		     (list "_Assets & Liabilities"))
+                     (list gnc:menuname-income-expense)
+                     (list gnc:menuname-asset-liability))
       'menu-name (cadddr l)
       'menu-tip (car (cddddr l))
       'options-generator (lambda () (options-generator (cadr l) 

src/scm/report/average-balance.scm

@@ -422,6 +422,6 @@
   (gnc:define-report
    'version 1
    'name (N_ "Average Balance")
-   'menu-path (list "_Assets & Liabilities")
+   'menu-path (list gnc:menuname-asset-liability)
    'options-generator options-generator
    'renderer renderer))

src/scm/report/balance-sheet.scm

@@ -312,6 +312,6 @@
   (gnc:define-report 
    'version 1
    'name (N_ "Balance Sheet")
-   'menu-path (list "_Assets & Liabilities")
+   'menu-path (list gnc:menuname-asset-liability)
    'options-generator balance-sheet-options-generator
    'renderer balance-sheet-renderer))

src/scm/report/category-barchart.scm

@@ -380,8 +380,8 @@
       'version 1
       'name (car l)
       'menu-path (if (cadddr l)
-		     (list "_Income & Expense")
-		     (list "_Assets & Liabilities"))
+		     (list gnc:menuname-income-expense)
+		     (list gnc:menuname-asset-liability))
       'options-generator (lambda () (options-generator (cadr l)))
       'renderer (lambda (report-obj)
 		  (category-barchart-renderer report-obj 

src/scm/report/income-expense-graph.scm

@@ -216,7 +216,8 @@
    ;; untranslated value here!
    'name (N_ "Income/Expense Chart")
 
-   'menu-path (list "_Income & Expense")
+   'menu-path (list gnc:menuname-income-expense)
+
    ;; The options generator function defined above.
    'options-generator options-generator
 

src/scm/report/net-worth-timeseries.scm

@@ -234,7 +234,7 @@
    ;; untranslated value here!
    'name (N_ "Net Worth Barchart")
 
-   'menu-path (list "_Assets & Liabilities")
+   'menu-path (list gnc:menuname-asset-liability)
 
    ;; The options generator function defined above.
    'options-generator options-generator

src/scm/report/pnl.scm

@@ -182,6 +182,6 @@
   (gnc:define-report 
    'version 1
    'name (N_ "Profit And Loss")
-   'menu-path (list "_Income & Expense")
+   'menu-path (list gnc:menuname-income-expense)
    'options-generator pnl-options-generator
    'renderer pnl-renderer))

src/scm/report/portfolio.scm

@@ -164,7 +164,8 @@
    ;; untranslated value here!
    'name (N_ "Investment Portfolio")
 
-   'menu-path (list "_Assets & Liabilities")
+   'menu-path (list gnc:menuname-asset-liability)
+
    ;; The options generator function defined above.
    'options-generator options-generator
 

src/scm/report/taxtxf.scm

@@ -727,7 +727,7 @@ Go the the Tax Information dialog to set up tax-related accounts.")))))
   (gnc:define-report
    'version 1
    'name (N_ "Tax Report")
-   'menu-path (list (N_ "_Taxes"))
+   'menu-path (list gnc:menuname-taxes)
    'options-generator tax-options-generator
    'renderer (lambda (report-obj)
                (generate-tax-or-txf
@@ -740,7 +740,7 @@ Deductable Expenses.")
   (gnc:define-report
    'version 1
    'name (N_ "Export .TXF")
-   'menu-path (list (N_ "_Taxes"))
+   'menu-path (list gnc:menuname-taxes)
    'options-generator tax-options-generator
    'renderer (lambda (report-obj)
                (generate-tax-or-txf