Commit be681047 authored by Beat Seeliger's avatar Beat Seeliger
Browse files

Merge branch 'features/waive-to-volunteer-xlsx' into 'develop'

Added waive to volunteer xlsx

See merge request !825
parents 7c43861c 1de721cc
Pipeline #29207 canceled with stage
in 8 seconds
......@@ -27,7 +27,8 @@ wb.add_worksheet(name: 'Freiwillige') do |sheet|
t_attr(:acceptance),
t_attr(:created_at),
t_attr(:updated_at),
t_attr(:assignment_count)
t_attr(:assignment_count),
t_attr(:waive_alternative)
]
......@@ -59,6 +60,7 @@ wb.add_worksheet(name: 'Freiwillige') do |sheet|
l(volunteer.created_at.localtime),
l(volunteer.updated_at.localtime),
volunteer.assignments.count,
volunteer.waive
], types: cell_types, style: cell_styles
end
end
......@@ -534,6 +534,7 @@ de:
volunteer_availability: Wann sind Sie für einen Freiwilligeneinsatz verfügbar?
volunteer_experience_desc: Falls Sie bereits Erfahrungen mit Freiwilligenarbeit haben, bitte diese genauer erläutern.
waive: Ich verzichte auf die Auszahlung von Spesen.
waive_alternative: 'Spesenverzicht'
woman: Frau
working_percent: Stellenprozent
errors:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment