Merge pull request 'rephrase-scheckbuch-button' (#460 ) from rephrase-scheckbuch-button into staging

Reviewed-on: #460
rephrase scheckbuch button
2024-04-29 22:29:12 +02:00 · 2024-04-29 21:51:27 +02:00 · 2024-04-29 21:33:49 +02:00 · 2024-04-29 09:18:58 +02:00 · 2024-04-28 19:25:33 +02:00
2 changed files with 2 additions and 2 deletions
--- a/templates/forms/event.html.tera
+++ b/templates/forms/event.html.tera
@ -9,7 +9,7 @@
        {{ macros::input(label='Startzeit', name='tripdetails.planned_starting_time', type='time', required=true) }}
        {{ macros::input(label='Anzahl Steuerleute', name='planned_amount_cox', type='number', required=true, min='0') }}
        {{ macros::input(label='Anzahl Ruderer (ohne Steuerperson)', name='tripdetails.max_people', type='number', required=true, min='0') }}
-        {{ macros::checkbox(label='Gäste erlauben', name='tripdetails.allow_guests') }}
+        {{ macros::checkbox(label='Scheckbuch-Anmeldungen erlauben', name='tripdetails.allow_guests') }}
        {{ macros::checkbox(label='Immer anzeigen', name='tripdetails.always_show') }}
        {{ macros::input(label='Anmerkungen', name='tripdetails.notes', type='input') }}
        {{ macros::select(label='Typ', data=trip_types, name='tripdetails.trip_type', default='Reguläre Ausfahrt') }}
--- a/templates/forms/trip.html.tera
+++ b/templates/forms/trip.html.tera
@ -4,7 +4,7 @@
        <input class="day-js" type="hidden" name="day" value="" />
        {{ macros::input(label='Startzeit (zB "10:00")', name='planned_starting_time', type='time', required=true) }}
        {{ macros::input(label='Anzahl Ruderer (ohne Steuerperson)', name='max_people', type='number', required=true, min='0') }}
-        {{ macros::checkbox(label='Gäste erlauben', name='allow_guests') }}
+        {{ macros::checkbox(label='Scheckbuch-Anmeldungen erlauben', name='allow_guests') }}
        {{ macros::checkbox(label='Immer anzeigen', name='always_show') }}
        {{ macros::input(label='Anmerkungen', name='notes', type='input') }}
        {{ macros::select(label='Typ', data=trip_types, name='trip_type', default='Reguläre Ausfahrt') }}
Author	SHA1	Message	Date
philipp	7dfdc55adb	Merge pull request 'rephrase-scheckbuch-button' (#460 ) from rephrase-scheckbuch-button into staging Some checks failed CI/CD Pipeline / deploy-staging (push) Blocked by required conditions Details CI/CD Pipeline / deploy-main (push) Blocked by required conditions Details CI/CD Pipeline / test (push) Has been cancelled Details Reviewed-on: #460	2024-04-29 22:29:12 +02:00
philipp	c449e878f0	rephrase scheckbuch button All checks were successful CI/CD Pipeline / test (push) Successful in 8m50s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Has been skipped Details	2024-04-29 21:51:27 +02:00
philipp	8e5661b2f3	Merge pull request 'treat empty membership pdf as non-existing' (#457 ) from treat-empty-membershippdf-as-nonexisting into main All checks were successful CI/CD Pipeline / test (push) Successful in 8m10s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Successful in 6m7s Details Reviewed-on: #457	2024-04-29 21:33:49 +02:00
philipp	5dcd7bc745	Merge pull request 'proper-time-in-notificatoins' (#453 ) from proper-time-in-notificatoins into main All checks were successful CI/CD Pipeline / test (push) Successful in 7m56s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Successful in 5m20s Details Reviewed-on: #453	2024-04-29 09:18:58 +02:00
philipp	d01895df90	Merge pull request 'don't respond with 500 if no rower is selected' (#451 ) from require-user-for-logentry into main All checks were successful CI/CD Pipeline / test (push) Successful in 7m46s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Successful in 6m18s Details Reviewed-on: #451	2024-04-28 19:25:33 +02:00