aherman
/
gnucash
mirror of https://github.com/Gnucash/gnucash
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup (list->vector (list ...))

Browse Source 
this is not an efficiency change, rather a readability change
especially for hello-world which aims to introduce new users to reports.
pull/599/head
Christopher Lam 7 years ago
parent e27338b004
commit 928f6145c7
5 changed files with 73 additions and 114 deletions
Show Stats Download Patch File Download Diff File

45
gnucash/report/locale-specific/us/taxtxf-de_DE.scm
Unescape View File

@ -152,33 +152,24 @@
gnc:pagename-general (N_ "Alternate Period")
"c" (N_ "Override or modify From: & To:.")
(if after-tax-day 'from-to 'last-year)
(list (list->vector
(list 'from-to (N_ "Use From - To") (N_ "Use From - To period.")))
(list->vector
(list '1st-est (N_ "1st Est Tax Quarter") (N_ "Jan 1 - Mar 31.")))
(list->vector
(list '2nd-est (N_ "2nd Est Tax Quarter") (N_ "Apr 1 - May 31.")))
(list->vector
;; Translators: The US tax quarters are different from
;; actual year's quarters! See the definition of
;; tax-qtr-real-qtr-year variable above.
(list '3rd-est (N_ "3rd Est Tax Quarter") (N_ "Jun 1 - Aug 31.")))
(list->vector
(list '4th-est (N_ "4th Est Tax Quarter") (N_ "Sep 1 - Dec 31.")))
(list->vector
(list 'last-year (N_ "Last Year") (N_ "Last Year.")))
(list->vector
(list '1st-last (N_ "Last Yr 1st Est Tax Qtr")
(N_ "Jan 1 - Mar 31, Last year.")))
(list->vector
(list '2nd-last (N_ "Last Yr 2nd Est Tax Qtr")
(N_ "Apr 1 - May 31, Last year.")))
(list->vector
(list '3rd-last (N_ "Last Yr 3rd Est Tax Qtr")
(N_ "Jun 1 - Aug 31, Last year.")))
(list->vector
(list '4th-last (N_ "Last Yr 4th Est Tax Qtr")
(N_ "Sep 1 - Dec 31, Last year."))))))
(list (vector 'from-to (N_ "Use From - To") (N_ "Use From - To period."))
(vector '1st-est (N_ "1st Est Tax Quarter") (N_ "Jan 1 - Mar 31."))
(vector '2nd-est (N_ "2nd Est Tax Quarter") (N_ "Apr 1 - May 31."))
(vector '3rd-est (N_ "3rd Est Tax Quarter") (N_ "Jun 1 - Aug 31."))
(vector '4th-est (N_ "4th Est Tax Quarter") (N_ "Sep 1 - Dec 31."))
(vector 'last-year (N_ "Last Year") (N_ "Last Year."))
(vector '1st-last
(N_ "Last Yr 1st Est Tax Qtr")
(N_ "Jan 1 - Mar 31, Last year."))
(vector '2nd-last
(N_ "Last Yr 2nd Est Tax Qtr")
(N_ "Apr 1 - May 31, Last year."))
(vector '3rd-last
(N_ "Last Yr 3rd Est Tax Qtr")
(N_ "Jun 1 - Aug 31, Last year."))
(vector '4th-last
(N_ "Last Yr 4th Est Tax Qtr")
(N_ "Sep 1 - Dec 31, Last year.")))))
(gnc:register-tax-option
(gnc:make-account-list-option

54
gnucash/report/locale-specific/us/taxtxf.scm
Unescape View File

@ -180,36 +180,30 @@
gnc:pagename-general (N_ "Alternate Period")
"c" (N_ "Override or modify From: & To:.")
(if after-tax-day 'from-to 'last-year)
(list (list->vector
(list 'from-to (N_ "Use From - To") (N_ "Use From - To period.")))
(list->vector
(list '1st-est (N_ "1st Est Tax Quarter") (N_ "Jan 1 - Mar 31.")))
(list->vector
(list '2nd-est (N_ "2nd Est Tax Quarter") (N_ "Apr 1 - May 31.")))
(list->vector
;; Translators: The US tax quarters are different from
;; actual year's quarters! See the definition of
;; tax-qtr-real-qtr-year variable above.
(list '3rd-est (N_ "3rd Est Tax Quarter") (N_ "Jun 1 - Aug 31.")))
(list->vector
(list '4th-est (N_ "4th Est Tax Quarter") (N_ "Sep 1 - Dec 31.")))
(list->vector
(list 'last-year (N_ "Last Year") (N_ "Last Year.")))
(list->vector
(list '1st-last (N_ "Last Yr 1st Est Tax Qtr")
(N_ "Jan 1 - Mar 31, Last year.")))
(list->vector
(list '2nd-last (N_ "Last Yr 2nd Est Tax Qtr")
(N_ "Apr 1 - May 31, Last year.")))
(list->vector
(list '3rd-last (N_ "Last Yr 3rd Est Tax Qtr")
;; Translators: The US tax quarters are different from
;; actual year's quarters! See the definition of
;; tax-qtr-real-qtr-year variable above.
(N_ "Jun 1 - Aug 31, Last year.")))
(list->vector
(list '4th-last (N_ "Last Yr 4th Est Tax Qtr")
(N_ "Sep 1 - Dec 31, Last year."))))))
(list (vector 'from-to (N_ "Use From - To") (N_ "Use From - To period."))
(vector '1st-est (N_ "1st Est Tax Quarter") (N_ "Jan 1 - Mar 31."))
(vector '2nd-est (N_ "2nd Est Tax Quarter") (N_ "Apr 1 - May 31."))
;; Translators: The US tax quarters are different from
;; actual year's quarters! See the definition of
;; tax-qtr-real-qtr-year variable above.
(vector '3rd-est (N_ "3rd Est Tax Quarter") (N_ "Jun 1 - Aug 31."))
(vector '4th-est (N_ "4th Est Tax Quarter") (N_ "Sep 1 - Dec 31."))
(vector 'last-year (N_ "Last Year") (N_ "Last Year."))
(vector '1st-last
(N_ "Last Yr 1st Est Tax Qtr")
(N_ "Jan 1 - Mar 31, Last year."))
(vector '2nd-last
(N_ "Last Yr 2nd Est Tax Qtr")
(N_ "Apr 1 - May 31, Last year."))
(vector '3rd-last
(N_ "Last Yr 3rd Est Tax Qtr")
;; Translators: The US tax quarters are different from
;; actual year's quarters! See the definition of
;; tax-qtr-real-qtr-year variable above.
(N_ "Jun 1 - Aug 31, Last year."))
(vector '4th-last
(N_ "Last Yr 4th Est Tax Qtr")
(N_ "Sep 1 - Dec 31, Last year.")))))
(gnc:register-tax-option
(gnc:make-account-list-option

26
gnucash/report/report-system/options-utilities.scm
Unescape View File

@ -66,24 +66,14 @@
(gnc:register-option
options
(gnc:make-multichoice-option
pagename name-display-depth
sort-tag
help-string
default-depth
(list (list->vector
(list 'all (N_ "All") (N_ "All accounts")))
(list->vector
(list 1 "1" (N_ "Top-level.")))
(list->vector
(list 2 "2" (N_ "Second-level.")))
(list->vector
(list 3 "3" (N_ "Third-level.")))
(list->vector
(list 4 "4" (N_ "Fourth-level.")))
(list->vector
(list 5 "5" (N_ "Fifth-level.")))
(list->vector
(list 6 "6" (N_ "Sixth-level.")))))))
pagename name-display-depth sort-tag help-string default-depth
(list (vector 'all (N_ "All") (N_ "All accounts"))
(vector 1 "1" (N_ "Top-level."))
(vector 2 "2" (N_ "Second-level."))
(vector 3 "3" (N_ "Third-level."))
(vector 4 "4" (N_ "Fourth-level."))
(vector 5 "5" (N_ "Fifth-level."))
(vector 6 "6" (N_ "Sixth-level."))))))
;; These help for selecting a bunch of accounts.
(define (gnc:options-add-account-selection!

17
gnucash/report/standard-reports/budget-barchart.scm
Unescape View File

@ -102,21 +102,12 @@
(N_ "This is a multi choice option.") ;; option help text
'bars ;; default selectioin
(list
(list->vector
(list 'bars
(vector 'bars
(N_ "Barchart")
(N_ "Show the report as a bar chart.")
)
)
(list->vector
(list 'lines
(N_ "Show the report as a bar chart."))
(vector 'lines
(N_ "Linechart")
(N_ "Show the report as a line chart.")
)
)
)
)
)
(N_ "Show the report as a line chart.")))))
(gnc:options-add-plot-size!
options gnc:pagename-display

45
gnucash/report/utility-reports/hello-world.scm
Unescape View File

@ -65,22 +65,18 @@
(gnc:make-multichoice-option
(N_ "Hello, World!") (N_ "Multi Choice Option")
"b" (N_ "This is a multi choice option.") 'third
(list (list->vector
(list 'first
(N_ "First Option")
(N_ "Help for first option.")))
(list->vector
(list 'second
(N_ "Second Option")
(N_ "Help for second option.")))
(list->vector
(list 'third
(N_ "Third Option")
(N_ "Help for third option.")))
(list->vector
(list 'fourth
(N_ "Fourth Options")
(N_ "The fourth option rules!"))))))
(list (vector 'first
(N_ "First Option")
(N_ "Help for first option."))
(vector 'second
(N_ "Second Option")
(N_ "Help for second option."))
(vector 'third
(N_ "Third Option")
(N_ "Help for third option."))
(vector 'fourth
(N_ "Fourth Options")
(N_ "The fourth option rules!")))))
;; This is a string option. Users can type anything they want
;; as a value. The default value is "Hello, World". This is
@ -196,19 +192,16 @@
(gnc:make-list-option
(N_ "Hello Again") (N_ "A list option")
"h" (N_ "This is a list option.")
(list 'good)
(list (list->vector
(list 'good
'good
(list (vector 'good
(N_ "The Good")
(N_ "Good option.")))
(list->vector
(list 'bad
(N_ "Good option."))
(vector 'bad
(N_ "The Bad")
(N_ "Bad option.")))
(list->vector
(list 'ugly
(N_ "Bad option."))
(vector 'ugly
(N_ "The Ugly")
(N_ "Ugly option."))))))
(N_ "Ugly option.")))))
;; This option is for testing. When true, the report generates
;; an exception.

Write Preview
Loading…
Cancel
Save