Merge pull request pycontw#1115 from pycontw/update/2023-cfp

FIx/2023-cfp
Lee-W · Jan 20, 2023 · c09b7af · c09b7af
2 parents 32181aa + 396ae7d
commit c09b7af
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 33 deletions.
diff --git a/src/locale/en_US/LC_MESSAGES/django.po b/src/locale/en_US/LC_MESSAGES/django.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PyCon TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-01-08 22:15+0800\n"
+"POT-Creation-Date: 2023-01-19 22:59+0800\n"
 "PO-Revision-Date: 2022-07-11 02:23+0800\n"
 "Last-Translator: Tom Chen <[email protected]>\n"
 "Language-Team: English (United States) (http:https://www.transifex.com/pycon-"
@@ -242,14 +242,12 @@ msgid "detailed description"
 msgstr "detailed description"
 
 #: core/models.py:153 core/models.py:163 core/models.py:173 core/models.py:224
-#: core/models.py:234 proposals/models.py:268 reviews/models.py:122
-#: reviews/models.py:137
+#: proposals/models.py:268 reviews/models.py:122 reviews/models.py:137
 msgid "Yes"
 msgstr "Yes"
 
 #: core/models.py:154 core/models.py:164 core/models.py:174 core/models.py:225
-#: core/models.py:235 proposals/models.py:269 reviews/models.py:123
-#: reviews/models.py:138
+#: proposals/models.py:269 reviews/models.py:123 reviews/models.py:138
 msgid "No"
 msgstr "No"
 
@@ -305,24 +303,24 @@ msgstr "prefer event time"
 msgid "living in Taiwan"
 msgstr "living in Taiwan"
 
-#: core/models.py:264 reviews/admin.py:51
+#: core/models.py:259 reviews/admin.py:51
 msgid "Key"
 msgstr "Key"
 
-#: core/models.py:268 proposals/models.py:62 users/models.py:198
+#: core/models.py:263 proposals/models.py:62 users/models.py:198
 #: users/models.py:313
 msgid "user"
 msgstr "user"
 
-#: core/models.py:271
+#: core/models.py:266
 msgid "Created"
 msgstr "created at"
 
-#: core/models.py:274
+#: core/models.py:269
 msgid "Token"
 msgstr ""
 
-#: core/models.py:275
+#: core/models.py:270
 msgid "Tokens"
 msgstr ""
 
@@ -734,12 +732,11 @@ msgstr ""
 #: proposals/forms/mixins.py:92
 msgid ""
 "Whether you agree to give permission to PyCon Taiwan to refer your talk "
-"proposal to your local PyCon community if your proposal did not get "
-"accepted(APAC only)."
+"proposal to your local PyCon community if your proposal did not get accepted."
 msgstr ""
 "Whether you agree to give permission to PyCon Taiwan to refer your talk "
 "proposal to your local PyCon community if your proposal did not get "
-"accepted(APAC only)."
+"accepted."
 
 #: proposals/forms/mixins.py:97
 msgid ""

diff --git a/src/locale/zh_Hant/LC_MESSAGES/django.po b/src/locale/zh_Hant/LC_MESSAGES/django.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PyCon TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-01-08 22:15+0800\n"
+"POT-Creation-Date: 2023-01-19 22:59+0800\n"
 "PO-Revision-Date: 2022-07-11 02:25+0800\n"
 "Last-Translator: Tom Chen <[email protected]>\n"
 "Language-Team: Chinese Traditional (http:https://www.transifex.com/pycon-taiwan/"
@@ -249,14 +249,12 @@ msgid "detailed description"
 msgstr "詳細說明"
 
 #: core/models.py:153 core/models.py:163 core/models.py:173 core/models.py:224
-#: core/models.py:234 proposals/models.py:268 reviews/models.py:122
-#: reviews/models.py:137
+#: proposals/models.py:268 reviews/models.py:122 reviews/models.py:137
 msgid "Yes"
 msgstr "是"
 
 #: core/models.py:154 core/models.py:164 core/models.py:174 core/models.py:225
-#: core/models.py:235 proposals/models.py:269 reviews/models.py:123
-#: reviews/models.py:138
+#: proposals/models.py:269 reviews/models.py:123 reviews/models.py:138
 msgid "No"
 msgstr "否"
 
@@ -312,24 +310,24 @@ msgstr "偏好議程時間"
 msgid "living in Taiwan"
 msgstr "是否住在台灣"
 
-#: core/models.py:264 reviews/admin.py:51
+#: core/models.py:259 reviews/admin.py:51
 msgid "Key"
 msgstr "鍵"
 
-#: core/models.py:268 proposals/models.py:62 users/models.py:198
+#: core/models.py:263 proposals/models.py:62 users/models.py:198
 #: users/models.py:313
 msgid "user"
 msgstr "使用者"
 
-#: core/models.py:271
+#: core/models.py:266
 msgid "Created"
 msgstr "建立時間"
 
-#: core/models.py:274
+#: core/models.py:269
 msgid "Token"
 msgstr "驗證碼"
 
-#: core/models.py:275
+#: core/models.py:270
 msgid "Tokens"
 msgstr "驗證碼"
 
@@ -730,11 +728,10 @@ msgstr "可以在接近或大會之後補上投影片連結，不需要在投稿
 #: proposals/forms/mixins.py:92
 msgid ""
 "Whether you agree to give permission to PyCon Taiwan to refer your talk "
-"proposal to your local PyCon community if your proposal did not get "
-"accepted(APAC only)."
+"proposal to your local PyCon community if your proposal did not get accepted."
 msgstr ""
 "若投稿沒有入選，是否有意願讓 PyCon Taiwan 將該篇稿件轉介至您所在地的 PyCon 社"
-"群(只限 APAC 地區)。"
+"群。"
 
 #: proposals/forms/mixins.py:97
 msgid ""

diff --git a/src/proposals/forms/mixins.py b/src/proposals/forms/mixins.py
@@ -91,7 +91,7 @@ class Meta:
  'referring_policy': _(
  "Whether you agree to give permission to PyCon Taiwan to refer your "
  "talk proposal to your local PyCon community if your proposal did not "
- "get accepted(APAC only)."
+ "get accepted."
  ),
  'objective': _(
  "<p><a href='#' data-toggle='modal' "

diff --git a/src/proposals/forms/proposals.py b/src/proposals/forms/proposals.py
@@ -122,6 +122,7 @@ class Meta(TalkProposalMixin.Meta):
  'supplementary',
  'recording_policy',
  'live_stream_policy',
+ 'referring_policy',
  'first_time_speaker',
  'slide_link',
  ]

diff --git a/src/static/css/pages/_proposals.scss b/src/static/css/pages/_proposals.scss
@@ -68,6 +68,12 @@ body.dashboard{
  padding: 0;
  color:#3E6DF5;
  }
+ a {
+ color: #4045bc;
+ }
+ a:hover {
+ color: #252987;
+ }
  }
  .main-container{
  background:#46467A;

diff --git a/src/static/pycontw-2023/_includes/_bootstrap-variables.scss b/src/static/pycontw-2023/_includes/_bootstrap-variables.scss
@@ -16,7 +16,7 @@ $gray-light: lighten($gray-base, 46.7%) !default; // #777
 $gray-lighterish: lighten($gray-base, 80%) !default;
 // $gray-lighter: lighten($gray-base, 93.5%) !default; // #eee
 
-// $brand-primary: darken(#428bca, 6.5%) !default; // #337ab7
+$brand-primary: #e8a4e9 !default;
 // $brand-success: #5cb85c !default;
 // $brand-info: #5bc0de !default;
 // $brand-warning: #f0ad4e !default;
@@ -30,7 +30,7 @@ $gray-lighterish: lighten($gray-base, 80%) !default;
 // //** Background color for `<body>`.
 // $body-bg: #fff !default;
 // //** Global text color on `<body>`.
-$text-color: $gray !default;
+$text-color: #f0ebf5 !default;
 
 // //** Global textual link color.
 // $link-color: $brand-primary !default;
@@ -671,7 +671,7 @@ $state-danger-text: #f15a39;
 // //** Background color of the whole progress component
 // $progress-bg: #f5f5f5 !default;
 // //** Progress bar text color
-// $progress-bar-color: #fff !default;
+$progress-bar-color: #333 !default;
 // //** Variable for setting rounded corners on progress bar.
 // $progress-border-radius: $border-radius-base !default;
 

diff --git a/src/static/pycontw-2023/styles/page.scss b/src/static/pycontw-2023/styles/page.scss
@@ -412,6 +412,5 @@ ul.custom_ul {
 @import "pages/portal";
 @import "pages/sponsorship-prospectus";
 @import "pages/live";
-@import "pages/community-track";
 @import "pages/job-listings";
 @import "pages/discord";
diff --git a/src/templates/pycontw-2023/contents/_base.html b/src/templates/pycontw-2023/contents/_base.html
@@ -3,7 +3,7 @@
 {% load static %}
 
 {% block styles %}
-<link rel="stylesheet" type="text/x-scss" href="{% static 'pycontw-2022/styles/page.scss' %}">
+<link rel="stylesheet" type="text/x-scss" href="{% static 'pycontw-2023/styles/page.scss' %}">
 {% endblock %}
 
 

diff --git a/src/templates/pycontw-2023/contents/en/about/code-of-conduct.html b/src/templates/pycontw-2023/contents/en/about/code-of-conduct.html
@@ -70,7 +70,7 @@ <h3>Confidentiality</h3>
 
 <h3>Report Handling Procedure</h3>
 <p>When you make a report to an incident responder, they will gather information about the incident according to the <strong>Procedure For Incident Response.</strong></p>
-<p>After an incident responder takes the report, they will immediately consult with the PyCon Taiwan staff, unless there is a conflict of interest (involved directly with one of the PyCon Taiwan / APAC staff), in which case any non-interested parties will be contacted.</p>
+<p>After an incident responder takes the report, they will immediately consult with the PyCon Taiwan staff, unless there is a conflict of interest (involved directly with one of the PyCon Taiwan staff), in which case any non-interested parties will be contacted.</p>
 <p>If the incident is ongoing and needs to be immediately addressed, any lead incident responder may take appropriate action to ensure the safety of everyone involved. If the situation requires it, this may take the form of a referral to an appropriate non-PyCon agency, including the law enforcement in Taiwan.</p>
 <p>If the incident is less urgent, the report will be discussed by the event staff, who will meet to determine an appropriate response.</p>