Skip to content

Commit a10b12f

Browse files
pavnesh-cpavnesh-c
authored
Merge branch 'development' into fix/stream
2 parents 917ad8d + adff976 commit a10b12f

File tree

23 files changed

+241
-142
lines changed

23 files changed

+241
-142
lines changed

‎app/api/helpers/mail.py‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,9 +506,15 @@ def send_email_change_user_email(user, email):
506506
base64.b64encode(bytes(serializer.dumps([email, str_generator()]), 'utf-8')),
507507
'utf-8',
508508
)
509+
app_name=get_settings()['app_name']
509510
link = make_frontend_url('/email/verify', {'token': hash_})
510511
send_email_with_action(
511-
user.email, MailType.USER_CONFIRM, 'user_confirm', email=user.email, link=link
512+
user.email,
513+
MailType.USER_CONFIRM,
514+
'user_confirm',
515+
email=user.email,
516+
link=link,
517+
app_name=app_name
512518
)
513519
send_email_with_action(
514520
email,
@@ -759,7 +765,10 @@ def send_email_after_event(email, event_name):
759765
send_email(
760766
to=email,
761767
action=action,
762-
subject=mail['subject'].format(event_name=event_name),
768+
subject=mail['subject'].format(
769+
event_name=event_name,
770+
app_name=app_name
771+
),
763772
html=render_template(
764773
mail['template'],
765774
app_name=app_name,

‎app/api/helpers/system_mails.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ def entries():
153153
},
154154
MailType.USER_CONFIRM: {
155155
'recipient': 'User',
156-
'subject': _('Email Confirmation to Create Account for Open-Event'),
156+
'subject': _('Email Confirmation to Create Account for {app_name}'),
157157
'template': 'email/user_confirm.html',
158158
},
159159
MailType.USER_CHANGE_EMAIL: {
@@ -280,7 +280,7 @@ def entries():
280280
},
281281
MailType.AFTER_EVENT: {
282282
'recipient': 'Owner, Organizer, Coorganizer',
283-
'subject': _('{event_name} is over. Thank you for using eventyay!'),
283+
'subject': _('{event_name} is over. Thank you for using {app_name}!'),
284284
'template': 'email/after_event.html',
285285
},
286286
MailType.AFTER_EVENT_SPEAKER: {

‎app/templates/email/new_session.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
<br/><br/>{{ _('This is an automatic email from %(app_name)s for organizers of the %(session_name)s.', app_name=app_name, session_name = '<a href="%s" target="_blank">%s</a>' % (session.event.site_link, session.event.name)) | safe }}
44
<br/><br/>
55
{{ _('Your %(open_link)sCall For Speakers%(close_link)s has received a new session proposal with the following details:', open_link = '<a href="%s" target="_blank">' % (session.site_cfs_link), close_link = '</a>') | safe }}
6-
{% endautoescape %}
76
<br/><br/>
87
{{ _('Session') }}: {{ session.title}} <br/>
98
{% if session.short_abstract %}
109
{{ _('Abstract') }}: {{ session.short_abstract }} <br/>
1110
{% endif %}
1211
<br/>
1312

14-
{% autoescape false %}
1513
{{ _('You can view all speaker details on the speaker profile page and the session proposal on the %(open_link)ssession page%(close_link)s.', open_link = '<a href="%s" target="_blank">' % (session.organizer_site_link), close_link = '</a>') | safe }}<br/><br/>
1614
{{ _('To change the status of sessions please go to the %(open_link)ssessions overview page%(close_link)s and click on the status badge of the session.', open_link = '<a href="%s" target="_blank">' % (session_overview_link), close_link = '</a>') | safe }}<br/><br/>
1715
{% endautoescape %}

‎app/translations/bn/LC_MESSAGES/messages.po‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: v1\n"
1010
"Report-Msgid-Bugs-To: open-event@googlegroups.com\n"
11-
"POT-Creation-Date: 2021-11-11 18:59+0530\n"
11+
"POT-Creation-Date: 2021-11-12 00:49+0530\n"
1212
"PO-Revision-Date: 2016-12-09 17:27+0000\n"
1313
"Last-Translator: Ridhwanul Haque <rhemon19@gmail.com>\n"
1414
"Language: bn\n"
@@ -79,7 +79,7 @@ msgid "Welcome to {app_name}. Please verify your account"
7979
msgstr ""
8080

8181
#: app/api/helpers/system_mails.py:156
82-
msgid "Email Confirmation to Create Account for Open-Event"
82+
msgid "Email Confirmation to Create Account for {app_name}"
8383
msgstr ""
8484

8585
#: app/api/helpers/system_mails.py:161
@@ -173,7 +173,7 @@ msgid "Join {event_name} from {group_name} on {event_date}"
173173
msgstr ""
174174

175175
#: app/api/helpers/system_mails.py:283
176-
msgid "{event_name} is over. Thank you for using eventyay!"
176+
msgid "{event_name} is over. Thank you for using {app_name}!"
177177
msgstr ""
178178

179179
#: app/api/helpers/system_mails.py:288
@@ -1660,3 +1660,9 @@ msgstr ""
16601660
#~ "assistance."
16611661
#~ msgstr ""
16621662

1663+
#~ msgid "Email Confirmation to Create Account for Open-Event"
1664+
#~ msgstr ""
1665+
1666+
#~ msgid "{event_name} is over. Thank you for using eventyay!"
1667+
#~ msgstr ""
1668+

‎app/translations/de/LC_MESSAGES/messages.po‎

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,18 @@
66
#
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: v1\n"
9+
"Project-Id-Version: v1\n"
1010
"Report-Msgid-Bugs-To: open-event@googlegroups.com\n"
11-
"POT-Creation-Date: 2021-11-11 18:59+0530\n"
11+
"POT-Creation-Date: 2021-11-12 00:49+0530\n"
1212
"PO-Revision-Date: 2021-11-11 15:56+0000\n"
1313
"Last-Translator: Mario Behling <mb@mariobehling.de>\n"
14-
"Language-Team: German <https://hosted.weblate.org/projects/open-event/server/"
15-
"de/>\n"
1614
"Language: de\n"
15+
"Language-Team: German <https://hosted.weblate.org/projects/open-"
16+
"event/server/de/>\n"
17+
"Plural-Forms: nplurals=2; plural=n != 1\n"
1718
"MIME-Version: 1.0\n"
1819
"Content-Type: text/plain; charset=utf-8\n"
1920
"Content-Transfer-Encoding: 8bit\n"
20-
"Plural-Forms: nplurals=2; plural=n != 1;\n"
21-
"X-Generator: Weblate 4.9.1-dev\n"
2221
"Generated-By: Babel 2.9.1\n"
2322

2423
#: app/api/helpers/system_mails.py:63
@@ -33,16 +32,16 @@ msgid ""
3332
"Accepted! Congratulations Your submission for {event_name} titled "
3433
"{session_name} has been Accepted"
3534
msgstr ""
36-
"Angenommen! Herzlichen Glückwunsch Ihre Einreichung für {event_name} mit dem "
37-
"Titel {session_name} wurde angenommen"
35+
"Angenommen! Herzlichen Glückwunsch Ihre Einreichung für {event_name} mit "
36+
"dem Titel {session_name} wurde angenommen"
3837

3938
#: app/api/helpers/system_mails.py:85
4039
msgid ""
4140
"Confirmed! Congratulations Your submission for {event_name} titled "
4241
"{session_name} has been Confirmed"
4342
msgstr ""
44-
"Bestätigt! Herzlichen Glückwunsch Ihre Einreichung für {event_name} mit dem "
45-
"Titel {session_name} wurde bestätigt"
43+
"Bestätigt! Herzlichen Glückwunsch Ihre Einreichung für {event_name} mit "
44+
"dem Titel {session_name} wurde bestätigt"
4645

4746
#: app/api/helpers/system_mails.py:96
4847
msgid ""
@@ -65,18 +64,16 @@ msgid ""
6564
"Withdrawn! Your submission for {event_name} titled {session_name} has "
6665
"been Withdrawn"
6766
msgstr ""
68-
"Zurückgezogen! Ihre Einreichung für {event_name} mit dem Titel {session_name}"
69-
" wurde zurückgezogen"
67+
"Zurückgezogen! Ihre Einreichung für {event_name} mit dem Titel "
68+
"{session_name} wurde zurückgezogen"
7069

7170
#: app/api/helpers/system_mails.py:131
72-
#, python-format
7371
msgid "Ticket Sales Period for One or Several Tickets for {event_name} Ended"
7472
msgstr ""
7573
"Der Ticketverkaufszeitraum für eines oder mehrere Ihrer Tickets für "
7674
"{event_name} ist beendet."
7775

7876
#: app/api/helpers/system_mails.py:136
79-
#, python-format
8077
msgid ""
8178
"Ticket Sales Period for One or Several Tickets for {event_name} Ending in"
8279
" 24 Hours"
@@ -85,7 +82,6 @@ msgstr ""
8582
"{event_name} endet in 24 Stunden."
8683

8784
#: app/api/helpers/system_mails.py:141
88-
#, python-format
8985
msgid ""
9086
"Ticket Sales Period fors One or Several Tickets for {event_name} Ending "
9187
"in 7 Days"
@@ -96,20 +92,19 @@ msgstr ""
9692
#: app/api/helpers/system_mails.py:146
9793
msgid "New session proposal for {session.event.name} titled {session.title}"
9894
msgstr ""
99-
"Neuer Sitzungsvorschlag für {session.event.name} mit dem Titel {session."
100-
"title}"
95+
"Neuer Sitzungsvorschlag für {session.event.name} mit dem Titel "
96+
"{session.title}"
10197

10298
#: app/api/helpers/system_mails.py:151
10399
msgid "Welcome to {app_name}. Please verify your account"
104100
msgstr "Willkommen bei {app_name}. Bitte verifizieren Sie Ihr Konto"
105101

106102
#: app/api/helpers/system_mails.py:156
107103
#, fuzzy
108-
msgid "Email Confirmation to Create Account for Open-Event"
104+
msgid "Email Confirmation to Create Account for {app_name}"
109105
msgstr "E-Mail-Bestätigung zum Erstellen eines Kontos für Open-Event"
110106

111107
#: app/api/helpers/system_mails.py:161
112-
#, python-format
113108
msgid "Your email has been already changed"
114109
msgstr "Ihre E-Mail-Adresse wurde bereits geändert"
115110

@@ -148,8 +143,7 @@ msgstr "Teilnahme {event_name} am {event_date}, {event_time} ({invoice_id}) "
148143
msgid ""
149144
"Your tickets for {event_name} on {event_date} at {event_time} "
150145
"({invoice_id}) "
151-
msgstr ""
152-
"Tickets für {event_name} am {event_date} um {event_time} ({invoice_id}) "
146+
msgstr "Tickets für {event_name} am {event_date} um {event_time} ({invoice_id}) "
153147

154148
#: app/api/helpers/system_mails.py:206
155149
msgid ""
@@ -160,7 +154,6 @@ msgstr ""
160154
"{buyer_email} ({invoice_id}) "
161155

162156
#: app/api/helpers/system_mails.py:211
163-
#, python-format
164157
msgid "Your order for {event_name} has been cancelled ({invoice_id})"
165158
msgstr "Ihre Bestellung für {event_name} wurde storniert ({invoice_id})"
166159

@@ -187,8 +180,8 @@ msgstr ""
187180
#: app/api/helpers/system_mails.py:244
188181
msgid "Please pay your overdue invoice for {event_name} for {date} on {app_name}"
189182
msgstr ""
190-
"Bitte bezahlen Sie Ihre überfällige Rechnung für {event_name} am {date} auf "
191-
"{app_name}"
183+
"Bitte bezahlen Sie Ihre überfällige Rechnung für {event_name} am {date} "
184+
"auf {app_name}"
192185

193186
#: app/api/helpers/system_mails.py:250
194187
msgid "Event {event_name} has been imported"
@@ -203,7 +196,6 @@ msgid "Test Mail Subject"
203196
msgstr "Betreff der Test-E-Mail"
204197

205198
#: app/api/helpers/system_mails.py:273
206-
#, python-format
207199
msgid "Video Moderator of video {video_name} at event {event_name}"
208200
msgstr ""
209201
"Sie wurden als Videomoderator für {video_name} bei der Veranstaltung "
@@ -214,7 +206,8 @@ msgid "Join {event_name} from {group_name} on {event_date}"
214206
msgstr "Jetzt teilnehmen! {event_name} von {group_name} am {event_date}"
215207

216208
#: app/api/helpers/system_mails.py:283
217-
msgid "{event_name} is over. Thank you for using eventyay!"
209+
#, fuzzy
210+
msgid "{event_name} is over. Thank you for using {app_name}!"
218211
msgstr "{event_name} ist vorbei. Danke, dass Sie {app_name} nutzen!"
219212

220213
#: app/api/helpers/system_mails.py:288
@@ -1702,3 +1695,4 @@ msgstr "Nachricht des Veranstalters"
17021695
#~ "diese Rechnung falsch ist oder Fragen"
17031696
#~ " haben, können Sie sich an unser "
17041697
#~ "Support-Team wenden."
1698+

‎app/translations/es/LC_MESSAGES/messages.po‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: v1\n"
1010
"Report-Msgid-Bugs-To: open-event@googlegroups.com\n"
11-
"POT-Creation-Date: 2021-11-11 18:59+0530\n"
11+
"POT-Creation-Date: 2021-11-12 00:49+0530\n"
1212
"PO-Revision-Date: 2017-01-12 15:23+0000\n"
1313
"Last-Translator: Aaron Chan <achn357@gmail.com>\n"
1414
"Language: es\n"
@@ -79,7 +79,7 @@ msgid "Welcome to {app_name}. Please verify your account"
7979
msgstr ""
8080

8181
#: app/api/helpers/system_mails.py:156
82-
msgid "Email Confirmation to Create Account for Open-Event"
82+
msgid "Email Confirmation to Create Account for {app_name}"
8383
msgstr ""
8484

8585
#: app/api/helpers/system_mails.py:161
@@ -173,7 +173,7 @@ msgid "Join {event_name} from {group_name} on {event_date}"
173173
msgstr ""
174174

175175
#: app/api/helpers/system_mails.py:283
176-
msgid "{event_name} is over. Thank you for using eventyay!"
176+
msgid "{event_name} is over. Thank you for using {app_name}!"
177177
msgstr ""
178178

179179
#: app/api/helpers/system_mails.py:288
@@ -1660,3 +1660,9 @@ msgstr ""
16601660
#~ "assistance."
16611661
#~ msgstr ""
16621662

1663+
#~ msgid "Email Confirmation to Create Account for Open-Event"
1664+
#~ msgstr ""
1665+
1666+
#~ msgid "{event_name} is over. Thank you for using eventyay!"
1667+
#~ msgstr ""
1668+

‎app/translations/fr/LC_MESSAGES/messages.po‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: v1\n"
1010
"Report-Msgid-Bugs-To: open-event@googlegroups.com\n"
11-
"POT-Creation-Date: 2021-11-11 18:59+0530\n"
11+
"POT-Creation-Date: 2021-11-12 00:49+0530\n"
1212
"PO-Revision-Date: 2016-12-09 05:23+0000\n"
1313
"Last-Translator: Ridhwanul Haque <rhemon19@gmail.com>\n"
1414
"Language: fr\n"
@@ -79,7 +79,7 @@ msgid "Welcome to {app_name}. Please verify your account"
7979
msgstr ""
8080

8181
#: app/api/helpers/system_mails.py:156
82-
msgid "Email Confirmation to Create Account for Open-Event"
82+
msgid "Email Confirmation to Create Account for {app_name}"
8383
msgstr ""
8484

8585
#: app/api/helpers/system_mails.py:161
@@ -173,7 +173,7 @@ msgid "Join {event_name} from {group_name} on {event_date}"
173173
msgstr ""
174174

175175
#: app/api/helpers/system_mails.py:283
176-
msgid "{event_name} is over. Thank you for using eventyay!"
176+
msgid "{event_name} is over. Thank you for using {app_name}!"
177177
msgstr ""
178178

179179
#: app/api/helpers/system_mails.py:288
@@ -1659,3 +1659,9 @@ msgstr ""
16591659
#~ "assistance."
16601660
#~ msgstr ""
16611661

1662+
#~ msgid "Email Confirmation to Create Account for Open-Event"
1663+
#~ msgstr ""
1664+
1665+
#~ msgid "{event_name} is over. Thank you for using eventyay!"
1666+
#~ msgstr ""
1667+

‎app/translations/hi/LC_MESSAGES/messages.po‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: v1\n"
1010
"Report-Msgid-Bugs-To: open-event@googlegroups.com\n"
11-
"POT-Creation-Date: 2021-11-11 18:59+0530\n"
11+
"POT-Creation-Date: 2021-11-12 00:49+0530\n"
1212
"PO-Revision-Date: 2021-10-21 11:29+0000\n"
1313
"Last-Translator: progmatic99 <uprt.am54@gmail.com>\n"
1414
"Language: hi\n"
@@ -79,7 +79,7 @@ msgid "Welcome to {app_name}. Please verify your account"
7979
msgstr ""
8080

8181
#: app/api/helpers/system_mails.py:156
82-
msgid "Email Confirmation to Create Account for Open-Event"
82+
msgid "Email Confirmation to Create Account for {app_name}"
8383
msgstr ""
8484

8585
#: app/api/helpers/system_mails.py:161
@@ -173,7 +173,7 @@ msgid "Join {event_name} from {group_name} on {event_date}"
173173
msgstr ""
174174

175175
#: app/api/helpers/system_mails.py:283
176-
msgid "{event_name} is over. Thank you for using eventyay!"
176+
msgid "{event_name} is over. Thank you for using {app_name}!"
177177
msgstr ""
178178

179179
#: app/api/helpers/system_mails.py:288
@@ -1657,3 +1657,9 @@ msgstr ""
16571657
#~ "assistance."
16581658
#~ msgstr ""
16591659

1660+
#~ msgid "Email Confirmation to Create Account for Open-Event"
1661+
#~ msgstr ""
1662+
1663+
#~ msgid "{event_name} is over. Thank you for using eventyay!"
1664+
#~ msgstr ""
1665+

0 commit comments

Comments
 (0)