Merge pull request #831 from setmao/fix_talk_length

Fix talk length
pycontw · Jul 16, 2020 · ef8a4d2 · ef8a4d2
2 parents 491aaf8 + fdf1e5d
commit ef8a4d2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/locale/zh_Hant/LC_MESSAGES/django.po b/src/locale/zh_Hant/LC_MESSAGES/django.po
@@ -2832,14 +2832,14 @@ msgstr "講者"
 #: templates/pycontw-2020/events/talk_list.html:15
 msgid ""
 "The two conference days are packed with talks about Python by speakers from "
-"Taiwan and around the world. The talks will be either 30- or 45-minute long. "
+"Taiwan and around the world. The talks will be either 15- or 30-minute long. "
 "Three tracks of talks will be delivered simultaneously, all with different "
 "topics and difficulties. We suggest you to plan beforehand, and choose what "
 "you want to listen based on your interests. Many people take notes on the "
 "program schedule before the meeting so they don't end up in the wrong place."
 msgstr ""
 "演講為會期兩天最主要的活動，屆時將會有來自台灣各地與全球的講者分享他們在 "
-"Python 相關的發現。Talk 有 30 分鐘與 45 分鐘兩種長度，每天都將有三軌議程同步"
+"Python 相關的發現。Talk 有 15 分鐘與 30 分鐘兩種長度，每天都將有三軌議程同步"
 "進行，配合各個演講的難易度與類型，選擇自己有興趣的主題聆聽。許多人都會事先筆"
 "記想聽的議程，才不會跑錯地點。"
 

diff --git a/src/templates/pycontw-2020/events/talk_list.html b/src/templates/pycontw-2020/events/talk_list.html
@@ -12,7 +12,7 @@ <h1>{% trans 'Talks' %}</h1>
 </section>
 
 <article>
-	<p>{% blocktrans trimmed %}The two conference days are packed with talks about Python by speakers from Taiwan and around the world. The talks will be either 30- or 45-minute long. Three tracks of talks will be delivered simultaneously, all with different topics and difficulties. We suggest you to plan beforehand, and choose what you want to listen based on your interests. Many people take notes on the program schedule before the meeting so they don't end up in the wrong place.{% endblocktrans %}</p>
+	<p>{% blocktrans trimmed %}The two conference days are packed with talks about Python by speakers from Taiwan and around the world. The talks will be either 15- or 30-minute long. Three tracks of talks will be delivered simultaneously, all with different topics and difficulties. We suggest you to plan beforehand, and choose what you want to listen based on your interests. Many people take notes on the program schedule before the meeting so they don't end up in the wrong place.{% endblocktrans %}</p>
 	<p>{% blocktrans trimmed %}<em>Program schedule is subject to change.</em> Please check this page frequently to get the latest version.{% endblocktrans %}</p>
 </article>