From c4ceb3cdae16934a6fa4d450534d6a8a072f94ff Mon Sep 17 00:00:00 2001 From: Jan Grewe Date: Tue, 10 Sep 2019 17:12:42 +0200 Subject: [PATCH] handle umlauts, improve response text --- email_client.py | 15 +++++++++++---- response.txt | 13 ++++++++----- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/email_client.py b/email_client.py index 47149fd..f953fbd 100644 --- a/email_client.py +++ b/email_client.py @@ -74,6 +74,13 @@ class Participation(object): msg_body = re.sub(r'=20', ' ', msg_body) msg_body = re.sub(r'=\n', '', msg_body) msg_body = re.sub(r'=E2=82=AC', 'EUR', msg_body) + msg_body = re.sub(r'=C3=BC', 'ü', msg_body) + msg_body = re.sub(r'=C3=9C', 'Ü', msg_body) + msg_body = re.sub(r'=C3=A4', 'ä', msg_body) + msg_body = re.sub(r'=C3=84', 'Ä', msg_body) + msg_body = re.sub(r'=C3=B6', 'ö', msg_body) + msg_body = re.sub(r'=C3=96', 'Ö', msg_body) + msg_body = re.sub(r'=C3=9F', 'ss', msg_body) msg_body = re.sub(r'&', 'and', msg_body) lines = msg_body.split('\n') @@ -182,13 +189,13 @@ class Participation(object): str += "Institution: %s\n" % self._institution str += "Phone: %s\n" % self._phone str += "e-Mail: %s\n" % self._email - str += "Career stage: %s %s\n" % ("senior" if "pro" in self._role else "student", + str += "Career stage: %s %s\n" % ("senior, " if "pro" in self._role else "student, ", "non-member" if "NonMember" in self._role else "member of Ethological Soc.") - str += "Farewell event: %s\n" % "Yes" if self.farewell_event else "No" + str += "Farewell event: %s\n" % ("Yes" if self.farewell_event else "No") str += "Fee: %3.2f EUR\n" % self.fee str += "Lab tour: %s\n" % ( "No" if len(self.labtour) == 0 else "Yes, " + ", ".join(self.labtour)) - str += "Gwinner award: %s\n" % "Yes" if self.gwinner_award else "No" - str += "Food preferences: %s, %s, %s, %s\n" % ("no prefs" if self._food_normal else "", + str += "Gwinner award: %s\n" % ("Yes" if self.gwinner_award else "No") + str += "Food preferences: %s, %s, %s, %s\n" % ("no special preferences" if self._food_normal else "", "vegetarian" if self._food_vegi else "", "vegan" if self._food_vegan else "", "gluten free" if self._food_gluten else "") diff --git a/response.txt b/response.txt index f7a4f73..d7e7bf2 100644 --- a/response.txt +++ b/response.txt @@ -1,19 +1,22 @@ thank you for registering for the 15th annual meeting of the Ethological Society held in Tuebingen 18 - 21 February 2020. +We are loocking forward welcoming you in Tuebingen. + + By registering you agree to pay the respective conference fee (plus -costs of the farewell event, if applicable). Payments must be received +costs of the farewell event, if applicable; see below). Payments must be received by 15 Jan 2020. Wire transfer to: Account holder: Universität Tübingen Bank: Kreissparkasse Tübingen -IBAN: DE13 6415 0020 0000 0130 04, +IBAN: DE13 6415 0020 0000 0130 04 BIC: SOLADES1TUB -Purpose of use: etho2020, Fonds 3190, PSP 3132012401 +Purpose of use: etho2020, Fonds 3190, PSP 3132012401, [YourName] For more information visit the conference website www.etho2020.de - -Abstract submission is handled via this site: https://abstracts.g-node.org/conference/etho2020 +Accomodation information is available through the tourist office: https://www.tuebingen-info.de/de/mein-aufenthalt/uebernachten +Abstract submission (01 October until 30 Nov 2019) is handled via this site: https://abstracts.g-node.org/conference/etho2020 Please contact us if the information below is incorrect.