1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-06-21 01:48:21 +02:00

2A+ can select a bus (and fix random bugs)

This commit is contained in:
Yohann D'ANELLO
2020-04-21 00:07:00 +02:00
parent 47b9b53591
commit 1c7d4fbbec
11 changed files with 633 additions and 267 deletions

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-17 17:51+0200\n"
"POT-Creation-Date: 2020-04-20 22:34+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -47,7 +47,7 @@ msgstr ""
#: apps/member/models.py:99 apps/member/models.py:203
#: apps/note/models/notes.py:188 apps/note/models/transactions.py:24
#: apps/note/models/transactions.py:44 apps/note/models/transactions.py:237
#: apps/wei/models.py:54 templates/member/club_info.html:13
#: apps/wei/models.py:61 templates/member/club_info.html:13
#: templates/member/profile_info.html:14
#: templates/registration/future_profile_detail.html:16
#: templates/wei/weiclub_info.html:13 templates/wei/weimembership_form.html:18
@ -71,7 +71,7 @@ msgid "activity types"
msgstr ""
#: apps/activity/models.py:53 apps/note/models/transactions.py:74
#: apps/permission/models.py:103 apps/wei/models.py:60 apps/wei/models.py:95
#: apps/permission/models.py:103 apps/wei/models.py:67 apps/wei/models.py:123
#: templates/activity/activity_detail.html:16
msgid "description"
msgstr ""
@ -83,7 +83,8 @@ msgid "type"
msgstr ""
#: apps/activity/models.py:66 apps/logs/models.py:21 apps/member/models.py:224
#: apps/note/models/notes.py:117 apps/wei/models.py:126
#: apps/note/models/notes.py:117 apps/wei/models.py:154
#: templates/wei/survey.html:16
msgid "user"
msgstr ""
@ -438,7 +439,7 @@ msgstr ""
msgid "fee"
msgstr ""
#: apps/member/models.py:267 apps/member/views.py:500 apps/wei/views.py:356
#: apps/member/models.py:267 apps/member/views.py:500 apps/wei/views.py:592
msgid "User is not a member of the parent club"
msgstr ""
@ -469,7 +470,7 @@ msgstr ""
#: apps/member/views.py:65 templates/member/profile_info.html:45
#: templates/registration/future_profile_detail.html:55
#: templates/wei/weimembership_form.html:87
#: templates/wei/weimembership_form.html:105
msgid "Update Profile"
msgstr ""
@ -481,7 +482,7 @@ msgstr ""
msgid "Search user"
msgstr ""
#: apps/member/views.py:495 apps/wei/views.py:347
#: apps/member/views.py:495 apps/wei/views.py:583
msgid ""
"This user don't have enough money to join this club, and can't have a "
"negative balance."
@ -496,8 +497,8 @@ msgid "The membership must begin before {:%m-%d-%Y}."
msgstr ""
#: apps/member/views.py:528 apps/member/views.py:530 apps/member/views.py:532
#: apps/registration/views.py:326 apps/registration/views.py:328
#: apps/registration/views.py:330
#: apps/registration/views.py:327 apps/registration/views.py:329
#: apps/registration/views.py:331
msgid "This field is required."
msgstr ""
@ -732,7 +733,7 @@ msgstr ""
#: apps/note/tables.py:146 apps/wei/tables.py:42 apps/wei/tables.py:43
#: templates/member/club_info.html:60 templates/note/conso_form.html:121
#: templates/wei/bus_tables.html:15 templates/wei/busteam_tables.html:15
#: templates/wei/busteam_tables.html:33 templates/wei/weiclub_info.html:61
#: templates/wei/busteam_tables.html:33 templates/wei/weiclub_info.html:66
msgid "Edit"
msgstr ""
@ -804,31 +805,31 @@ msgstr ""
msgid "Join Kfet Club"
msgstr ""
#: apps/registration/views.py:115
#: apps/registration/views.py:116
msgid "Email validation"
msgstr ""
#: apps/registration/views.py:161
#: apps/registration/views.py:162
msgid "Email validation unsuccessful"
msgstr ""
#: apps/registration/views.py:172
#: apps/registration/views.py:173
msgid "Email validation email sent"
msgstr ""
#: apps/registration/views.py:225
#: apps/registration/views.py:226
msgid "Unregistered users"
msgstr ""
#: apps/registration/views.py:292
#: apps/registration/views.py:293
msgid "You must join the BDE."
msgstr ""
#: apps/registration/views.py:314
#: apps/registration/views.py:315
msgid "You must join BDE club before joining Kfet club."
msgstr ""
#: apps/registration/views.py:319
#: apps/registration/views.py:320
msgid ""
"The entered amount is not enough for the memberships, should be at least {}"
msgstr ""
@ -844,7 +845,7 @@ msgstr ""
#: templates/member/add_members.html:14 templates/member/club_form.html:9
#: templates/treasury/invoice_form.html:46 templates/wei/bus_form.html:13
#: templates/wei/busteam_form.html:13 templates/wei/weiclub_form.html:15
#: templates/wei/weiregistration_form.html:9
#: templates/wei/weiregistration_form.html:14
msgid "Submit"
msgstr ""
@ -997,11 +998,35 @@ msgstr ""
msgid "Remove"
msgstr ""
#: apps/wei/apps.py:10 apps/wei/models.py:37 apps/wei/models.py:38
#: apps/wei/models.py:49 apps/wei/models.py:133 templates/base.html:115
#: apps/wei/apps.py:10 apps/wei/models.py:44 apps/wei/models.py:45
#: apps/wei/models.py:56 apps/wei/models.py:161 templates/base.html:115
msgid "WEI"
msgstr ""
#: apps/wei/forms/registration.py:47
msgid ""
"This choice is not definitive. The WEI organizers are free to attribute for "
"you a bus and a team, in particular if you are a free eletron."
msgstr ""
#: apps/wei/forms/registration.py:54
msgid ""
"Leave this field empty if you won't be in a team (staff, bus chief, free "
"electron)"
msgstr ""
#: apps/wei/forms/registration.py:59
msgid "Select the roles that you are interested in."
msgstr ""
#: apps/wei/forms/registration.py:65 apps/wei/forms/registration.py:75
msgid "This team doesn't belong to the given bus."
msgstr ""
#: apps/wei/management/commands/wei_algorithm.py:11
msgid "Attribute to each first year member a bus for the WEI"
msgstr ""
#: apps/wei/models.py:19 templates/wei/weiclub_info.html:23
msgid "year"
msgstr ""
@ -1014,139 +1039,147 @@ msgstr ""
msgid "date end"
msgstr ""
#: apps/wei/models.py:67
#: apps/wei/models.py:72
msgid "survey information"
msgstr ""
#: apps/wei/models.py:73
msgid "Information about the survey for new members, encoded in JSON"
msgstr ""
#: apps/wei/models.py:95
msgid "Bus"
msgstr ""
#: apps/wei/models.py:68 templates/wei/weiclub_tables.html:66
#: apps/wei/models.py:96 templates/wei/weiclub_tables.html:79
msgid "Buses"
msgstr ""
#: apps/wei/models.py:80 apps/wei/models.py:234
#: apps/wei/models.py:108 apps/wei/models.py:269
msgid "bus"
msgstr ""
#: apps/wei/models.py:88
#: apps/wei/models.py:116
msgid "color"
msgstr ""
#: apps/wei/models.py:89
#: apps/wei/models.py:117
msgid "The color of the T-Shirt, stored with its number equivalent"
msgstr ""
#: apps/wei/models.py:103
#: apps/wei/models.py:131
msgid "Bus team"
msgstr ""
#: apps/wei/models.py:104
#: apps/wei/models.py:132
msgid "Bus teams"
msgstr ""
#: apps/wei/models.py:113
#: apps/wei/models.py:141
msgid "WEI Role"
msgstr ""
#: apps/wei/models.py:114
#: apps/wei/models.py:142
msgid "WEI Roles"
msgstr ""
#: apps/wei/models.py:138
#: apps/wei/models.py:166
msgid "Credit from Société générale"
msgstr ""
#: apps/wei/models.py:143
#: apps/wei/models.py:171
msgid "Caution check given"
msgstr ""
#: apps/wei/models.py:147 templates/wei/weimembership_form.html:56
#: apps/wei/models.py:175 templates/wei/weimembership_form.html:56
msgid "birth date"
msgstr ""
#: apps/wei/models.py:153
#: apps/wei/models.py:181
msgid "Male"
msgstr ""
#: apps/wei/models.py:154
#: apps/wei/models.py:182
msgid "Female"
msgstr ""
#: apps/wei/models.py:155
#: apps/wei/models.py:183
msgid "Non binary"
msgstr ""
#: apps/wei/models.py:157 templates/wei/weimembership_form.html:53
#: apps/wei/models.py:185 templates/wei/weimembership_form.html:53
msgid "gender"
msgstr ""
#: apps/wei/models.py:163 templates/wei/weimembership_form.html:59
#: apps/wei/models.py:191 templates/wei/weimembership_form.html:59
msgid "health issues"
msgstr ""
#: apps/wei/models.py:168 templates/wei/weimembership_form.html:62
#: apps/wei/models.py:196 templates/wei/weimembership_form.html:62
msgid "emergency contact name"
msgstr ""
#: apps/wei/models.py:173 templates/wei/weimembership_form.html:65
#: apps/wei/models.py:201 templates/wei/weimembership_form.html:65
msgid "emergency contact phone"
msgstr ""
#: apps/wei/models.py:178 templates/wei/weimembership_form.html:68
#: apps/wei/models.py:206 templates/wei/weimembership_form.html:68
msgid ""
"Register on the mailing list to stay informed of the events of the campus (1 "
"mail/week)"
msgstr ""
#: apps/wei/models.py:183 templates/wei/weimembership_form.html:71
#: apps/wei/models.py:211 templates/wei/weimembership_form.html:71
msgid ""
"Register on the mailing list to stay informed of the sport events of the "
"campus (1 mail/week)"
msgstr ""
#: apps/wei/models.py:188 templates/wei/weimembership_form.html:74
#: apps/wei/models.py:216 templates/wei/weimembership_form.html:74
msgid ""
"Register on the mailing list to stay informed of the art events of the "
"campus (1 mail/week)"
msgstr ""
#: apps/wei/models.py:193 templates/wei/weimembership_form.html:50
#: apps/wei/models.py:221 templates/wei/weimembership_form.html:50
msgid "first year"
msgstr ""
#: apps/wei/models.py:194
#: apps/wei/models.py:222
msgid "Tells if the user is new in the school."
msgstr ""
#: apps/wei/models.py:199
#: apps/wei/models.py:227
msgid "registration information"
msgstr ""
#: apps/wei/models.py:200
#: apps/wei/models.py:228
msgid ""
"Information about the registration (buses for old members, survey fot the "
"new members), encoded in JSON"
msgstr ""
#: apps/wei/models.py:224
#: apps/wei/models.py:259
msgid "WEI User"
msgstr ""
#: apps/wei/models.py:225
#: apps/wei/models.py:260
msgid "WEI Users"
msgstr ""
#: apps/wei/models.py:244
#: apps/wei/models.py:279
msgid "team"
msgstr ""
#: apps/wei/models.py:254
#: apps/wei/models.py:289
msgid "WEI registration"
msgstr ""
#: apps/wei/models.py:258
#: apps/wei/models.py:293
msgid "WEI membership"
msgstr ""
#: apps/wei/models.py:259
#: apps/wei/models.py:294
msgid "WEI memberships"
msgstr ""
@ -1159,10 +1192,28 @@ msgstr ""
msgid "Teams"
msgstr ""
#: apps/wei/views.py:351
#: apps/wei/views.py:336 templates/wei/weiclub_info.html:62
msgid "Register 1A"
msgstr ""
#: apps/wei/views.py:377 templates/wei/weiclub_info.html:63
msgid "Register 2A+"
msgstr ""
#: apps/wei/views.py:394
msgid "You already opened an account in the Société générale."
msgstr ""
#: apps/wei/views.py:587
msgid "This user didn't give her/his caution check."
msgstr ""
#: apps/wei/views.py:655 apps/wei/views.py:675 apps/wei/views.py:685
#: templates/wei/survey.html:12 templates/wei/survey_closed.html:12
#: templates/wei/survey_end.html:12
msgid "Survey WEI"
msgstr ""
#: note_kfet/settings/__init__.py:63
msgid ""
"The Central Authentication Service grants you access to most of our websites "
@ -1357,12 +1408,12 @@ msgstr ""
msgid "Club listing"
msgstr ""
#: templates/member/club_tables.html:7 templates/wei/weiclub_tables.html:79
#: templates/member/club_tables.html:7 templates/wei/weiclub_tables.html:92
msgid "Member of the Club"
msgstr ""
#: templates/member/club_tables.html:20 templates/member/profile_tables.html:28
#: templates/wei/weiclub_tables.html:92
#: templates/wei/weiclub_tables.html:105
msgid "Transaction history"
msgstr ""
@ -1538,8 +1589,8 @@ msgid "Validate account"
msgstr ""
#: templates/registration/future_profile_detail.html:71
#: templates/wei/weimembership_form.html:97
#: templates/wei/weimembership_form.html:147
#: templates/wei/weimembership_form.html:115
#: templates/wei/weimembership_form.html:173
msgid "Validate registration"
msgstr ""
@ -1763,6 +1814,22 @@ msgstr ""
msgid "Members"
msgstr ""
#: templates/wei/survey.html:24
msgid "Next"
msgstr ""
#: templates/wei/survey_closed.html:16
msgid "The inscription for this WEI are now closed."
msgstr ""
#: templates/wei/survey_closed.html:22
msgid "Return to WEI detail"
msgstr ""
#: templates/wei/survey_end.html:16
msgid "The survey is now ended. Your answers have been saved."
msgstr ""
#: templates/wei/weiclub_info.html:31
msgid "WEI fee / including BDE and Kfet fee (paid students)"
msgstr ""
@ -1772,14 +1839,14 @@ msgid "WEI fee / including BDE and Kfet fee (unpaid students)"
msgstr ""
#: templates/wei/weiclub_info.html:58
msgid "Register 2A+"
msgid "WEI list"
msgstr ""
#: templates/wei/weiclub_info.html:64
#: templates/wei/weiclub_info.html:69
msgid "Add bus"
msgstr ""
#: templates/wei/weiclub_info.html:68
#: templates/wei/weiclub_info.html:73
msgid "View WEI"
msgstr ""
@ -1795,7 +1862,19 @@ msgstr ""
msgid "WEI listing"
msgstr ""
#: templates/wei/weiclub_tables.html:107
#: templates/wei/weiclub_tables.html:63
msgid "Register to the WEI! 1A"
msgstr ""
#: templates/wei/weiclub_tables.html:65
msgid "Register to the WEI! 2A+"
msgstr ""
#: templates/wei/weiclub_tables.html:67
msgid "Update my registration"
msgstr ""
#: templates/wei/weiclub_tables.html:120
msgid "Unvalidated registrations"
msgstr ""
@ -1808,52 +1887,84 @@ msgid "Payment from Société générale"
msgstr ""
#: templates/wei/weimembership_form.html:81
msgid "Suggested bus from the survey:"
msgstr ""
#: templates/wei/weimembership_form.html:86
msgid "Raw survey information"
msgstr ""
#: templates/wei/weimembership_form.html:96
msgid "The algorithm didn't run."
msgstr ""
#: templates/wei/weimembership_form.html:99
msgid "caution check given"
msgstr ""
#: templates/wei/weimembership_form.html:88
#: templates/wei/weimembership_form.html:106
msgid "Update registration"
msgstr ""
#: templates/wei/weimembership_form.html:101
msgid ""
"\n"
" The WEI will be paid by Société générale. The "
"membership will be created even if the bank didn't pay the BDE yet.\n"
" The membership transaction will be created but will "
"be invalid. You will have to validate it once the bank\n"
" validated the creation of the account, or to change "
"the payment method.\n"
" "
#: templates/wei/weimembership_form.html:119
msgid "The registration is already validated and can't be unvalidated."
msgstr ""
#: templates/wei/weimembership_form.html:111
#, python-format
#: templates/wei/weimembership_form.html:120
msgid "The user joined the bus"
msgstr ""
#: templates/wei/weimembership_form.html:121
msgid "in the team"
msgstr ""
#: templates/wei/weimembership_form.html:122
msgid "in no team (staff)"
msgstr ""
#: templates/wei/weimembership_form.html:122
msgid "with the following roles:"
msgstr ""
#: templates/wei/weimembership_form.html:127
msgid ""
"\n"
" The note don't have enough money (%(balance)s, "
"%(pretty_fee)s required). The registration may fail.\n"
" The WEI will be paid by Société générale. The "
"membership will be created even if the bank didn't pay the BDE yet.\n"
" The membership transaction will be created but "
"will be invalid. You will have to validate it once the bank\n"
" validated the creation of the account, or to "
"change the payment method.\n"
" "
msgstr ""
#: templates/wei/weimembership_form.html:118
msgid "The note has enough money."
msgstr ""
#: templates/wei/weimembership_form.html:125
msgid "The user didn't give her/his caution check."
msgstr ""
#: templates/wei/weimembership_form.html:133
#: templates/wei/weimembership_form.html:137
#, python-format
msgid ""
"\n"
" This user is not a member of the Kfet club. Please "
"adhere\n"
" <a href=\"%(future_user_detail)s\">here if he/she is "
"in her/his first year</a>\n"
" or <a href=\"%(club_detail)s\">here if he/she was an "
"old member</a> before you validate\n"
" the registration of the WEI.\n"
" "
" The note don't have enough money "
"(%(balance)s, %(pretty_fee)s required). The registration may fail.\n"
" "
msgstr ""
#: templates/wei/weimembership_form.html:144
msgid "The note has enough money, the registration is possible."
msgstr ""
#: templates/wei/weimembership_form.html:151
msgid "The user didn't give her/his caution check."
msgstr ""
#: templates/wei/weimembership_form.html:159
#, python-format
msgid ""
"\n"
" This user is not a member of the Kfet club. "
"Please adhere\n"
" <a href=\"%(future_user_detail)s\">here if he/"
"she is in her/his first year</a>\n"
" or <a href=\"%(club_detail)s\">here if he/she "
"was an old member</a> before you validate\n"
" the registration of the WEI.\n"
" "
msgstr ""