From 99808a929be067230d4badf489f10b63b22f3205 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Aug 2021 23:42:26 +0000 Subject: [PATCH 01/44] chore(deps): bump path-parse from 1.0.6 to 1.0.7 Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7. - [Release notes](https://github.com/jbgutierrez/path-parse/releases) - [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7) --- updated-dependencies: - dependency-name: path-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 2f94d917b..aff2fe86b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3098,9 +3098,9 @@ path-key@^2.0.0, path-key@^2.0.1: integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= path-parse@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" - integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== path-platform@~0.11.15: version "0.11.15" From 66cb28a054088a0c4fbac99a6955cd59c1e079db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Jan 2022 19:11:18 +0000 Subject: [PATCH 02/44] chore(deps): bump ipython from 7.12.0 to 7.16.3 in /requirements Bumps [ipython](https://github.com/ipython/ipython) from 7.12.0 to 7.16.3. - [Release notes](https://github.com/ipython/ipython/releases) - [Commits](https://github.com/ipython/ipython/compare/7.12.0...7.16.3) --- updated-dependencies: - dependency-name: ipython dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index e0167b507..539b6b0d9 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -67,7 +67,7 @@ certifi>=2019.11.28 # Better python shell. # http://ipython.org/ -ipython==7.12.0 +ipython==7.16.3 # The most feature-rich and easy-to-use library for processing XML and HTML in # the Python language. From 687fcdcdda071d02d6edc88d42fa510217d78b21 Mon Sep 17 00:00:00 2001 From: "Wei-Hsiang (Matt) Wang" Date: Wed, 8 Mar 2023 15:11:03 +0800 Subject: [PATCH 03/44] chore(ci): install from dev requirements --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b52b207b2..49f4bae75 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -38,7 +38,7 @@ jobs: - name: Set up Python dependencies run: | pip install -U pip - pip install -r requirements/ci.txt + pip install -r requirements/dev.txt - uses: actions/setup-node@v3 with: From baa45ba81e35ea1f3fd5ac924290ce9133d396d6 Mon Sep 17 00:00:00 2001 From: Matt Wang Date: Thu, 9 Mar 2023 13:55:04 +0800 Subject: [PATCH 04/44] chore: delete ci requirements --- requirements/ci.txt | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 requirements/ci.txt diff --git a/requirements/ci.txt b/requirements/ci.txt deleted file mode 100644 index 02327311c..000000000 --- a/requirements/ci.txt +++ /dev/null @@ -1,2 +0,0 @@ --r dev.txt -pycrypto From 7e27dcb526f850d6b26a28dbb796de718c123e85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cianhsieh2028=E2=80=9D?= <“ian.yshsieh@gmail.com”> Date: Thu, 29 Jun 2023 00:55:34 +0800 Subject: [PATCH 05/44] Adjust color setting of review edit view --- src/static/css/pages/_proposals.scss | 4 ++-- src/static/pycontw-2023/_includes/_bootstrap-variables.scss | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/static/css/pages/_proposals.scss b/src/static/css/pages/_proposals.scss index 053fec4ac..5e55a5a7e 100644 --- a/src/static/css/pages/_proposals.scss +++ b/src/static/css/pages/_proposals.scss @@ -122,7 +122,7 @@ body.dashboard{ display: inline-block; text-decoration: none; padding: 0 0.5em; - color: $text-color; + color: $diff-text-color; } del { background-color: lighten($brand-danger, 33.5%); @@ -146,7 +146,7 @@ body.dashboard{ } ins > ins { padding: 0; - background-color: lighten($brand-success, 20%); + background-color: $diff-text-bg-color; } } .markdown-field { diff --git a/src/static/pycontw-2023/_includes/_bootstrap-variables.scss b/src/static/pycontw-2023/_includes/_bootstrap-variables.scss index 16d63a472..d294383f4 100644 --- a/src/static/pycontw-2023/_includes/_bootstrap-variables.scss +++ b/src/static/pycontw-2023/_includes/_bootstrap-variables.scss @@ -32,6 +32,10 @@ $brand-primary: #e8a4e9 !default; // //** Global text color on ``. $text-color: #f0ebf5 !default; +// //** Color setting for review edit view. +$diff-text-color: #3c0970 !default; +$diff-text-bg-color: #eba292 !default; + // //** Global textual link color. // $link-color: $brand-primary !default; // //** Link hover color set via `darken()` function. From 6da114e7351b7ce531f5aaa74c260efc25b8942d Mon Sep 17 00:00:00 2001 From: Winnie Date: Mon, 10 Jul 2023 18:13:09 +0800 Subject: [PATCH 06/44] test(attendee): add test cases for attendee apis --- src/attendee/tests.py | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/attendee/tests.py b/src/attendee/tests.py index e69de29bb..d1b61ea26 100644 --- a/src/attendee/tests.py +++ b/src/attendee/tests.py @@ -0,0 +1,31 @@ +import pytest +from django.conf import settings +from registry.helper import reg +from attendee.models import Attendee +from core.models import Token + + +@pytest.mark.parametrize('attendee_token,status,num_channel', [ + ('123', 400, 0), + ('1234', 200, 0), + ('1234', 200, 1), + ('1234', 200, 2), +]) +@pytest.mark.django_db +def test_attendee(drf_api_client, bare_user, attendee_token, status, num_channel): + token = Token.objects.get_or_create(user=bare_user) + drf_api_client.credentials(HTTP_AUTHORIZATION="Token " + str(token[0])) + attendee = Attendee(token="1234") + attendee.save() # insert to database + # add slug + key_prefix = f"{settings.CONFERENCE_DEFAULT_SLUG}.live." + reg["pycontw-1999.live.r1"] = "video_old_id" # unrelated + for i in range(num_channel): + reg[f"{key_prefix}r{i}"] = f"video_id_{i}" + print(f"{key_prefix}r{i}") + + # test + response = drf_api_client.post('/api/attendee/verify/', data={"token": attendee_token}) + assert response.status_code == status + if status == 200: + assert len(response.json()["youtube_infos"]) == num_channel From 74b334a5f1124365b22d81fd98605c37bad42d9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cianhsieh2028=E2=80=9D?= <“ian.yshsieh@gmail.com”> Date: Wed, 12 Jul 2023 21:14:34 +0800 Subject: [PATCH 07/44] Drop the use of scss variables and use real values instead --- src/static/css/pages/_proposals.scss | 4 ++-- src/static/pycontw-2023/_includes/_bootstrap-variables.scss | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/static/css/pages/_proposals.scss b/src/static/css/pages/_proposals.scss index 5e55a5a7e..d86d3e015 100644 --- a/src/static/css/pages/_proposals.scss +++ b/src/static/css/pages/_proposals.scss @@ -122,7 +122,7 @@ body.dashboard{ display: inline-block; text-decoration: none; padding: 0 0.5em; - color: $diff-text-color; + color: #3c0970; } del { background-color: lighten($brand-danger, 33.5%); @@ -146,7 +146,7 @@ body.dashboard{ } ins > ins { padding: 0; - background-color: $diff-text-bg-color; + background-color: #eba292; } } .markdown-field { diff --git a/src/static/pycontw-2023/_includes/_bootstrap-variables.scss b/src/static/pycontw-2023/_includes/_bootstrap-variables.scss index d294383f4..16d63a472 100644 --- a/src/static/pycontw-2023/_includes/_bootstrap-variables.scss +++ b/src/static/pycontw-2023/_includes/_bootstrap-variables.scss @@ -32,10 +32,6 @@ $brand-primary: #e8a4e9 !default; // //** Global text color on ``. $text-color: #f0ebf5 !default; -// //** Color setting for review edit view. -$diff-text-color: #3c0970 !default; -$diff-text-bg-color: #eba292 !default; - // //** Global textual link color. // $link-color: $brand-primary !default; // //** Link hover color set via `darken()` function. From 7fff5818e7492bbf40a221abfe3f80528dac930b Mon Sep 17 00:00:00 2001 From: Winnie Date: Wed, 12 Jul 2023 22:22:24 +0800 Subject: [PATCH 08/44] fix linter --- src/attendee/tests.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/attendee/tests.py b/src/attendee/tests.py index d1b61ea26..252861424 100644 --- a/src/attendee/tests.py +++ b/src/attendee/tests.py @@ -16,13 +16,12 @@ def test_attendee(drf_api_client, bare_user, attendee_token, status, num_channel token = Token.objects.get_or_create(user=bare_user) drf_api_client.credentials(HTTP_AUTHORIZATION="Token " + str(token[0])) attendee = Attendee(token="1234") - attendee.save() # insert to database + attendee.save() # insert to database # add slug key_prefix = f"{settings.CONFERENCE_DEFAULT_SLUG}.live." reg["pycontw-1999.live.r1"] = "video_old_id" # unrelated for i in range(num_channel): reg[f"{key_prefix}r{i}"] = f"video_id_{i}" - print(f"{key_prefix}r{i}") # test response = drf_api_client.post('/api/attendee/verify/', data={"token": attendee_token}) From 388d71222e97acae7c83745a5a8a4c65f238b7cd Mon Sep 17 00:00:00 2001 From: erik1110 Date: Mon, 24 Jul 2023 00:42:36 +0800 Subject: [PATCH 09/44] [feat] add test cases --- src/ccip/tests/api/test_ccip.py | 17 +++++++++++++++++ src/ccip/tests/conftest.py | 20 ++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 src/ccip/tests/api/test_ccip.py create mode 100644 src/ccip/tests/conftest.py diff --git a/src/ccip/tests/api/test_ccip.py b/src/ccip/tests/api/test_ccip.py new file mode 100644 index 000000000..f09d2a1d1 --- /dev/null +++ b/src/ccip/tests/api/test_ccip.py @@ -0,0 +1,17 @@ +import pytest +from django.conf import settings + +endpoint = "/ccip" + +@pytest.mark.django_db +def test_ccip_api_view(client, sample_tags): + + response = client.get(endpoint, follow=True) + assert response.status_code == 200 + + data = response.json() + + assert 'tags' in data + assert isinstance(data['tags'], list) + print("data:", data) + assert data['tags'][0]['en']['name'] == "English talk" diff --git a/src/ccip/tests/conftest.py b/src/ccip/tests/conftest.py new file mode 100644 index 000000000..f2727914e --- /dev/null +++ b/src/ccip/tests/conftest.py @@ -0,0 +1,20 @@ +import pytest +from unittest.mock import Mock +from events.models import ( + CustomEvent, KeynoteEvent, + ProposedTalkEvent, ProposedTutorialEvent, + SponsoredEvent, +) + +@pytest.fixture +def sample_tags(): + tags = [ + { + "id": "lng-ENEN", + "zh": {}, + "en": { + "name": "English talk" + } + }, + ] + return tags \ No newline at end of file From cd93d397c3a2390e21a7f573e900d41adb919089 Mon Sep 17 00:00:00 2001 From: "Wei-Hsiang (Matt) Wang" Date: Tue, 8 Aug 2023 06:31:16 +0000 Subject: [PATCH 10/44] feat(sponsor): make sponsor en name as a required field --- src/sponsors/translation.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/sponsors/translation.py b/src/sponsors/translation.py index fcfec5f0c..7db2532c5 100644 --- a/src/sponsors/translation.py +++ b/src/sponsors/translation.py @@ -5,6 +5,7 @@ class SponsorTranslationOptions(TranslationOptions): fields = ('name', 'intro', 'subtitle',) + required_languages = {'default': ('name',)} class OpenRoleTranslationOptions(TranslationOptions): From 5fb88a921800f6048e975c770709d904143e7923 Mon Sep 17 00:00:00 2001 From: Josix Date: Wed, 30 Aug 2023 15:45:25 +0800 Subject: [PATCH 11/44] feat(ccip): let session start/end time follow local timezone --- src/ccip/views.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ccip/views.py b/src/ccip/views.py index abfceae1f..5c3c9e655 100644 --- a/src/ccip/views.py +++ b/src/ccip/views.py @@ -1,4 +1,5 @@ import operator +from datetime import timezone, timedelta from django.http import JsonResponse from django.templatetags.static import static @@ -166,11 +167,15 @@ def _transform_session(request, event, type_key, info_getter): for speaker in event_info.speakers ] + LOCAL_TIMEZONE = timezone(offset=timedelta(hours=8)) + # Explicitly show the local timezone used by OPass(CCIP) + # to avoid iOS device showing UTC+0 time without changing it to local time + # https://github.com/CCIP-App/CCIP-iOS/issues/54 session = { 'id': f'{type_key}-{event_info.pk}', 'type': type_key, - 'start': event.begin_time.value.isoformat() if event.begin_time else None, - 'end': event.end_time.value.isoformat() if event.end_time else None, + 'start': event.begin_time.value.astimezone(LOCAL_TIMEZONE).isoformat() if event.begin_time else None, + 'end': event.end_time.value.astimezone(LOCAL_TIMEZONE).isoformat() if event.end_time else None, 'slide': event_info.slide_link, 'speakers': [speaker['id'] for speaker in speakers], 'tags': [tag['id'] for tag in tags], From bad1dec61b237dbc0edce865074b5b01307aa603 Mon Sep 17 00:00:00 2001 From: iknowright Date: Tue, 4 Jul 2023 22:03:19 +0800 Subject: [PATCH 12/44] feat(category-filter): add category filter for proposal review table --- src/reviews/views.py | 27 ++++++++++++++++--- .../reviews/_includes/proposal_table.html | 20 +++++++++++++- .../default/reviews/talk_proposal_list.html | 4 +-- 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/src/reviews/views.py b/src/reviews/views.py index 5eda7064b..9fd08f261 100644 --- a/src/reviews/views.py +++ b/src/reviews/views.py @@ -55,6 +55,10 @@ def get_ordering(self): order_key = self.order_keys.get(params.get('order', '').lower()) return order_key or '?' + def get_category(self): + params = self.request.GET + return params.get('category') + def get_queryset(self): user = self.request.user qs = ( @@ -64,10 +68,7 @@ def get_queryset(self): .exclude(review__reviewer=user) .annotate(Count('review')) ) - # params = self.request.GET - # category = params.get('category', '').upper() - # if category: - # proposals = proposals.filter(category=category) + ordering = self.get_ordering() if ordering == '?': # We don't use order_by('?') because it is crazy slow, and instead @@ -85,8 +86,23 @@ def get_queryset(self): else: qs = qs.order_by(ordering) self.ordering = ordering + self.category = self.get_category() + return qs + def get_category_metrics(self, context): + count = 0 + categories = set() + for proposal in context["object_list"]: + if proposal.category == self.category: + count += 1 + if proposal.category not in categories: + categories.add(proposal.category) + return { + "category_options": categories, + "filtered_count": count if count else len(context["object_list"]) + } + def get_context_data(self, **kwargs): review_stage = self.reviews_state.reviews_stage verdicted_proposals = ( @@ -132,9 +148,12 @@ def get_context_data(self, **kwargs): ), 'vote': vote_mapping, 'ordering': self.ordering, + 'category': self.category, 'query_string': self.request.GET.urlencode(), **self.reviews_state._asdict(), + **self.get_category_metrics(context), }) + print(context) return context def get_stage_1_reviews(self): diff --git a/src/templates/default/reviews/_includes/proposal_table.html b/src/templates/default/reviews/_includes/proposal_table.html index 627a34bd6..49acb05a1 100644 --- a/src/templates/default/reviews/_includes/proposal_table.html +++ b/src/templates/default/reviews/_includes/proposal_table.html @@ -33,6 +33,21 @@ + + + {% if verdict %} {% trans 'Decision' %} {% endif %} @@ -41,6 +56,7 @@ {% for proposal in proposals %} + {% if proposal.category == category or not category %} {% if proposal.accepted == None %} {{ proposal.review__count }} @@ -49,8 +65,9 @@
reviews_enough %} class="grayed-out" {% endif %} >{{ proposal.title }}
{{ proposal.get_language_display }} + {{ proposal.category }} {% if proposal.accepted != None %} - {{ proposal.get_accepted_display }} + {{ proposal.get_accepted_display }} {% endif %} {% if proposal.accepted == None %} @@ -62,6 +79,7 @@ {% endif %} + {% endif %} {% endfor %} diff --git a/src/templates/default/reviews/talk_proposal_list.html b/src/templates/default/reviews/talk_proposal_list.html index 4d65c8393..76741b523 100644 --- a/src/templates/default/reviews/talk_proposal_list.html +++ b/src/templates/default/reviews/talk_proposal_list.html @@ -48,7 +48,7 @@

{% trans 'Personal Review Stats' %}

    - +
  • {% trans 'Reviewed Talk Proposals' %} ({{ total_reviewed_amount }})
    • {% if review_stage == 2 and proposals_with_verdict %}
  • {% trans 'Talk Proposals With Decision' %} ({{ proposals_with_verdict|length }})
    • @@ -59,7 +59,7 @@

    {% trans 'Personal Review Stats' %}

    {% if object_list %} - {% include 'reviews/_includes/proposal_table.html' with proposals=object_list verdict=False %} + {% include 'reviews/_includes/proposal_table.html' with proposals=object_list verdict=False category_options=category_options %} {% else %}

    {% blocktrans %}You have reviewed all talk proposals.{% endblocktrans %}

    {% endif %} From c686cb283386aeb51fa4c04d7033c43d2f21a6ab Mon Sep 17 00:00:00 2001 From: erik1110 Date: Sat, 16 Sep 2023 11:40:24 +0800 Subject: [PATCH 13/44] [feat] add rooms and session_types --- src/ccip/tests/api/test_ccip.py | 79 ++++++++++++++++++++++++++++++--- 1 file changed, 72 insertions(+), 7 deletions(-) diff --git a/src/ccip/tests/api/test_ccip.py b/src/ccip/tests/api/test_ccip.py index f09d2a1d1..cf3d8c931 100644 --- a/src/ccip/tests/api/test_ccip.py +++ b/src/ccip/tests/api/test_ccip.py @@ -1,17 +1,82 @@ import pytest from django.conf import settings -endpoint = "/ccip" +endpoint = "/ccip/" -@pytest.mark.django_db -def test_ccip_api_view(client, sample_tags): +@pytest.mark.django_db +def test_(client): response = client.get(endpoint, follow=True) assert response.status_code == 200 + data = response.json() + assert 'rooms' in data + rooms = data['rooms'] + for room in rooms: + assert 'id' in room + assert 'zh' in room + assert 'en' in room +@pytest.mark.django_db +def test_session_types(client): + response = client.get(endpoint, follow=True) + assert response.status_code == 200 + expected_session_types = [ + { + "id": "event", + "zh": { + "name": "活動" + }, + "en": { + "name": "event" + } + }, + { + "id": "break", + "zh": { + "name": "休息" + }, + "en": { + "name": "break" + } + }, + { + "id": "keynote", + "zh": { + "name": "基調演講" + }, + "en": { + "name": "keynote" + } + }, + { + "id": "sponsored", + "zh": { + "name": "贊助" + }, + "en": { + "name": "sponsored" + } + }, + { + "id": "tutorial", + "zh": { + "name": "專業課程" + }, + "en": { + "name": "tutorial" + } + }, + { + "id": "talk", + "zh": { + "name": "演講" + }, + "en": { + "name": "talk" + } + } + ] data = response.json() + assert 'session_types' in data + assert data['session_types'] == expected_session_types - assert 'tags' in data - assert isinstance(data['tags'], list) - print("data:", data) - assert data['tags'][0]['en']['name'] == "English talk" From 92dfdc5264e8a2516307aa83dcffa9c8ee292bae Mon Sep 17 00:00:00 2001 From: erik1110 Date: Sat, 16 Sep 2023 11:53:25 +0800 Subject: [PATCH 14/44] [feat] add data structure test --- src/ccip/tests/api/test_ccip.py | 83 +++++---------------------------- 1 file changed, 12 insertions(+), 71 deletions(-) diff --git a/src/ccip/tests/api/test_ccip.py b/src/ccip/tests/api/test_ccip.py index cf3d8c931..70e75646b 100644 --- a/src/ccip/tests/api/test_ccip.py +++ b/src/ccip/tests/api/test_ccip.py @@ -3,80 +3,21 @@ endpoint = "/ccip/" +def assert_data_structure(data, key): + items = data.get(key, []) + for item in items: + assert 'id' in item + assert 'zh' in item + assert 'en' in item + assert 'name' in item['zh'] + assert 'name' in item['en'] @pytest.mark.django_db -def test_(client): +def test_data_structure(client): response = client.get(endpoint, follow=True) assert response.status_code == 200 data = response.json() - assert 'rooms' in data - rooms = data['rooms'] - for room in rooms: - assert 'id' in room - assert 'zh' in room - assert 'en' in room - -@pytest.mark.django_db -def test_session_types(client): - response = client.get(endpoint, follow=True) - assert response.status_code == 200 - expected_session_types = [ - { - "id": "event", - "zh": { - "name": "活動" - }, - "en": { - "name": "event" - } - }, - { - "id": "break", - "zh": { - "name": "休息" - }, - "en": { - "name": "break" - } - }, - { - "id": "keynote", - "zh": { - "name": "基調演講" - }, - "en": { - "name": "keynote" - } - }, - { - "id": "sponsored", - "zh": { - "name": "贊助" - }, - "en": { - "name": "sponsored" - } - }, - { - "id": "tutorial", - "zh": { - "name": "專業課程" - }, - "en": { - "name": "tutorial" - } - }, - { - "id": "talk", - "zh": { - "name": "演講" - }, - "en": { - "name": "talk" - } - } - ] - data = response.json() - assert 'session_types' in data - assert data['session_types'] == expected_session_types + assert_data_structure(data, 'session_types') + assert_data_structure(data, 'tags') + assert_data_structure(data, 'rooms') From f5d80e7226abf42df125f17e03783de00876910d Mon Sep 17 00:00:00 2001 From: erik1110 Date: Sat, 16 Sep 2023 11:55:25 +0800 Subject: [PATCH 15/44] [feat] remove conftest --- src/ccip/tests/conftest.py | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 src/ccip/tests/conftest.py diff --git a/src/ccip/tests/conftest.py b/src/ccip/tests/conftest.py deleted file mode 100644 index f2727914e..000000000 --- a/src/ccip/tests/conftest.py +++ /dev/null @@ -1,20 +0,0 @@ -import pytest -from unittest.mock import Mock -from events.models import ( - CustomEvent, KeynoteEvent, - ProposedTalkEvent, ProposedTutorialEvent, - SponsoredEvent, -) - -@pytest.fixture -def sample_tags(): - tags = [ - { - "id": "lng-ENEN", - "zh": {}, - "en": { - "name": "English talk" - } - }, - ] - return tags \ No newline at end of file From 036fc211d9cc6c1c38225725edcdf20f5d7e2e26 Mon Sep 17 00:00:00 2001 From: erik1110 Date: Sat, 16 Sep 2023 11:58:28 +0800 Subject: [PATCH 16/44] [feat] add assert checking key --- src/ccip/tests/api/test_ccip.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ccip/tests/api/test_ccip.py b/src/ccip/tests/api/test_ccip.py index 70e75646b..840656a5c 100644 --- a/src/ccip/tests/api/test_ccip.py +++ b/src/ccip/tests/api/test_ccip.py @@ -4,6 +4,7 @@ endpoint = "/ccip/" def assert_data_structure(data, key): + assert key in data items = data.get(key, []) for item in items: assert 'id' in item From b1582ce72728bf4c1b20ce6e2f8e1ea28f226315 Mon Sep 17 00:00:00 2001 From: erik1110 Date: Sat, 16 Sep 2023 12:10:56 +0800 Subject: [PATCH 17/44] [feat] add sessions test --- src/ccip/tests/api/test_ccip.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/ccip/tests/api/test_ccip.py b/src/ccip/tests/api/test_ccip.py index 840656a5c..67853c55e 100644 --- a/src/ccip/tests/api/test_ccip.py +++ b/src/ccip/tests/api/test_ccip.py @@ -22,3 +22,22 @@ def test_data_structure(client): assert_data_structure(data, 'session_types') assert_data_structure(data, 'tags') assert_data_structure(data, 'rooms') + +@pytest.mark.django_db +def test_session(client): + response = client.get(endpoint, follow=True) + data = response.json() + assert 'sessions' in data + sessions = data.get('sessions', []) + # 檢查每個 session 是否包含所需的字段 + required_fields = [ + "id", "type", "start", "end", "slide", "speakers", "tags", + "en", "zh", "room", "broadcast", "qa", "live", "record" + ] + for session in sessions: + for field in required_fields: + assert field in session + assert 'title' in session['en'] + assert 'description' in session['en'] + assert 'title' in session['zh'] + assert 'description' in session['zh'] From 68e82bdd0b63908286928030d006e3dd5dab462b Mon Sep 17 00:00:00 2001 From: erik1110 Date: Sat, 16 Sep 2023 12:16:10 +0800 Subject: [PATCH 18/44] [feat] add speakers test --- src/ccip/tests/api/test_ccip.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/ccip/tests/api/test_ccip.py b/src/ccip/tests/api/test_ccip.py index 67853c55e..421cd1313 100644 --- a/src/ccip/tests/api/test_ccip.py +++ b/src/ccip/tests/api/test_ccip.py @@ -12,6 +12,10 @@ def assert_data_structure(data, key): assert 'en' in item assert 'name' in item['zh'] assert 'name' in item['en'] + if key == "speakers": + assert 'avatar' in item + assert 'bio' in item['zh'] + assert 'bio' in item['en'] @pytest.mark.django_db def test_data_structure(client): @@ -22,6 +26,7 @@ def test_data_structure(client): assert_data_structure(data, 'session_types') assert_data_structure(data, 'tags') assert_data_structure(data, 'rooms') + assert_data_structure(data, 'speakers') @pytest.mark.django_db def test_session(client): From 470634d8b04b98891f744e28e70b96f81e431fc2 Mon Sep 17 00:00:00 2001 From: erik1110 Date: Sat, 16 Sep 2023 12:24:53 +0800 Subject: [PATCH 19/44] [feat] remove needless code --- src/ccip/tests/api/test_ccip.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ccip/tests/api/test_ccip.py b/src/ccip/tests/api/test_ccip.py index 421cd1313..84fcf834f 100644 --- a/src/ccip/tests/api/test_ccip.py +++ b/src/ccip/tests/api/test_ccip.py @@ -1,5 +1,4 @@ import pytest -from django.conf import settings endpoint = "/ccip/" From a136a0ea0fbe1bdf63fc2d2f158786e8b66416c2 Mon Sep 17 00:00:00 2001 From: erik1110 Date: Sat, 16 Sep 2023 12:30:56 +0800 Subject: [PATCH 20/44] [feat] flake8 --- src/ccip/tests/api/test_ccip.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ccip/tests/api/test_ccip.py b/src/ccip/tests/api/test_ccip.py index 84fcf834f..755adbba8 100644 --- a/src/ccip/tests/api/test_ccip.py +++ b/src/ccip/tests/api/test_ccip.py @@ -2,6 +2,7 @@ endpoint = "/ccip/" + def assert_data_structure(data, key): assert key in data items = data.get(key, []) @@ -16,6 +17,7 @@ def assert_data_structure(data, key): assert 'bio' in item['zh'] assert 'bio' in item['en'] + @pytest.mark.django_db def test_data_structure(client): response = client.get(endpoint, follow=True) @@ -27,6 +29,7 @@ def test_data_structure(client): assert_data_structure(data, 'rooms') assert_data_structure(data, 'speakers') + @pytest.mark.django_db def test_session(client): response = client.get(endpoint, follow=True) From c698ae70c15e716d4e106c8219e7ca1d68139309 Mon Sep 17 00:00:00 2001 From: iknowright Date: Sat, 16 Sep 2023 16:08:40 +0800 Subject: [PATCH 21/44] build(dockerfile): enhanced production dockerfile --- Dockerfile | 52 +++++++++++++++++++++++----------------------------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8da5a22c1..dd3332c44 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,36 +1,35 @@ -FROM python:3.6-buster +# [Node Stage to get node_modolues and node dependencies] +FROM node:8.16.0-buster-slim as node_stage + +COPY ./yarn.lock yarn.lock +COPY ./package.json package.json + +RUN npm install -g yarn +RUN yarn install --dev --frozen-lockfile \ + && rm -rf $HOME/.cache/yarn/* + + +# [Python Stage for Django web server] +FROM python:3.6-slim-buster as python_stage + +COPY --from=node_stage /node_modules /usr/local/lib/node_modules +COPY --from=node_stage /usr/local/bin/node /usr/local/bin/node ENV PYTHONUNBUFFERED 1 ENV BASE_DIR /usr/local ENV APP_DIR $BASE_DIR/app -ENV NVM_INSTALLER_URL https://raw.githubusercontent.com/creationix/nvm/v0.33.0/install.sh -ENV NVM_DIR $BASE_DIR/nvm -ENV YARN_VERSION 1.15.2-1 -ENV NODE_VERSION 8.16.0 +# make nodejs accessible and executable globally +ENV NODE_PATH /usr/local/lib/node_modules/ +ENV PATH /usr/local/bin:$PATH -# make nodejs and yarn accessible and executable globally -ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules -ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH # Add bin directory used by `pip install --user` -ENV PATH "/home/docker/.local/bin:${PATH}" +ENV PATH /home/docker/.local/bin:$PATH # Infrastructure tools # gettext is used for django to compile .po to .mo files. RUN apt-get update -RUN apt-get install apt-utils -y -RUN apt-get update -RUN apt-get install gettext python3-pip -y - -# Install Node and Yarn from upstream -RUN curl -o- $NVM_INSTALLER_URL | bash \ - && . $NVM_DIR/nvm.sh \ - && nvm install $NODE_VERSION \ - && nvm alias default $NODE_VERSION \ - && nvm use default \ - && nvm --version \ - && npm install -g yarn \ - && yarn --version +RUN apt-get install gettext libpq-dev gcc -y # APP directory setup RUN adduser --system --disabled-login docker \ @@ -38,20 +37,15 @@ RUN adduser --system --disabled-login docker \ && chown -R docker:nogroup "$BASE_DIR" "$APP_DIR" USER docker -WORKDIR $APP_DIR # Only copy and install requirements to improve caching between builds # Install Python dependencies COPY --chown=docker:nogroup ./requirements $APP_DIR/requirements RUN pip3 install --user -r "$APP_DIR/requirements/production.txt" \ && rm -rf $HOME/.cache/pip/* -# Install Javascript dependencies -COPY --chown=docker:nogroup ./package.json $APP_DIR/package.json -COPY --chown=docker:nogroup ./yarn.lock $APP_DIR/yarn.lock -RUN yarn install --dev --frozen-lockfile \ - && rm -rf $HOME/.cache/yarn/* + # Finally, copy all the project files along with source files -COPY --chown=docker:nogroup . $APP_DIR +COPY --chown=docker:nogroup ./ $APP_DIR WORKDIR $APP_DIR/src VOLUME $APP_DIR/src/media From eb9bdd1c6178d78bba9e29cf0027d3f2d53023ec Mon Sep 17 00:00:00 2001 From: iknowright Date: Mon, 25 Sep 2023 17:51:00 +0800 Subject: [PATCH 22/44] build(dev.Dockerfile): optimize dev.Dockerfile --- dev.Dockerfile | 46 +++++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 27 deletions(-) diff --git a/dev.Dockerfile b/dev.Dockerfile index a1500c6ef..be4ca4edd 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -1,44 +1,36 @@ -FROM python:3.6-slim-buster +# [Node Stage to get node_modolues and node dependencies] +FROM node:8.16.0-buster-slim as node_stage + +COPY ./yarn.lock yarn.lock +COPY ./package.json package.json + +RUN npm install -g yarn +RUN yarn install --dev --frozen-lockfile + +# [Python Stage for Django web server] +FROM python:3.6-slim-buster as python_stage -ENV PYTHONUNBUFFERED 1 WORKDIR /app -ENV BASE_DIR /usr/local +COPY --from=node_stage /node_modules ./node_modules +COPY --from=node_stage /usr/local/bin/node /usr/local/bin/node -ENV NVM_INSTALLER_URL https://raw.githubusercontent.com/creationix/nvm/v0.33.0/install.sh -ENV NVM_DIR $BASE_DIR/nvm -ENV YARN_VERSION 1.15.2-1 -ENV NODE_VERSION 8.16.0 +ENV PYTHONUNBUFFERED 1 +ENV BASE_DIR /usr/local -# make nodejs and yarn accessible and executable globally -ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH +# make node accessible and executable globally +ENV PATH /usr/local/bin:$PATH # Infrastructure tools # gettext is used for django to compile .po to .mo files. RUN apt-get update -RUN apt-get install apt-utils -y -RUN apt-get update -RUN apt-get install gettext python3-pip -y - -# Install Node and Yarn from upstream -RUN curl -o- $NVM_INSTALLER_URL | bash \ - && . $NVM_DIR/nvm.sh \ - && nvm install $NODE_VERSION \ - && nvm alias default $NODE_VERSION \ - && nvm use default \ - && nvm --version \ - && npm install -g yarn \ - && yarn --version +RUN apt-get install gettext gcc -y +# Only copy and install requirements to improve caching between builds # Install Python dependencies COPY ./requirements ./requirements RUN pip3 install -r ./requirements/dev.txt -# # Install Javascript dependencies -COPY ./package.json ./package.json -COPY ./yarn.lock ./yarn.lock -RUN yarn install --dev --frozen-lockfile - # for entry point COPY ./docker-entrypoint.sh /docker-entrypoint.sh RUN chmod +x /docker-entrypoint.sh From e97e4e0d7510c0a0c237cabcc1b8d23a9c15cea8 Mon Sep 17 00:00:00 2001 From: iknowright Date: Thu, 28 Sep 2023 16:31:00 +0800 Subject: [PATCH 23/44] build(dockerfiles): rewrite dockerfiles and made the dev.Dockerfile arm compatible --- dev.Dockerfile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dev.Dockerfile b/dev.Dockerfile index be4ca4edd..24766b616 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -4,6 +4,9 @@ FROM node:8.16.0-buster-slim as node_stage COPY ./yarn.lock yarn.lock COPY ./package.json package.json +RUN apt-get update +RUN apt-get install python-pip -y + RUN npm install -g yarn RUN yarn install --dev --frozen-lockfile @@ -18,13 +21,15 @@ COPY --from=node_stage /usr/local/bin/node /usr/local/bin/node ENV PYTHONUNBUFFERED 1 ENV BASE_DIR /usr/local -# make node accessible and executable globally -ENV PATH /usr/local/bin:$PATH - # Infrastructure tools # gettext is used for django to compile .po to .mo files. RUN apt-get update -RUN apt-get install gettext gcc -y +RUN apt-get install -y \ + libpq-dev \ + gcc \ + zlib1g-dev \ + libjpeg62-turbo-dev \ + gettext # Only copy and install requirements to improve caching between builds # Install Python dependencies From 55e38d8358d2d93e080b0b2d106bf9cbb1cb4d5c Mon Sep 17 00:00:00 2001 From: erik1110 Date: Fri, 6 Oct 2023 12:48:32 +0800 Subject: [PATCH 24/44] [refactor] update testing code --- src/ccip/tests/api/test_ccip.py | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/src/ccip/tests/api/test_ccip.py b/src/ccip/tests/api/test_ccip.py index 755adbba8..623c2e9fc 100644 --- a/src/ccip/tests/api/test_ccip.py +++ b/src/ccip/tests/api/test_ccip.py @@ -17,23 +17,7 @@ def assert_data_structure(data, key): assert 'bio' in item['zh'] assert 'bio' in item['en'] - -@pytest.mark.django_db -def test_data_structure(client): - response = client.get(endpoint, follow=True) - assert response.status_code == 200 - data = response.json() - - assert_data_structure(data, 'session_types') - assert_data_structure(data, 'tags') - assert_data_structure(data, 'rooms') - assert_data_structure(data, 'speakers') - - -@pytest.mark.django_db -def test_session(client): - response = client.get(endpoint, follow=True) - data = response.json() +def assert_data_structure_session(data): assert 'sessions' in data sessions = data.get('sessions', []) # 檢查每個 session 是否包含所需的字段 @@ -48,3 +32,15 @@ def test_session(client): assert 'description' in session['en'] assert 'title' in session['zh'] assert 'description' in session['zh'] + +@pytest.mark.django_db +def test_data_structure(client): + response = client.get(endpoint, follow=True) + assert response.status_code == 200 + data = response.json() + + assert_data_structure(data, 'session_types') + assert_data_structure(data, 'tags') + assert_data_structure(data, 'rooms') + assert_data_structure(data, 'speakers') + assert_data_structure_session(data) From 00d8bd19bdb317b840e94842f6b978cc036ba4a6 Mon Sep 17 00:00:00 2001 From: erik1110 Date: Fri, 6 Oct 2023 14:15:45 +0800 Subject: [PATCH 25/44] [style] flake8 --- src/ccip/tests/api/test_ccip.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ccip/tests/api/test_ccip.py b/src/ccip/tests/api/test_ccip.py index 623c2e9fc..0828fc150 100644 --- a/src/ccip/tests/api/test_ccip.py +++ b/src/ccip/tests/api/test_ccip.py @@ -17,6 +17,7 @@ def assert_data_structure(data, key): assert 'bio' in item['zh'] assert 'bio' in item['en'] + def assert_data_structure_session(data): assert 'sessions' in data sessions = data.get('sessions', []) @@ -33,6 +34,7 @@ def assert_data_structure_session(data): assert 'title' in session['zh'] assert 'description' in session['zh'] + @pytest.mark.django_db def test_data_structure(client): response = client.get(endpoint, follow=True) From c44dd2caee0f0b1e64d54182d68bf375d78da959 Mon Sep 17 00:00:00 2001 From: Matt Wang Date: Wed, 15 Mar 2023 21:48:19 +0800 Subject: [PATCH 26/44] chore(events): remove schedule views --- src/events/urls.py | 4 -- src/events/views.py | 156 ++------------------------------------------ 2 files changed, 4 insertions(+), 156 deletions(-) diff --git a/src/events/urls.py b/src/events/urls.py index a32dbdee2..4c112d9d3 100644 --- a/src/events/urls.py +++ b/src/events/urls.py @@ -4,10 +4,6 @@ from events import views urlpatterns = [ - url(r'^schedule/$', views.ScheduleView.as_view(), name='events_schedule'), - url(r'^schedule/new/$', views.ScheduleCreateView.as_view()), - - url(r'^talks/$', views.TalkListView.as_view(), name='events_talk_list'), url(r'^tutorials/$', views.TutorialListView.as_view(), diff --git a/src/events/views.py b/src/events/views.py index 20d090650..e7078f290 100644 --- a/src/events/views.py +++ b/src/events/views.py @@ -1,27 +1,16 @@ -import collections -import itertools import logging -from django.conf import settings -from django.contrib.auth.mixins import PermissionRequiredMixin -from django.urls import reverse from django.db.models import Count, Prefetch -from django.http import HttpResponseNotFound, HttpResponseRedirect -from django.utils import translation -from django.utils.translation import gettext_lazy as _ -from django.views.generic import CreateView, DetailView, ListView, TemplateView +from django.views.generic import DetailView, ListView -from core.mixins import FormValidMessageMixin from core.utils import OrderedDefaultDict, TemplateExistanceStatusResponse from proposals.models import AdditionalSpeaker, TalkProposal, TutorialProposal -from .forms import ScheduleCreationForm from .models import ( - EVENT_ROOMS, Schedule, Time, Location, - CustomEvent, KeynoteEvent, SponsoredEvent, - ProposedTalkEvent, ProposedTutorialEvent, + ProposedTalkEvent, + ProposedTutorialEvent, + SponsoredEvent, ) -from .renderers import render_all logger = logging.getLogger(__name__) @@ -91,143 +80,6 @@ def get_queryset(self): return qs -class ScheduleView(TemplateView): - template_name = 'events/schedule.html' - response_class = TemplateExistanceStatusResponse - - def get(self, request, *args, **kwargs): - try: - self.schedule = Schedule.objects.latest() - except Schedule.DoesNotExist: - redirect_url = settings.SCHEDULE_REDIRECT_URL - if not redirect_url: - return HttpResponseNotFound() - return HttpResponseRedirect(redirect_url) - return super().get(request, *args, **kwargs) - - def get_context_data(self, **kwargs): - return super().get_context_data( - schedule_html=self.schedule.html, - schedule_days=collections.OrderedDict([ - (key, {'name': value}) - for key, value in settings.EVENTS_DAY_NAMES.items() - ]), - **kwargs - ) - - -class ScheduleCreateMixin: - form_class = ScheduleCreationForm - form_valid_message = _('New talk schedule generated successfully.') - permission_required = ['events.add_schedule'] - template_name = 'events/schedule_create.html' - response_class = TemplateExistanceStatusResponse - - def get_success_url(self): - return reverse('events_schedule') - - -class ScheduleCreate2016View( - ScheduleCreateMixin, FormValidMessageMixin, PermissionRequiredMixin, CreateView -): - def get_context_data(self, **kwargs): - return super().get_context_data(content=render_all(), **kwargs) - - -def _room_sort_key(room): - return room.split('-', 1)[-1] - - -class ScheduleCreateView( - ScheduleCreateMixin, FormValidMessageMixin, PermissionRequiredMixin, CreateView -): - event_querysets = [ - CustomEvent.objects.all().exclude(location=Location.OTHER), - KeynoteEvent.objects.all().exclude(location=Location.OTHER), - ( - ProposedTalkEvent.objects - .select_related('proposal__submitter') - .annotate(_additional_speaker_count=Count( - 'proposal__additionalspeaker_set', - )).exclude(location=Location.OTHER) - ), - SponsoredEvent.objects.select_related('host').exclude(location=Location.OTHER), - ( - ProposedTutorialEvent.objects - .select_related('proposal__submitter') - .annotate(_additional_speaker_count=Count( - 'proposal__additionalspeaker_set', - )).exclude(location=Location.OTHER) - ), - ] - - def get_day_grouped_events(self): - begin_time_event_dict = collections.defaultdict(set) - for qs in self.event_querysets: - for event in qs.select_related('begin_time', 'end_time'): - begin_time_event_dict[event.begin_time].add(event) - - day_info_dict = collections.OrderedDict( - (date, { - 'name': name, - 'rooms': set(), - 'slots': {}, - 'slots_mobile': {}, - 'timeline': {}, - }) for date, name in settings.EVENTS_DAY_NAMES.items() - ) - - times = list(Time.objects.order_by('value')) - end_time_iter = iter(times) - next(end_time_iter, None) - - for begin, end in zip(times, end_time_iter): - try: - day_info = day_info_dict[begin.value.date()] - except KeyError: - logger.warn('Invalid time sot dropped: {}'.format(begin)) - continue - for event in begin_time_event_dict[begin]: - location = event.location - day_info['slots'].setdefault(location, []) - day_info['slots_mobile'].setdefault(event.begin_time, []) - day_info['timeline'].setdefault('begin', event.begin_time) - day_info['timeline'].setdefault('end', event.end_time) - - day_info['slots'][location].append(event) - day_info['slots_mobile'][event.begin_time].append(event) - day_info['timeline']['begin'] = min( - day_info['timeline']['begin'], - event.begin_time - ) - day_info['timeline']['end'] = max( - day_info['timeline']['end'], - event.end_time - ) - if location in EVENT_ROOMS: - day_info['rooms'].add(location) - - for info in day_info_dict.values(): - # Sort rooms. - info['rooms'] = sorted(info['rooms'], key=_room_sort_key) - - return day_info_dict - - def get_context_data(self, **kwargs): - with translation.override('en-us'): - schedule_days = self.get_day_grouped_events() - - all_rooms = sorted(set(itertools.chain.from_iterable( - info['rooms'] for info in schedule_days.values() - )), key=_room_sort_key) - - return super().get_context_data( - schedule_days=schedule_days, - all_rooms=all_rooms, - **kwargs - ) - - class EventInfoMixin: def is_event_sponsored(self): From 41afb0c380b4fe20259f7d31f7bd935c6f6620f4 Mon Sep 17 00:00:00 2001 From: Matt Wang Date: Wed, 15 Mar 2023 21:49:09 +0800 Subject: [PATCH 27/44] test(events): remove tests of schedule views --- src/core/tests/test_views.py | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/src/core/tests/test_views.py b/src/core/tests/test_views.py index 4b6f9f28a..2cfefc652 100644 --- a/src/core/tests/test_views.py +++ b/src/core/tests/test_views.py @@ -3,12 +3,8 @@ import pytest -from django.conf import settings from django.utils.translation import activate -from events.models import Schedule -from pytest_django.asserts import assertRedirects - @pytest.mark.django_db def test_index_page(client): @@ -98,14 +94,7 @@ def test_content_pages(client, parser, content_page_full_path): assert response.status_code == 200, content_page_full_path -@pytest.fixture -def schedule(db): - """Generate a schedule to prevent the schedule page from returning 404. - """ - return Schedule.objects.create(html='
    ') - - -def test_content_pages_links(client, parser, schedule, content_page_full_path): +def test_content_pages_links(client, parser, content_page_full_path): """Test to make sure all in-site links in a content page work. """ if '/surveys/conference/' in content_page_full_path: @@ -117,14 +106,6 @@ def test_content_pages_links(client, parser, schedule, content_page_full_path): link_status_codes = [] for tag in link_tags: link = tag.get('href') - if "/events/schedule/" in link \ - and settings.SCHEDULE_REDIRECT_URL: - assertRedirects( - client.get(link), - settings.SCHEDULE_REDIRECT_URL, - fetch_redirect_response=False - ) - continue try: status = client.get(link, follow=True).status_code except Exception: # Catch internal server error for better reporting. From ffac27c177c626a24fbd228fd08bfa7210f8df94 Mon Sep 17 00:00:00 2001 From: Matt Wang Date: Wed, 15 Mar 2023 21:51:43 +0800 Subject: [PATCH 28/44] chore(events): remove schedule view templates --- .../pycontw-2023/_includes/menu.html | 2 - .../pycontw-2023/_includes/portal.html | 4 - .../_includes/schedule_custom_event.html | 24 ---- .../_includes/schedule_keynote_event.html | 25 ---- .../events/_includes/schedule_talk_event.html | 36 ------ .../pycontw-2023/events/schedule.html | 48 -------- .../pycontw-2023/events/schedule_create.html | 113 ------------------ 7 files changed, 252 deletions(-) delete mode 100644 src/templates/pycontw-2023/events/_includes/schedule_custom_event.html delete mode 100644 src/templates/pycontw-2023/events/_includes/schedule_keynote_event.html delete mode 100644 src/templates/pycontw-2023/events/_includes/schedule_talk_event.html delete mode 100644 src/templates/pycontw-2023/events/schedule.html delete mode 100644 src/templates/pycontw-2023/events/schedule_create.html diff --git a/src/templates/pycontw-2023/_includes/menu.html b/src/templates/pycontw-2023/_includes/menu.html index a55756f5c..ab336e69a 100644 --- a/src/templates/pycontw-2023/_includes/menu.html +++ b/src/templates/pycontw-2023/_includes/menu.html @@ -13,7 +13,6 @@ {% url 'page' path='speaking/tutorial' as speaking_tutorial_url %} {% url 'page' path='speaking/recording' as speaking_recording_url %} -{% url 'events_schedule' as events_schedule_url %} {% url 'page' path='conference/keynotes' as events_keynote_url %} {% url 'events_talk_list' as events_talk_list_url %} {% url 'events_tutorial_list' as events_tutorial_list_url %} @@ -78,7 +77,6 @@
      -
    • {% trans 'Schedule' %}
    • {% trans 'Keynotes' %}
    • {% trans 'Talks' %}
    • {% trans 'Tutorials' %}
      • diff --git a/src/templates/pycontw-2023/_includes/portal.html b/src/templates/pycontw-2023/_includes/portal.html index e6e381c61..1c7706c4f 100644 --- a/src/templates/pycontw-2023/_includes/portal.html +++ b/src/templates/pycontw-2023/_includes/portal.html @@ -1,9 +1,5 @@ {% load i18n %} -
      - {% trans 'Schedule' %} -
      -
      {% trans 'Collaborative Notes' %}
      diff --git a/src/templates/pycontw-2023/events/_includes/schedule_custom_event.html b/src/templates/pycontw-2023/events/_includes/schedule_custom_event.html deleted file mode 100644 index beefd0999..000000000 --- a/src/templates/pycontw-2023/events/_includes/schedule_custom_event.html +++ /dev/null @@ -1,24 +0,0 @@ -{% load events %} - -
      -
      - {% if event.link_path %} - - {% endif %} -
      -
      -
      -
      -
      {{ event.title }}
      -
      -
      - {{ event.begin_time.value|date:'H:i' }} ~ {{ event.end_time.value|date:'H:i' }} -
      - {% if event.description %} -
      - {{ event.description }} -
      - {% endif %} - {% if event.link_path %}      {% endif %} -
      -
      diff --git a/src/templates/pycontw-2023/events/_includes/schedule_keynote_event.html b/src/templates/pycontw-2023/events/_includes/schedule_keynote_event.html deleted file mode 100644 index 5036a5cd8..000000000 --- a/src/templates/pycontw-2023/events/_includes/schedule_keynote_event.html +++ /dev/null @@ -1,25 +0,0 @@ -{% load events %} - -{% with data=event.get_static_data_for_locale %} - -
      -
      -
      -
      -
      -
      Keynote: {{ data.session.title }}
      - {% if is_remote %} -
      - - Remote - -
      - {% endif %} -
      by {{ data.speaker.name }}
      -
      -
      - {{ event.begin_time.value|date:'H:i' }} ~ {{ event.end_time.value|date:'H:i' }} -
      -
      -       -{% endwith %} diff --git a/src/templates/pycontw-2023/events/_includes/schedule_talk_event.html b/src/templates/pycontw-2023/events/_includes/schedule_talk_event.html deleted file mode 100644 index da8c044cb..000000000 --- a/src/templates/pycontw-2023/events/_includes/schedule_talk_event.html +++ /dev/null @@ -1,36 +0,0 @@ -{% load i18n i18n_plus %} -{% load events %} - - -
      -
      -
      -
      -
      -
      - {{ info.title }} -
      - {% if is_remote %} -
      - - Remote - -
      - {% endif %} -
      by {{ speakers }}
      -
      -
      -
      - {% if not info.recording_policy %} -
      - {% endif %} -
      -
      -
      - {{ event.begin_time.value|date:'H:i' }} ~ {{ event.end_time.value|date:'H:i' }} -
      -
      -       diff --git a/src/templates/pycontw-2023/events/schedule.html b/src/templates/pycontw-2023/events/schedule.html deleted file mode 100644 index f1cb579e1..000000000 --- a/src/templates/pycontw-2023/events/schedule.html +++ /dev/null @@ -1,48 +0,0 @@ -{% extends 'contents/_base.html' %} - -{% load i18n static %} - - -{% block title %}{% trans 'Schedule' %}{% endblock title %} - - -{% block styles %} - {{ block.super }} - - -{% endblock %} - - -{% block body_class %} schedule-page{% endblock body_class %} - - -{% block content %} - -

      {% block pagetitle %}{% trans 'Schedule' %}{% endblock pagetitle %}

      - - {% block schedule %} -
      - {{ schedule_html|safe }} -
      - {% endblock schedule %} - - - - {% block controls %}{% endblock controls %} - -{% endblock content %} - - -{% block scripts %} - {{ block.super }} - -{% endblock scripts %} diff --git a/src/templates/pycontw-2023/events/schedule_create.html b/src/templates/pycontw-2023/events/schedule_create.html deleted file mode 100644 index ab8ccd70a..000000000 --- a/src/templates/pycontw-2023/events/schedule_create.html +++ /dev/null @@ -1,113 +0,0 @@ -{% extends 'events/schedule.html' %} - -{% load i18n static %} -{% load events %} - - -{% block title %}{% trans 'Export New Schedule' %}{% endblock title %} - - -{% block styles %} - {{ block.super }} - -{% endblock %} - - -{% block pagetitle %}{% trans 'Export New Schedule' %}{% endblock pagetitle %} - - -{% block schedule %} -
      -
      -
      - Day 1 (9/5) -
      -
      - Day 2 (9/6) -
      -
      -
      - {% for schedule_date, schedule_info in schedule_days.items %} -
      -
      - {% for room in schedule_info.rooms %} -
      - {% endfor %} -
      - {% with timeline_info=schedule_info.timeline %} - {% with begin=timeline_info.begin.value|date:'H:i' end=timeline_info.end.value|date:'H:i' %} - {% with timeline=begin|gen_timeline:end %} - {% with last_timeline_item=timeline|last %} -
      - {% for t in timeline %} -
      - {{ t.time }} -
      - {% endfor %} - {% for room, slots in schedule_info.slots.items %} - {% for event in slots %} - {% with begin=event.begin_time.value|date:'H:i' end=event.end_time.value|date:'H:i' %} - {% calc_grid_row begin end timeline_info.begin.value|date:'H:i' as grid_row %} -
      - {{ event|event_display }} -
      - {% endwith %} - {% endfor %} - {% endfor %} -
      - {% endwith %} - {% endwith %} - {% endwith %} - {% endwith %} - {% endfor %} -
      - - {% for schedule_date, schedule_info in schedule_days.items %} -
      - {% for begin, slots in schedule_info.slots_mobile.items %} -
      -
      -
      - {{ begin.value|date:'H:i' }} -
      -
      -
      - {% for event in slots %} -
      - {{ event|event_display }} -
      - {% endfor %} -
      -
      - {% endfor %} -
      - {% endfor %} -
      -{% endblock schedule %} - - -{% block controls %} -
      - - - -
      -{% endblock controls %} From fea536515f8f947b3f0e423fe9fb8f76cbeef210 Mon Sep 17 00:00:00 2001 From: Matt Wang Date: Wed, 15 Mar 2023 21:53:38 +0800 Subject: [PATCH 29/44] test(events): remove template tests of schedule page --- src/template_tests/conftest.py | 8 -------- src/template_tests/test_pycontw2016.py | 11 ----------- 2 files changed, 19 deletions(-) delete mode 100644 src/template_tests/conftest.py diff --git a/src/template_tests/conftest.py b/src/template_tests/conftest.py deleted file mode 100644 index 3138a844f..000000000 --- a/src/template_tests/conftest.py +++ /dev/null @@ -1,8 +0,0 @@ -import pytest - -from events.models import Schedule - - -@pytest.fixture -def schedule(db): - return Schedule.objects.create(html='mmm') diff --git a/src/template_tests/test_pycontw2016.py b/src/template_tests/test_pycontw2016.py index b02583540..2050dccde 100644 --- a/src/template_tests/test_pycontw2016.py +++ b/src/template_tests/test_pycontw2016.py @@ -17,17 +17,6 @@ User = get_user_model() -def test_schedule(client, parser, schedule): - r = client.get('/en-us/events/schedule/') - body = parser.parse(r) - - # Make sure every cross-page intra-site link is good. - link_tags = body.cssselect('a[href^="/"]') - assert len(link_tags) != 0 - for tag in link_tags: - assert client.get(tag.get('href'), follow=True).status_code == 200 - - @pytest.mark.django_db @override_settings( # Make sure we don't really send an email. SECRET_KEY='Footage order-flow long-chain hydrocarbons hacker', From ebc337aa488df4a128dcd9fab46bc497196376ca Mon Sep 17 00:00:00 2001 From: Matt Wang Date: Wed, 15 Mar 2023 21:54:24 +0800 Subject: [PATCH 30/44] chore(events): remove schedule-related statics --- src/static/css/main.scss | 45 --- src/static/js/events/schedule.js | 28 -- src/static/js/events/schedule_gen.js | 7 - .../_includes/base/_variables.scss | 4 - src/static/pycontw-2023/scripts/schedule.js | 32 -- src/static/pycontw-2023/styles/page.scss | 1 - .../pycontw-2023/styles/pages/_events.scss | 233 ------------ .../pycontw-2023/styles/pages/_schedule.scss | 342 ------------------ 8 files changed, 692 deletions(-) delete mode 100644 src/static/js/events/schedule.js delete mode 100644 src/static/js/events/schedule_gen.js delete mode 100644 src/static/pycontw-2023/scripts/schedule.js delete mode 100644 src/static/pycontw-2023/styles/pages/_schedule.scss diff --git a/src/static/css/main.scss b/src/static/css/main.scss index 565e2116f..4656ab34a 100644 --- a/src/static/css/main.scss +++ b/src/static/css/main.scss @@ -32,7 +32,6 @@ @import "pages/sponsors"; @import "pages/talks"; @import "pages/venue"; -@import "pages/schedule"; body { @@ -64,42 +63,6 @@ body { text-align: center; } -// schedule - -.schedule-wrapper { - @include make-xs-column(10); - @include make-xs-column-offset(1); - @include make-sm-column(12); - @include make-sm-column-offset(0); - @include make-md-column(10); - @include make-md-column-offset(1); -} -.schedule { - background-color: #fff; - padding-top: .6em; - border-radius: 4px; -} - -.schedule-block { - @include make-sm-column(4); - text-align: center; - color: $schedule-color; - font-size:24px; -} - -// visible in viewport > xs -.schedule__title--lg { - @include make-sm-column(4); - @extend .hidden-xs; - text-align: center; - color: $schedule__title-color; -} - -// visible when viewport < xs -.schedule__title { - @extend .visible-xs-block; - padding-top: .5em; -} // latest-news @@ -348,14 +311,6 @@ body { background-color: white; } -@media (max-width: $screen-sm){ - .schedule{ - padding-top: 0; - } - .schedule__title{ - padding-top: 0; - } -} @media (max-width: $screen-xs) { .sponsorship__call{ diff --git a/src/static/js/events/schedule.js b/src/static/js/events/schedule.js deleted file mode 100644 index 42b10e081..000000000 --- a/src/static/js/events/schedule.js +++ /dev/null @@ -1,28 +0,0 @@ -(function () { - -// $('.talk__title').addClass('hyphenate'); -// Hyphenator.config({useCSS3hyphenation: true}); -// Hyphenator.run(); - -$('.talk__title').dotdotdot({wrap: 'word', watch: true, fallbackToLetter: true}); - -// Scrollspy-like behavior to update the hash on scroll. -if (window.history && window.history.replaceState) { - $(document).on('scroll', function () { - var $document = $(this); - var ids = ['2016-06-05', '2016-06-04', '2016-06-03']; - var hash = ''; - $.each(ids, function () { - if ($document.scrollTop() >= $('#' + this).offset().top - 1) { - hash = '#' + this; - return false; - } - }); - if (hash !== window.location.hash) { - var nurl = window.location.pathname + window.location.search; - window.history.replaceState('', '', nurl + hash); - } - }); -} - -})(); diff --git a/src/static/js/events/schedule_gen.js b/src/static/js/events/schedule_gen.js deleted file mode 100644 index 103de3296..000000000 --- a/src/static/js/events/schedule_gen.js +++ /dev/null @@ -1,7 +0,0 @@ -(function ($) { - -var $form = $('.generation-form'); -$form.removeClass('hide'); -$form.find('input[name="html"]').val($('.schedule').html()); - -})(jQuery); diff --git a/src/static/pycontw-2023/_includes/base/_variables.scss b/src/static/pycontw-2023/_includes/base/_variables.scss index 2af268b93..be9d2ed16 100644 --- a/src/static/pycontw-2023/_includes/base/_variables.scss +++ b/src/static/pycontw-2023/_includes/base/_variables.scss @@ -10,10 +10,6 @@ $quote-color: $theme-focus; // section $section__heading-color: $theme-color; -// schedule -$schedule-color: #F58454; -$schedule__title-color: #ADCDFF; - // intro $intro__heading-color: $theme-color; $intro-color: #686868; diff --git a/src/static/pycontw-2023/scripts/schedule.js b/src/static/pycontw-2023/scripts/schedule.js deleted file mode 100644 index 478756338..000000000 --- a/src/static/pycontw-2023/scripts/schedule.js +++ /dev/null @@ -1,32 +0,0 @@ -// Schedule generation. -const form = document.querySelector('.generation-form') -if (form) { - const html = document.querySelector('.schedule-content').innerHTML - form.querySelector('input[name="html"]').value = html - form.style.display = 'block' -} - - -// Replace localed URL with current locale prefix. -const I18N = JSON.parse(document.getElementById('i18n_variables').textContent) -function findPrefix(u) { - const possiblePrefixes = [] - for (const prefix of I18N.LANGUAGE_PREFIXES) { - if (u.startsWith(prefix)) { - return prefix - } - } - return '' -} -for (const el of document.querySelectorAll('.localed-url')) { - const original = el.getAttribute('href') - if (!original) { - continue - } - const prefix = findPrefix(original) - if (!prefix) { - continue - } - const sub = original.substr(prefix.length) - el.setAttribute('href', `${I18N.LANGUAGE_PREFIX}${sub}`) -} diff --git a/src/static/pycontw-2023/styles/page.scss b/src/static/pycontw-2023/styles/page.scss index 7c9b94569..3261152c0 100644 --- a/src/static/pycontw-2023/styles/page.scss +++ b/src/static/pycontw-2023/styles/page.scss @@ -407,7 +407,6 @@ ul.custom_ul { @import "pages/ticket-info"; @import "pages/tutorials"; @import "pages/venue"; -@import "pages/schedule"; @import "pages/staff"; @import "pages/portal"; @import "pages/sponsorship-prospectus"; diff --git a/src/static/pycontw-2023/styles/pages/_events.scss b/src/static/pycontw-2023/styles/pages/_events.scss index 33fbad935..a343665ca 100644 --- a/src/static/pycontw-2023/styles/pages/_events.scss +++ b/src/static/pycontw-2023/styles/pages/_events.scss @@ -228,236 +228,3 @@ $icon-height: 26px; @include rooms(); } - -@mixin toggleTimetableOrTimeList() { - @media (min-width: 901px) { - .py-schedule-timetable { - display: initial; - - .room-tag { - display: none; - } - } - - .py-schedule-time-list { - display: none; - } - } - - @media (max-width: 900px) { - .py-schedule-timetable { - display: none; - } - - .py-schedule-time-list { - display: initial; - - .room-tag::before { - white-space: initial; - } - } - - .py-schedule-tabs__tab { - padding: 24px; - } - } -} - -main { - max-width: unset; - margin: unset; - padding: 24px; - - .py-schedule { - &-tabs { - display: flex; - justify-content: center; - align-items: center; - - &__tab { - margin: 0 24px 24px; - padding: 24px 72px; - font-family: $header-font-family; - font-size: 20px; - border-radius: 8px; - cursor: default; - - &:hover:not(.--active) { - color: red; - cursor: pointer; - } - - &.--active { - color: $jinger-bread; - background: $salmon; - } - } - } - - &-timetable { - &-header { - position: sticky; - top: 0; - z-index: 1000; - display: flex; - background: transparentize($brick, 0.3); - - &-column { - @include roomDisplayStyle(); - - margin: 8px 8px 8px 0; - padding: 12px 0; - font-size: 18px; - - &:last-child { - margin-right: 0; - } - - &.--timeline { - flex: 1; - background: transparent; - } - - &.--room { - flex: 2; - } - } - - @include rooms(); - - &:not(.--active) { - display: none; - } - } - - &-body { - display: grid; - grid-template-columns: - [times] 1fr - [room-4-r0-start] 2fr - [room-4-r0-end room-5-r1-start] 2fr - [room-5-r1-end room-6-r2-start] 2fr - [room-6-r2-end room-8-r3-start] 2fr - [room-8-r3-end room-7-r4-start] 2fr - [room-7-r4-end]; - grid-column-gap: 8px; - grid-row-gap: 8px; - - &-item { - @include eventItem(); - } - - .room-3-r012 { - grid-column: room-4-r0-start / room-6-r2-end; - } - - .room-4-r0 { - grid-column: room-4-r0-start / room-4-r0-end; - } - - .room-5-r1 { - grid-column: room-5-r1-start / room-5-r1-end; - } - - .room-6-r2 { - grid-column: room-6-r2-start / room-6-r2-end; - } - - .room-7-r4 { - grid-column: room-7-r4-start / room-7-r4-end; - } - - .room-1-r3 { - grid-column: room-8-r3-start / room-8-r3-end; - } - - .room-2-all { - grid-column: room-4-r0-start / room-8-r3-end; - } - - .timeline { - grid-column: times; - justify-self: center; - @include time(); - - &.--hour { - font-size: 20px; - font-weight: 500; - } - - &.--half-an-hour { - font-size: 18px; - } - } - - &:not(.--active) { - display: none; - } - } - } - - &-time-list { - &-section { - &-header { - position: sticky; - position: -webkit-sticky; - top: 0; - z-index: 10; - padding: 16px 0; - background: $brick; - - & > .time { - @include time(); - - font-size: 22px; - } - } - - &-items { - display: flex; - flex-direction: column; - margin: 12px 0; - - &-item { - @include eventItem(); - margin-bottom: 12px; - } - - .room-2-all { - order: 1; - } - - .room-3-r012 { - order: 2; - } - - .room-4-r0 { - order: 3; - } - - .room-5-r1 { - order: 4; - } - - .room-6-r2 { - order: 5; - } - - .room-1-r3 { - order: 6; - } - - .room-7-r4 { - order: 7; - } - } - } - - &:not(.--active) { - display: none; - } - } - } - - @include toggleTimetableOrTimeList(); -} diff --git a/src/static/pycontw-2023/styles/pages/_schedule.scss b/src/static/pycontw-2023/styles/pages/_schedule.scss deleted file mode 100644 index 96379039b..000000000 --- a/src/static/pycontw-2023/styles/pages/_schedule.scss +++ /dev/null @@ -1,342 +0,0 @@ -.schedule-page { - form .button-round { - @include button(276deg, $dark-peach, $maize); - width: 160px; - margin: 24px 0; - text-align: center; - cursor: pointer; - } - - // Icon - $icon-width: 26px; - $icon-height: 26px; - - @mixin icon($name, $margin-top: 0, $x: left, $width: $icon-width) { - &::before { - width: $width; - margin-top: $margin-top; // Visual compensation. - background: url('../assets/icon-#{$name}.svg') top $x no-repeat; - } - } - - @mixin icon-info() { - ul { - @include list-reset(); - text-indent: 0; - li { - - display: flex; - align-content: baseline; - align-items: flex-start; - - > * { - flex: 1; - min-height: 24px; - margin-bottom: 12px; - } - - &:before { - content: ' '; - height: $icon-height; - margin-right: 1rem; - } - - &.speech-en { - @include icon('language-enen', -1px); - } - &.speech-zh { - @include icon('language-zhzh', -1px); - } - &.slides-en { - @include icon('language-enen', 0, right); - } - &.slides-zh { - @include icon('language-zhzh', 0, right); - } - &.language-enen { - @include icon('language-enen', 0, center, 2 * $icon-width); - } - &.language-zhen { - @include icon('language-zhen', 0, center, 2 * $icon-width); - } - &.language-zhzh { - @include icon('language-zhzh', 0, center, 2 * $icon-width); - } - &.python-level-novice { - @include icon('level-1'); - } - &.python-level-intermediate { - @include icon('level-2'); - } - &.python-level-experienced { - @include icon('level-3'); - } - &.no-recording { - @include icon('no-recording', 1px); - } - &.room-R0 { - @include icon('room-R0', 1px, center); - } - &.room-R1 { - @include icon('room-R1', 1px, center); - } - &.room-R2 { - @include icon('room-R2', 1px, center); - } - &.room-R3 { - @include icon('room-R3', 1px, center); - } - &.grass { - @include icon('grass-group', 0, right); - &:before { - background-size: contain; - @include on-desktop() { - height: $icon-height * 1.5; - width: $icon-width * 1.5; - } - } - } - &.snake { - @include icon('snake', 0, right); - &:before { - background-size: contain; - @include on-desktop() { - height: $icon-height * 1.5; - width: $icon-width * 1.5; - } - } - } - } - } - } - - .schedule-legend { - - background: $pale-grey; - word-wrap: break-word; - padding: 32px 24px; - border-radius: 2px; - - @include on-desktop() { - padding: 32px; - columns: 2; - } - @include icon-info(); - } - - .time-table { - width: calc(100% + 50px); - margin: -16px; - background: transparent; - text-align: center; - - // Fonts. - @include text(16px); - tbody, tr, th, td, ul { - // display: block; - @include text(16px); - font-weight: normal; - } - - $border-color: $pale-grey; - // Round corners. - th, td, .time-stack-ribbon[class~='2-all'] + .event-info { - border-radius: 0; - } - .time-stack-ribbon + .event-info { - border-radius: 0; - } - .time-stack-ribbon { - border-radius: 0; - } - - // Not actually a table! - display: block; - thead, tfoot { - display: none; - } - tbody, tr, th, td, ul { - display: block; - } - - th, td, tr{ - display: flex; - align-items: stretch; - justify-content: left; - margin: 0; - padding: 0; - } - - tr { - align-items: flex-start; - - &.slot { - min-height: 100px; - - border-style: solid; - border-width: 0px; - border-left-width: 3px; - border-color: transparent; - border-radius: 4px; - background: $ghost-gray; - - &.custom { - background-color: $light-grayish-yellow; - border: 0px; - } - - &.first-slot { - border-top-color: $gold-yellow; - border-top-width: 1px; - margin-top: 10px; - } - &:hover { - border-left-color: $gold-yellow; - } - - @each $name, $color in ("R123": $gold-yellow, "R0": $gold-yellow, "R1": $egyptian-blue, "R2": $forest-green, "R3": $dark-orange) { - &.slot-room-#{$name} { - &.first-slot { - border-top-color: $gold-yellow; - } - &:hover { - border-left-color: $color; - background: $white; - } - } - } - } - } - - - td { - $slot-padding-top: 20px; - - &.event { - flex: 3; - - .event-info { - display: flex; - flex: 1; - text-align: left; - flex-direction: column; - padding-top: $slot-padding-top; - font-weight: 400; - - a:hover { - text-decoration: none; - } - - .talk-info { - flex: 3; - p { - &.talk-speakers { - color: $light-gray; - } - } - } - - .talk-tags { - @include list-reset(); - display: flex; - justify-content: left; - margin: 0.375rem; - text-indent: 0; - flex: 1; - - > li::before { - content: ' '; - margin-right: 5px; - } - @include on-desktop() { - justify-content: center; - } - } - - @include on-desktop() { - flex-direction: row; - } - } - - &.event-not-first { - border-top: dashed 1px $light-gray; - } - - &.talk, &.tutorial { - @include list-reset(); - @include icon-info(); - } - &.keynote { - .event-info { - flex-direction: column; - } - } - &.custom { - align-self: center; - width: 100%; - .event-info { - @include list-reset(); - @include icon-info(); - padding-top: 0; - justify-content: center; - ul { - display: flex; - justify-content: center; - align-items: center; - li { - margin: 0px 5px 0px 0px; - font-weight: 500; - &:before { - margin-right: 0; - } - &.info { - text-align: center; - &:before { - content: none; - } - } - @include on-desktop { - margin: 0px 10px 0px 0px; - } - } - } - } - } - } - - &.time-table-time { - flex: 1; - flex-direction: column; - @include list-reset(); - @include icon-info(); - padding-top: $slot-padding-top; - padding-left: 20px; - &.custom { - display: none; - } - ul { - margin: 0; - li { - &.time { - text-align: left; - font-size: 16px; - &:before { - content: none; - } - } - } - } - } - } - } - - .room-info { - @include icon-info(); - ul { - margin: 0; - display: flex; - justify-content: center; - text-indent: $icon-width; - } - } -} From aba87b29b70bbf5812c686fadced65e785e35857 Mon Sep 17 00:00:00 2001 From: Matt Wang Date: Wed, 15 Mar 2023 21:55:15 +0800 Subject: [PATCH 31/44] chore(events): remove schedule model and model admin --- src/events/admin.py | 15 ++++++--------- src/events/models.py | 20 -------------------- 2 files changed, 6 insertions(+), 29 deletions(-) diff --git a/src/events/admin.py b/src/events/admin.py index bec13f3b4..840510504 100644 --- a/src/events/admin.py +++ b/src/events/admin.py @@ -14,9 +14,13 @@ from .forms import CustomEventForm from .models import ( - CustomEvent, KeynoteEvent, ProposedTalkEvent, ProposedTutorialEvent, + CustomEvent, JobListingsEvent, - SponsoredEvent, Time, Schedule, + KeynoteEvent, + ProposedTalkEvent, + ProposedTutorialEvent, + SponsoredEvent, + Time, ) from .resources import TimeResource, CustomEventResource @@ -199,10 +203,3 @@ class SponsoredEventAdmin(admin.ModelAdmin): search_fields = ['title', 'abstract'] prepopulated_fields = {'slug': ['title']} raw_id_fields = ['host'] - - -@admin.register(Schedule) -class ScheduleAdmin(admin.ModelAdmin): - fields = ['html', 'created_at'] - readonly_fields = ['created_at'] - list_display = ['created_at'] diff --git a/src/events/models.py b/src/events/models.py index e0b8ad783..3b19d7260 100644 --- a/src/events/models.py +++ b/src/events/models.py @@ -458,23 +458,3 @@ def get_absolute_url(self): return reverse('events_tutorial_detail', kwargs={ 'pk': self.proposal.pk, }) - - -class Schedule(ConferenceRelated): - - html = models.TextField( - verbose_name=_('HTML'), - ) - created_at = models.DateTimeField( - verbose_name=_('created at'), - auto_now_add=True, - ) - - class Meta: - verbose_name = _('Schedule') - verbose_name_plural = _('Schedules') - ordering = ['-created_at'] - get_latest_by = 'created_at' - - def __str__(self): - return gettext('Schedule created at {}').format(self.created_at) From ffa29a33661ae590e30dc20b2e65fec9a147a8c2 Mon Sep 17 00:00:00 2001 From: Matt Wang Date: Wed, 15 Mar 2023 22:11:59 +0800 Subject: [PATCH 32/44] migration(events): remove schedule model --- src/events/migrations/0050_delete_schedule.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/events/migrations/0050_delete_schedule.py diff --git a/src/events/migrations/0050_delete_schedule.py b/src/events/migrations/0050_delete_schedule.py new file mode 100644 index 000000000..9b1ebc851 --- /dev/null +++ b/src/events/migrations/0050_delete_schedule.py @@ -0,0 +1,16 @@ +# Generated by Django 3.1.7 on 2023-03-15 14:09 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('events', '0049_rename_willing_to'), + ] + + operations = [ + migrations.DeleteModel( + name='Schedule', + ), + ] From 686785fde2c94972d020296fc6af0497de358f3f Mon Sep 17 00:00:00 2001 From: Matt Wang Date: Wed, 15 Mar 2023 21:56:05 +0800 Subject: [PATCH 33/44] chore(events): remove schedule-related form --- src/events/forms.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/events/forms.py b/src/events/forms.py index 77e08f395..ab564e4ab 100644 --- a/src/events/forms.py +++ b/src/events/forms.py @@ -1,12 +1,6 @@ from django import forms -from .models import CustomEvent, Schedule - - -class ScheduleCreationForm(forms.ModelForm): - class Meta: - model = Schedule - fields = ['html'] +from .models import CustomEvent class CustomEventForm(forms.ModelForm): From a76adc45928e0174753246792a0860f433e9e815 Mon Sep 17 00:00:00 2001 From: Matt Wang Date: Wed, 15 Mar 2023 21:56:23 +0800 Subject: [PATCH 34/44] chore(events): remove schedule-related settings --- src/core/context_processors.py | 4 ---- src/pycontw2016/settings/base.py | 3 --- 2 files changed, 7 deletions(-) diff --git a/src/core/context_processors.py b/src/core/context_processors.py index 5cff9e7d0..48d59edd4 100644 --- a/src/core/context_processors.py +++ b/src/core/context_processors.py @@ -54,9 +54,5 @@ def sponsors(request): } -def events(request): - return {'schedule_redirect_url': settings.SCHEDULE_REDIRECT_URL} - - def frontend_host(request): return {'FRONTEND_HOST': settings.FRONTEND_HOST} diff --git a/src/pycontw2016/settings/base.py b/src/pycontw2016/settings/base.py index b0016bbb1..855ac9647 100644 --- a/src/pycontw2016/settings/base.py +++ b/src/pycontw2016/settings/base.py @@ -45,7 +45,6 @@ 'django.template.context_processors.request', 'core.context_processors.script_prefix', 'core.context_processors.pycontw', - 'core.context_processors.events', 'core.context_processors.sponsors', 'core.context_processors.frontend_host', ], @@ -328,8 +327,6 @@ def node_bin(name): (datetime.date(2023, 9, 3), _('Day 2')), ]) -SCHEDULE_REDIRECT_URL = None - COC_VERSION = '2023.0' # Since 2021, pycon.tw has indivisual server hosting the attendee-facing pages From d3700dbd4fd1f1731ee5e6e27c0f122b2cc931c4 Mon Sep 17 00:00:00 2001 From: Matt Wang Date: Wed, 15 Mar 2023 22:46:41 +0800 Subject: [PATCH 35/44] fix(events/test): mark to access db --- src/core/tests/test_views.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/tests/test_views.py b/src/core/tests/test_views.py index 2cfefc652..5458d5374 100644 --- a/src/core/tests/test_views.py +++ b/src/core/tests/test_views.py @@ -94,6 +94,7 @@ def test_content_pages(client, parser, content_page_full_path): assert response.status_code == 200, content_page_full_path +@pytest.mark.django_db def test_content_pages_links(client, parser, content_page_full_path): """Test to make sure all in-site links in a content page work. """ From 5ce8c9c80b4aa5caef296c9f17fab8f367a08e68 Mon Sep 17 00:00:00 2001 From: Matt Wang Date: Thu, 16 Mar 2023 10:24:35 +0800 Subject: [PATCH 36/44] refactor(events): rm unused var --- src/events/models.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/events/models.py b/src/events/models.py index 3b19d7260..a55513247 100644 --- a/src/events/models.py +++ b/src/events/models.py @@ -134,9 +134,6 @@ def get_md_width(cls, value): }[value] -EVENT_ROOMS = {Location.R0, Location.R1, Location.R2, Location.R3, Location.R4} - - class BaseEvent(ConferenceRelated): """Base interface for all events in the schedule. """ From f4683d8263d68e8bf811925a86491f3354b94a8e Mon Sep 17 00:00:00 2001 From: Matt Wang Date: Thu, 16 Mar 2023 10:37:18 +0800 Subject: [PATCH 37/44] chore(events): remove unused templatetags --- src/events/templatetags/events.py | 150 +----------------------------- 1 file changed, 1 insertion(+), 149 deletions(-) diff --git a/src/events/templatetags/events.py b/src/events/templatetags/events.py index e95222b7c..0537fa21a 100644 --- a/src/events/templatetags/events.py +++ b/src/events/templatetags/events.py @@ -1,161 +1,13 @@ from django.conf import settings from django.template import Library -from django.template.loader import get_template -from django.utils import translation -from django.utils.translation import gettext_lazy as _ -from events.models import KeynoteEvent, Location +from events.models import KeynoteEvent from sponsors.models import Sponsor, OpenRole -from proposals.utils import format_names -from datetime import datetime, timedelta -from math import floor - -LOCATION_DISPLAY_DICT = { - Location.R0: _('R1'), - Location.R1: _('R2'), - Location.R2: _('R3'), - Location.R3: _('Multifunction room'), - Location.R4: _('Goodideas Studio'), - Location.R012: _('R1, R2, R3'), - Location.OTHER: _('Other'), -} -ROW_UNIT = 5 * 60 # in seconds -MARKER_UNIT = 30 * 60 # in seconds register = Library() -@register.simple_tag -def calc_grid_row(begin, end, timeline_start='08:30'): - d_format = '%H:%M' - start_point = datetime.strptime(timeline_start, d_format) - - def get_row(t): - diff = datetime.strptime(t, d_format) - start_point - return int(diff.seconds / ROW_UNIT) + 1 - - start_row = get_row(begin) - end_row = get_row(end) - return {'start_row': start_row, 'end_row': end_row} - - -@register.filter -def gen_timeline(start, end): - timeline = [{'time': start, 'row_start': 1, 'row_end': 6}] - d_format = '%H:%M' - - time_start = datetime.strptime(start, d_format) - time_end = datetime.strptime(end, d_format) - ticks_count = floor((time_end - time_start).seconds / MARKER_UNIT) - - scale_unit_multiplier = int(MARKER_UNIT / ROW_UNIT) # 6 (magic number) - time_next = time_start - row_start_next = 1 - row_end_next = 6 - for i in range(ticks_count): - time_next += timedelta(seconds=MARKER_UNIT) - row_start_next += scale_unit_multiplier - row_end_next += scale_unit_multiplier - t = datetime.strftime(time_next, d_format) - c = '--hour' if t.endswith('00') else '--half-an-hour' - timeline.append({ - 'time': t, - 'row_start': row_start_next, - 'row_end': row_end_next, - 'class': c - }) - - return timeline - - -@register.filter -def event_cell_class(event): - event_class = { - 'events.customevent': 'custom', - 'events.keynoteevent': 'keynote', - 'events.proposedtalkevent': 'talk', - 'events.proposedtutorialevent': 'tutorial', - 'events.sponsoredevent': 'talk', - }[event._meta.label_lower] - classes = [event_class] - if getattr(event, 'break_event', False): - classes.append('is-break') - return ' '.join(classes) - - -@register.filter -def event_tr_class(slot_info): - for room, event in slot_info: - if event._meta.label_lower == 'events.customevent': - return 'custom' - return '' - - -@register.filter -def room_display(value): - return LOCATION_DISPLAY_DICT.get(value, '') - - -def get_custom_event_display(event): - template = get_template('events/_includes/schedule_custom_event.html') - return template.render({'event': event}) - - -def get_keynote_event_display(event): - template = get_template('events/_includes/schedule_keynote_event.html') - return template.render({'event': event, 'is_remote': event.is_remote}) - - -def _render_talk_event_template(event, info, speaker_names, sponsored, is_remote=False): - template = get_template('events/_includes/schedule_talk_event.html') - return template.render({ - 'event': event, 'info': info, 'sponsored': sponsored, - 'speakers': format_names(speaker_names), 'is_remote': is_remote, - }) - - -def get_talk_event_display(event): - proposal = event.proposal - speaker_names = [proposal.submitter.speaker_name] - if getattr(event, '_additional_speaker_count', 1): - speaker_names.extend( - proposal.additionalspeaker_set - .values_list('user__speaker_name', flat=True), - ) - return _render_talk_event_template(event, proposal, speaker_names, False, event.is_remote) - - -def get_tutorial_event_display(event): - proposal = event.proposal - speaker_names = [proposal.submitter.speaker_name] - if getattr(event, '_additional_speaker_count', 1): - speaker_names.extend( - proposal.additionalspeaker_set - .values_list('user__speaker_name', flat=True), - ) - return _render_talk_event_template(event, proposal, speaker_names, False, event.is_remote) - - -def get_sponsored_event_display(event): - return _render_talk_event_template( - event, event, [event.host.speaker_name], True, - ) - - -@register.filter -def event_display(event): - with translation.override('en-us'): - f = { - 'events.customevent': get_custom_event_display, - 'events.keynoteevent': get_keynote_event_display, - 'events.proposedtalkevent': get_talk_event_display, - 'events.proposedtutorialevent': get_tutorial_event_display, - 'events.sponsoredevent': get_sponsored_event_display, - }[event._meta.label_lower] - return f(event) - - @register.filter def event_date_display(event): try: From 1ee86a4e5b54477a230bb1d3cd46b94a61c57baf Mon Sep 17 00:00:00 2001 From: Matt Wang Date: Thu, 16 Mar 2023 11:22:48 +0800 Subject: [PATCH 38/44] chore(events): remove renderers --- .../management/commands/import_events.py | 4 +- src/events/renderers.py | 402 ------------------ 2 files changed, 2 insertions(+), 404 deletions(-) delete mode 100644 src/events/renderers.py diff --git a/src/events/management/commands/import_events.py b/src/events/management/commands/import_events.py index 6591da125..98d967553 100644 --- a/src/events/management/commands/import_events.py +++ b/src/events/management/commands/import_events.py @@ -8,12 +8,12 @@ from django.core.management.base import BaseCommand from django.utils.dateparse import parse_time -from events.models import Location, Time -from events.renderers import EVENT_CLASSES +from events.models import CustomEvent, KeynoteEvent, ProposedTalkEvent, SponsoredEvent, Location, Time cst = pytz.timezone('Asia/Taipei') +EVENT_CLASSES = (CustomEvent, KeynoteEvent, ProposedTalkEvent, SponsoredEvent) DAYS = list(settings.EVENTS_DAY_NAMES.keys()) diff --git a/src/events/renderers.py b/src/events/renderers.py deleted file mode 100644 index 2f69b8dc2..000000000 --- a/src/events/renderers.py +++ /dev/null @@ -1,402 +0,0 @@ -import itertools - -import sortedcontainers - -from django.conf import settings -from django.utils.html import format_html, format_html_join -from django.utils.safestring import mark_safe -from django.utils.timezone import make_naive -from django.utils.translation import gettext, gettext_lazy as _ - -from core.utils import html_join -from proposals.utils import format_names - -from events.models import ( - Location, CustomEvent, KeynoteEvent, ProposedTalkEvent, SponsoredEvent, -) - - -def render_customevent(e): - return format_html( - '
      ' - '
      {title}
      ' - '
      ', - title=e.title, - ) - - -def render_keynoteevent(e): - return format_html( - '
      ' - '
      {title}
      ' - '{speaker}' - '
      ', - title=gettext('Keynote'), - link=e.get_absolute_url(), - speaker=e.speaker_name, - ) - - -LANG_DISPLAY_MAP = { - 'ENEN': 'EN', - 'ZHZH': 'ZH', - 'ZHEN': _('EN Slides'), - 'TAI': 'TAI', -} - - -def render_proposedtalkevent(e): - proposal = e.proposal - speaker_names = [info.user.speaker_name for info in proposal.speakers] - return format_html( - '
      ' - '{title}' - '{speakers}' - '
      {lang}
      ' - '
      ', - link=e.get_absolute_url(), - title=proposal.title, - speakers=format_names(speaker_names), - lang=LANG_DISPLAY_MAP[proposal.language], - ) - - -def render_sponsoredevent(e): - return format_html( - '', - link=e.get_absolute_url(), - title=e.title, - speaker=e.host.speaker_name, - lang=LANG_DISPLAY_MAP[e.language], - ) - - -def render_event(e): - func_name = 'render_{cls}'.format(cls=type(e).__name__.lower()) - try: - func = globals()[func_name] - except KeyError: - raise ValueError( - 'No suitable renderer for {!r} of {!r}'.format(e, type(e)), - ) - return func(e) - - -def render_block_location(location): - return format_html( - '
      ' - '{display}
      ', - key=location.split('-', 1)[-1], - display={ - Location.ALL: '', - Location.R012: 'R0 R1 R2', - Location.R0: 'R0', - Location.R1: 'R1', - Location.R2: 'R2', - Location.R3: 'R3', - Location.R4: 'R4', - }.get(location), - ) - - -def _has_tall_event(events): - return any( - isinstance(e, ProposedTalkEvent) or isinstance(e, SponsoredEvent) - for e in events - ) - - -def render_block( - event, time_map, events, extra_classes=None, *, - min_height=0, max_height=None): - location = event.location - height = time_map[event.end_time] - time_map[event.begin_time] - if max_height is not None: - height = min(height, max_height) - if height == 1 and min_height < 1 and not _has_tall_event(events): - height = 'small' - return format_html( - '
      ' - '{location}{event}
      ', - w=Location.get_md_width(location), - h=height, - location=render_block_location(location), - event=render_event(event), - classes=(' ' + ' '.join(extra_classes) if extra_classes else ''), - ) - - -def render_attached_period(begin, end): - begin = make_naive(begin.value) - end = make_naive(end.value) - return format_html( - '
      ' - '{begin_h}:{begin_m} – {end_h}:{end_m}
      ', - begin_h=begin.hour, begin_m=begin.strftime(r'%M'), - end_h=end.hour, end_m=end.strftime(r'%M'), - ) - - -def _render_blocks(events, time_map): - """Render a R0-3 belt, a R0-2 partial belt (plus optionally a R3 event), - or an all-block (with or without R3) format. - """ - if events[0].location == Location.R3: - # If this contains R3, shuffle it to the back. - r3_event, *events = events - - # If this is not a smooth row, we need to prevent any block from - # being rendered as short because we can't handle it with multi-height. - if any(r3_event.end_time != e.end_time for e in events): - min_height = 1 - else: - min_height = 0 - r3_block = render_block( - r3_event, time_map, events, min_height=min_height, - ) - else: - r3_event = None - r3_block = '' - - # Render period block for R3. - # We cheat a little here: Times in R0-2 are supposed to be identical; - # only R3 can be different. We just compare the first event's times - # and R3's. If they are identical, R3 does not need its own period block, - # otherwise it does. - r3_period = '' - rx_begin, rx_end = events[0].begin_time, events[0].end_time - if r3_event: - r3_begin = r3_event.begin_time - r3_end = r3_event.end_time - if r3_begin != rx_begin or r3_end != rx_end: - r3_period = render_attached_period(r3_begin, r3_end) - - return format_html( - '{r012_period}{r012_blocks}{r3_period}{r3_block}', - r012_period=render_attached_period(rx_begin, rx_end), - r012_blocks=html_join( - '', - (render_block(e, time_map, events) for e in events), - ), - r3_period=r3_period, - r3_block=r3_block, - ) - - -def _render_multirow_subrow(event_iter, time_map, events): - # Render period block for this row, and the first event. - e0 = next(event_iter) - cells = [ - render_attached_period(e0.begin_time, e0.end_time), - render_block(e0, time_map, events) - ] - cols = Location.get_md_width(e0.location) - - # Keep rendering until we fill a row. - while cols < 3: - try: - e = next(event_iter) - except StopIteration: - break - cells.append(render_block(e, time_map, events)) - cols += Location.get_md_width(e.location) - return cells - - -def _render_multirow(events, time_map, max_height): - """Render a complex format that contains a multi-row R3 event. - """ - sp_event, *events = events - # Sort events by time, and then location. This is done here because - # we need to exclude the R3 event (by putting it first). - events = sorted(events, key=lambda e: (e.begin_time.value, e.location)) - event_iter = iter(events) - - # Render R0-R2 events in the first time period. - cells = _render_multirow_subrow(event_iter, time_map, events) - - # Render the multi-row R3 event. - cells.extend([ - render_attached_period(sp_event.begin_time, sp_event.end_time), - render_block( - sp_event, time_map, events, ['pull-right'], - max_height=max_height, - ), - ]) - - # Render the rest of the events. - try: - while True: - cells += _render_multirow_subrow(event_iter, time_map, events) - except StopIteration: - pass - - # Join the results. - return html_join('', cells) - - -def render_columned_period(times, events): - cell_args = [ - _get_column_period_args(begin, end) - for begin, end in zip(times[:-1], times[1:]) - if any(e.end_time == end for e in events) - ] - cells = format_html_join( - '', - '
      {}:{}
      |
      {}:{}
      ', - iter(cell_args), - ) - height = len(cell_args) - if height == 1 and not _has_tall_event(events): - height = 'small' - html = format_html( - '
      {cells}
      ', - height=height, - cells=cells, - ) - return html, height - - -def _get_column_period_args(begin_time, end_time): - begin_naive = make_naive(begin_time.value) - end_naive = make_naive(end_time.value) - return ( - begin_naive.hour, - begin_naive.strftime('%M'), - end_naive.hour, - end_naive.strftime('%M'), - ) - - -def render_row(times, events): - events = sorted(events, key=lambda e: e.location) - times = sorted(times) - time_map = {t: i for i, t in enumerate(times)} - - period_block, max_height = render_columned_period(times, events) - try: - sp_event = events[0] - except IndexError: # No events in this time period. - content = '' - else: - if (sp_event.location != Location.R3 or sp_event.end_time <= times[1]): - # If there's no R3 event, or if R3 event is not multi-row. - content = _render_blocks(events, time_map) - else: - # If there is a multi-row R3 event. - content = _render_multirow(events, time_map, max_height) - return format_html( - '{period}' - '
      {content}
      ', - period=period_block, - content=content, - ) - - -# This is made global so that we can easily test for equality. -def group_key(e): - return e.location - - -def make_group(*events): - return sortedcontainers.SortedListWithKey(events, key=group_key) - - -def collect_event_groups(events): - # Map of (sorted-tuple-of-times): [list-of-events]. - # This automatically sorts the keys by ``begin_time``. - groups = sortedcontainers.SortedDict() - - for e in events: - - e_begin_time = e.begin_time - e_end_time = e.end_time - - # Short circuit: If there's an identical group, just join it. - if (e_begin_time, e_end_time) in groups: - groups[(e_begin_time, e_end_time)].add(e) - continue - - # Look for a suitable group. - for key in groups.keys(): - begin_time, *_, end_time = key - if ((begin_time <= e_begin_time and end_time >= e_end_time) or - (e_begin_time <= begin_time and e_end_time >= end_time)): - # Either key can contain event, or event can contain key. - events = groups.pop(key) - events.add(e) - times = sorted(set(key) | {e_begin_time, e_end_time}) - groups[tuple(times)] = events - break - else: - # No suitable group. Let's make a new one. - # This automatically sorts the items by location. - groups[(e_begin_time, e_end_time)] = make_group(e) - - return groups - - -EVENT_CLASSES = (CustomEvent, KeynoteEvent, ProposedTalkEvent, SponsoredEvent) - - -def _filter_events(Cls, day): - return ( - Cls.objects - .filter(begin_time__value__date=day, end_time__value__date=day) - .select_related('begin_time', 'end_time') - ) - - -def render_table(day): - events = itertools.chain.from_iterable( - _filter_events(Cls, day) - for Cls in EVENT_CLASSES - ) - groups = collect_event_groups(events) - - head = mark_safe(""" -
      -
      -
      -
      -
      R0
      -
      R1
      -
      R2
      -
      R3
      -
      -
      -
      - """) - body = html_join('', ( - render_row(times, group) for times, group in groups.items() - )) - return format_html( - '
      {head}{body}
      ', - head=head, body=body, - ) - - -def render_day(day, display): - events = list(itertools.chain.from_iterable( - _filter_events(Cls, day) - for Cls in EVENT_CLASSES - )) - if not events: - return '' - return format_html( - '

      {display}

      {table}', - slug=day.strftime(r'%Y-%m-%d'), - display=display, table=render_table(day), - ) - - -def render_all(): - return html_join('', ( - render_day(day, display) - for day, display in settings.EVENTS_DAY_NAMES.items() - )) From f67b963a1fcee6d9b77bbc28991029929bd587bd Mon Sep 17 00:00:00 2001 From: Matt Wang Date: Thu, 16 Mar 2023 11:23:31 +0800 Subject: [PATCH 39/44] test(events): remove renderers tests --- src/events/tests/renderers/__init__.py | 0 src/events/tests/renderers/conftest.py | 327 ------------------ src/events/tests/renderers/test_collect.py | 37 -- .../tests/renderers/test_render_block.py | 152 -------- src/events/tests/renderers/test_render_row.py | 184 ---------- 5 files changed, 700 deletions(-) delete mode 100644 src/events/tests/renderers/__init__.py delete mode 100644 src/events/tests/renderers/conftest.py delete mode 100644 src/events/tests/renderers/test_collect.py delete mode 100644 src/events/tests/renderers/test_render_block.py delete mode 100644 src/events/tests/renderers/test_render_row.py diff --git a/src/events/tests/renderers/__init__.py b/src/events/tests/renderers/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/events/tests/renderers/conftest.py b/src/events/tests/renderers/conftest.py deleted file mode 100644 index 999532572..000000000 --- a/src/events/tests/renderers/conftest.py +++ /dev/null @@ -1,327 +0,0 @@ -import datetime - -import pytest -import pytz - -from events.models import ( - Location, Time, - CustomEvent, KeynoteEvent, ProposedTalkEvent, -) -from proposals.models import AdditionalSpeaker - - -cst = pytz.timezone('Asia/Taipei') - - -class RendererTestUtils: - @staticmethod - def is_safe(s): - """Check whether a string is safe. - - This is Django's internal API, but we exploit it for easy testing. - """ - return not s or hasattr(s, '__html__') - - -@pytest.fixture -def utils(): - return RendererTestUtils - - -@pytest.fixture -def keynote_belt_event(db, get_time): - return KeynoteEvent.objects.create( - speaker_name='Amber Brown', - slug='amber-brown', - begin_time=get_time('2016-06-05 9:00'), - end_time=get_time('2016-06-05 10:00'), - location=Location.ALL, - ) - - -@pytest.fixture -def custom_partial_belt_event(db, get_time): - return CustomEvent.objects.create( - title='Job Fair', - begin_time=get_time('2016-06-04 14:45'), - end_time=get_time('2016-06-04 15:15'), - location=Location.R012, - ) - - -@pytest.fixture -def proposed_talk_block_event(accepted_talk_proposal, another_user, get_time): - e = ProposedTalkEvent.objects.create( - proposal=accepted_talk_proposal, - begin_time=get_time('2016-06-03 16:00'), - end_time=get_time('2016-06-03 16:45'), - location=Location.R0, - ) - AdditionalSpeaker.objects.create( - user=another_user, proposal=accepted_talk_proposal, - ) - return e - - -@pytest.fixture -def events( - custom_partial_belt_event, keynote_belt_event, - proposed_talk_block_event, sponsored_block_event): - return { - 'custom_event': custom_partial_belt_event, - 'keynote_event': keynote_belt_event, - 'proposed_talk_event': proposed_talk_block_event, - 'sponsored_event': sponsored_block_event, - } - - -@pytest.fixture -def day(): - return datetime.date(2016, 8, 19) - - -@pytest.fixture -def make_time(day): - - def _make_time(h, m=0): - dt = datetime.datetime.combine(day, datetime.time(h, m)) - return Time(value=cst.localize(dt)) - - return _make_time - - -@pytest.fixture -def belt_begin_time(make_time): - return make_time(15) - - -@pytest.fixture -def belt_end_time(make_time): - return make_time(16) - - -@pytest.fixture -def belt_event(belt_begin_time, belt_end_time): - return KeynoteEvent( - speaker_name='Amber Brown', - slug='amber-brown', - begin_time=belt_begin_time, - end_time=belt_end_time, - ) - - -@pytest.fixture -def partial_belt_begin_time(make_time): - return make_time(1) - - -@pytest.fixture -def partial_belt_end_time(make_time): - return make_time(2) - - -@pytest.fixture -def partial_belt_events(partial_belt_begin_time, partial_belt_end_time): - event = CustomEvent( - title='Refreshment', - location=Location.R012, - begin_time=partial_belt_begin_time, - end_time=partial_belt_end_time, - ) - return [event] - - -@pytest.fixture -def partial_belt_block_begin_time(make_time): - return make_time(3) - - -@pytest.fixture -def partial_belt_block_end_time(make_time): - return make_time(4) - - -@pytest.fixture -def partial_belt_block_events( - partial_belt_block_begin_time, partial_belt_block_end_time): - events = [ - CustomEvent( - title='Refreshment', - location=Location.R012, - begin_time=partial_belt_block_begin_time, - end_time=partial_belt_block_end_time, - ), - CustomEvent( - title='Free-market sub-orbital tattoo', - location=Location.R3, - begin_time=partial_belt_block_begin_time, - end_time=partial_belt_block_end_time, - ), - ] - return events - - -@pytest.fixture -def partial_block_begin_time(make_time): - return make_time(5) - - -@pytest.fixture -def partial_block_end_time(make_time): - return make_time(6) - - -@pytest.fixture -def partial_block_events(partial_block_begin_time, partial_block_end_time): - events = [ - CustomEvent( - title='Boost Maintainability', - location=Location.R0, - begin_time=partial_block_begin_time, - end_time=partial_block_end_time, - ), - CustomEvent( - title='We Made the PyCon TW 2016 Website', - location=Location.R1, - begin_time=partial_block_begin_time, - end_time=partial_block_end_time, - ), - CustomEvent( - title='Deep Learning and Application in Python', - location=Location.R2, - begin_time=partial_block_begin_time, - end_time=partial_block_end_time, - ), - ] - return events - - -@pytest.fixture -def block_begin_time(make_time): - return make_time(7) - - -@pytest.fixture -def block_end_time(make_time): - return make_time(8) - - -@pytest.fixture -def block_events(block_begin_time, block_end_time): - events = [ - CustomEvent( - title='Boost Maintainability', - location=Location.R0, - begin_time=block_begin_time, - end_time=block_end_time, - ), - CustomEvent( - title='We Made the PyCon TW 2016 Website', - location=Location.R1, - begin_time=block_begin_time, - end_time=block_end_time, - ), - CustomEvent( - title='Deep Learning and Application in Python', - location=Location.R2, - begin_time=block_begin_time, - end_time=block_end_time, - ), - CustomEvent( - title='Free-market sub-orbital tattoo', - location=Location.R3, - begin_time=block_begin_time, - end_time=block_end_time, - ), - ] - return events - - -@pytest.fixture -def mismatch_block_begin_time(make_time): - return make_time(9) - - -@pytest.fixture -def mismatch_block_mid_time(make_time): - return make_time(10) - - -@pytest.fixture -def mismatch_block_end_time(make_time): - return make_time(11) - - -@pytest.fixture -def mismatch_block_events( - mismatch_block_begin_time, mismatch_block_mid_time, - mismatch_block_end_time): - events = [ - CustomEvent( - title='Refreshment', - location=Location.R012, - begin_time=mismatch_block_begin_time, - end_time=mismatch_block_end_time, - ), - CustomEvent( - title='Free-market sub-orbital tattoo', - location=Location.R3, - begin_time=mismatch_block_begin_time, - end_time=mismatch_block_mid_time, - ), - ] - return events - - -@pytest.fixture -def multirow_block_begin_time(make_time): - return make_time(12) - - -@pytest.fixture -def multirow_block_mid_time(make_time): - return make_time(13) - - -@pytest.fixture -def multirow_block_end_time(make_time): - return make_time(14) - - -@pytest.fixture -def multirow_block_events( - multirow_block_begin_time, multirow_block_mid_time, - multirow_block_end_time): - events = [ - CustomEvent( - title='Boost Maintainability', - location=Location.R0, - begin_time=multirow_block_begin_time, - end_time=multirow_block_mid_time, - ), - CustomEvent( - title='We Made the PyCon TW 2016 Website', - location=Location.R1, - begin_time=multirow_block_begin_time, - end_time=multirow_block_mid_time, - ), - CustomEvent( - title='Deep Learning and Application in Python', - location=Location.R2, - begin_time=multirow_block_begin_time, - end_time=multirow_block_mid_time, - ), - CustomEvent( - title='Free-market sub-orbital tattoo', - location=Location.R3, - begin_time=multirow_block_begin_time, - end_time=multirow_block_end_time, - ), - CustomEvent( - title='Refreshment', - location=Location.R012, - begin_time=multirow_block_mid_time, - end_time=multirow_block_end_time, - ), - ] - return events diff --git a/src/events/tests/renderers/test_collect.py b/src/events/tests/renderers/test_collect.py deleted file mode 100644 index 41988d545..000000000 --- a/src/events/tests/renderers/test_collect.py +++ /dev/null @@ -1,37 +0,0 @@ -import itertools - -import sortedcontainers -import pytest - -from events import renderers -from events.renderers import make_group - - -@pytest.fixture -def events( - belt_event, partial_belt_events, partial_belt_block_events, - partial_block_events, block_events, mismatch_block_events, - multirow_block_events): - return itertools.chain( - [belt_event], partial_belt_events, partial_belt_block_events, - partial_block_events, block_events, mismatch_block_events, - multirow_block_events, - ) - - -def test_collect_event_groups( - belt_event, partial_belt_events, partial_belt_block_events, - partial_block_events, block_events, mismatch_block_events, - multirow_block_events, make_time, events): - groups = renderers.collect_event_groups(events) - assert groups == sortedcontainers.SortedDict({ - (make_time(1), make_time(2)): make_group(*partial_belt_events), - (make_time(3), make_time(4)): make_group(*partial_belt_block_events), - (make_time(5), make_time(6)): make_group(*partial_block_events), - (make_time(7), make_time(8)): make_group(*block_events), - (make_time(9), make_time(10), make_time(11)): make_group( - *mismatch_block_events), - (make_time(12), make_time(13), make_time(14)): make_group( - *multirow_block_events), - (make_time(15), make_time(16)): make_group(belt_event), - }) diff --git a/src/events/tests/renderers/test_render_block.py b/src/events/tests/renderers/test_render_block.py deleted file mode 100644 index 2945e8169..000000000 --- a/src/events/tests/renderers/test_render_block.py +++ /dev/null @@ -1,152 +0,0 @@ -import pytest - -from events import renderers -from events.models import Location, CustomEvent - - -@pytest.fixture -def simple_component_renderer(mocker): - mocker.patch.multiple( - 'events.renderers', - render_event=str, - render_block_location=lambda v: '{} '.format(v), - ) - - -@pytest.fixture -def time_map(events): - times = set() - for e in events.values(): - times.add(e.begin_time) - times.add(e.end_time) - return {time: i for i, time in enumerate(sorted(times))} - - -# Hack to get all possible location values by introspection. -POSSIBLE_LOCATIONS = sorted( - getattr(Location, k) - for k in Location.__dict__ if k.isupper() and k != 'OTHER' -) - - -@pytest.mark.parametrize('location', POSSIBLE_LOCATIONS) -def test_render_block_location(parser, utils, location): - rendered = renderers.render_block_location(location) - assert utils.is_safe(rendered) - - expected = { - Location.ALL: ( - '
      ' - ), - Location.R012: ( - '
      ' - 'R0 R1 R2
      ' - ), - Location.R0: ( - '
      ' - 'R0
      ' - ), - Location.R1: ( - '
      ' - 'R1
      ' - ), - Location.R2: ( - '
      ' - 'R2
      ' - ), - Location.R3: ( - '
      ' - 'R3
      ' - ), - Location.R4: ( - '
      ' - 'R4
      ' - ), - }.get(location) - if expected: - assert parser.arrange(rendered) == parser.arrange(expected) - - -@pytest.mark.parametrize('event_key', [ - 'custom_event', 'keynote_event', 'proposed_talk_event', 'sponsored_event', -]) -@pytest.mark.usefixtures('simple_component_renderer') -def test_render_block(parser, utils, time_map, events, event_key): - e = events[event_key] - rendered = renderers.render_block(e, time_map, [e]) - assert utils.is_safe(rendered) - - expected = { - 'custom_event': """ -
      - 3-r012 Job Fair -
      """, - 'keynote_event': """ -
      - 2-all Keynote: Amber Brown -
      """, - 'proposed_talk_event': """ -
      - 4-r0 Beyond the Style Guides<br> -
      """, - 'sponsored_event': """ -
      - 6-r2 Camera engine office woman lights -
      """, - }[event_key] - assert parser.arrange(rendered) == parser.arrange(expected) - - -@pytest.mark.parametrize('event_key,begin,end', [ - ('custom_event', '14:45', '15:15'), - ('keynote_event', '9:00', '10:00'), - ('proposed_talk_event', '16:00', '16:45'), - ('sponsored_event', '11:00', '11:25'), -]) -def test_render_attached_period(utils, events, event_key, begin, end): - e = events[event_key] - rendered = renderers.render_attached_period(e.begin_time, e.end_time) - assert utils.is_safe(rendered) - assert rendered == ( - '
      {} – {}
      '.format( - begin, end, - ) - ) - - -@pytest.mark.parametrize('time_count', [2, 3, 4]) -def test_render_columned_period(parser, utils, make_time, time_count): - times = [make_time(h) for h in range(time_count)] - rendered, _ = renderers.render_columned_period(times, [ - CustomEvent( - title='M<3', location=Location.ALL, - begin_time=begin_time, end_time=end_time, - ) - for begin_time, end_time in zip(times[:-1], times[1:]) - ]) - assert utils.is_safe(rendered) - - expected = { - 2: ( - '
      ' - '
      0:00
      |
      1:00
      ' - '
      ' - ), - 3: ( - '
      ' - '
      0:00
      |
      1:00
      ' - '
      1:00
      |
      2:00
      ' - '
      ' - ), - 4: ( - '
      ' - '
      0:00
      |
      1:00
      ' - '
      1:00
      |
      2:00
      ' - '
      2:00
      |
      3:00
      ' - '
      ' - ), - }[time_count] - assert parser.arrange(rendered) == parser.arrange(expected) diff --git a/src/events/tests/renderers/test_render_row.py b/src/events/tests/renderers/test_render_row.py deleted file mode 100644 index 5f3d4fdfd..000000000 --- a/src/events/tests/renderers/test_render_row.py +++ /dev/null @@ -1,184 +0,0 @@ -import pytest - -from django.utils.timezone import make_naive - -from events import renderers - - -@pytest.fixture -def simple_renderer(mocker): - - def _simple_block_renderer( - event, time_map, events, extra_classes=None, *, - min_height=0, max_height=None): - if extra_classes: - fmt = '|{event} ({classes})| ' - else: - fmt = '|{event}| ' - return fmt.format(classes=' '.join(extra_classes or []), event=event) - - def _simple_attached_period_renderer(begin, end): - return '|{0.hour}:{0:%M} {1.hour}:{1:%M}| '.format( - make_naive(begin.value), make_naive(end.value), - ) - - def _simple_columned_period_renderer(times, events): - html = '|{}| '.format( - ' '.join( - '{0.hour}:{0:%M}'.format(make_naive(time.value)) - for time in times - ) - ) - return html, len(events) - - mocker.patch.multiple( - 'events.renderers', - render_block=_simple_block_renderer, - render_attached_period=_simple_attached_period_renderer, - render_columned_period=_simple_columned_period_renderer, - ) - - -@pytest.mark.usefixtures('simple_renderer') -def test_render_belt_events_row(parser, utils, keynote_belt_event): - times = [keynote_belt_event.begin_time, keynote_belt_event.end_time] - rendered = renderers.render_row(times, [keynote_belt_event]) - assert utils.is_safe(rendered) - assert parser.arrange(rendered) == parser.arrange(""" - |9:00 10:00| -
      -
      - |9:00 10:00| - |Keynote: Amber Brown| -
      -
      - """) - - -@pytest.mark.usefixtures('simple_renderer') -def test_render_partial_belt_events_row( - parser, utils, - partial_belt_begin_time, partial_belt_end_time, partial_belt_events): - times = [partial_belt_begin_time, partial_belt_end_time] - rendered = renderers.render_row(times, partial_belt_events) - assert utils.is_safe(rendered) - assert parser.arrange(rendered) == parser.arrange(""" - |1:00 2:00| -
      -
      - |1:00 2:00| - |Refreshment| -
      -
      - """) - - -@pytest.mark.usefixtures('simple_renderer') -def test_render_partial_belt_block_events_row( - parser, utils, partial_belt_block_begin_time, - partial_belt_block_end_time, partial_belt_block_events): - times = [partial_belt_block_begin_time, partial_belt_block_end_time] - rendered = renderers.render_row(times, partial_belt_block_events) - assert utils.is_safe(rendered) - assert parser.arrange(rendered) == parser.arrange(""" - |3:00 4:00| -
      -
      - |3:00 4:00| - |Refreshment| - |Free-market sub-orbital tattoo| -
      -
      - """) - - -@pytest.mark.usefixtures('simple_renderer') -def test_render_partial_block_events_row( - parser, utils, partial_block_begin_time, - partial_block_end_time, partial_block_events): - times = [partial_block_begin_time, partial_block_end_time] - rendered = renderers.render_row(times, partial_block_events) - assert utils.is_safe(rendered) - assert parser.arrange(rendered) == parser.arrange(""" - |5:00 6:00| -
      -
      - |5:00 6:00| - |Boost Maintainability| - |We Made the PyCon TW 2016 Website| - |Deep Learning and Application in Python| -
      -
      - """) - - -@pytest.mark.usefixtures('simple_renderer') -def test_render_block_events_row( - parser, utils, block_begin_time, block_end_time, block_events): - times = [block_begin_time, block_end_time] - rendered = renderers.render_row(times, block_events) - assert utils.is_safe(rendered) - assert parser.arrange(rendered) == parser.arrange(""" - |7:00 8:00| -
      -
      - |7:00 8:00| - |Boost Maintainability| - |We Made the PyCon TW 2016 Website| - |Deep Learning and Application in Python| - |Free-market sub-orbital tattoo| -
      -
      - """) - - -@pytest.mark.usefixtures('simple_renderer') -def test_render_mismatch_block_events_row( - parser, utils, mismatch_block_begin_time, mismatch_block_mid_time, - mismatch_block_end_time, mismatch_block_events): - times = [ - mismatch_block_begin_time, - mismatch_block_mid_time, - mismatch_block_end_time, - ] - rendered = renderers.render_row(times, mismatch_block_events) - assert utils.is_safe(rendered) - assert parser.arrange(rendered) == parser.arrange(""" - |9:00 10:00 11:00| -
      -
      - |9:00 11:00| - |Refreshment| - |9:00 10:00| - |Free-market sub-orbital tattoo| -
      -
      - """) - - -@pytest.mark.usefixtures('simple_renderer') -def test_render_multirow_block_events_row( - parser, utils, multirow_block_begin_time, multirow_block_mid_time, - multirow_block_end_time, multirow_block_events): - times = [ - multirow_block_begin_time, - multirow_block_mid_time, - multirow_block_end_time, - ] - rendered = renderers.render_row(times, multirow_block_events) - assert utils.is_safe(rendered) - assert parser.arrange(rendered) == parser.arrange(""" - |12:00 13:00 14:00| -
      -
      - |12:00 13:00| - |Boost Maintainability| - |We Made the PyCon TW 2016 Website| - |Deep Learning and Application in Python| - |12:00 14:00| - |Free-market sub-orbital tattoo (pull-right)| - |13:00 14:00| - |Refreshment| -
      -
      - """) From 6a45bc2d91b004b169eee4ce58ccf42fd1db0df3 Mon Sep 17 00:00:00 2001 From: Matt Wang Date: Wed, 15 Mar 2023 22:11:30 +0800 Subject: [PATCH 40/44] chore(locale): update po files --- src/locale/en_US/LC_MESSAGES/django.po | 339 +++++++++++------------ src/locale/zh_Hant/LC_MESSAGES/django.po | 339 +++++++++++------------ 2 files changed, 310 insertions(+), 368 deletions(-) diff --git a/src/locale/en_US/LC_MESSAGES/django.po b/src/locale/en_US/LC_MESSAGES/django.po index 2096ee077..21871d730 100644 --- 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-03-08 22:50+0800\n" +"POT-Creation-Date: 2023-03-16 11:24+0800\n" "PO-Revision-Date: 2022-07-11 02:23+0800\n" "Last-Translator: Tom Chen \n" "Language-Team: English (United States) (http://www.transifex.com/pycon-" @@ -33,7 +33,7 @@ msgstr "token" msgid "verified" msgstr "verified" -#: attendee/models.py:9 core/models.py:153 events/models.py:469 +#: attendee/models.py:9 core/models.py:163 msgid "created at" msgstr "created at" @@ -83,8 +83,7 @@ msgstr "talk" msgid "Current" msgstr "" -#: core/admin.py:16 core/choices.py:24 events/models.py:157 -#: events/templatetags/events.py:21 +#: core/admin.py:16 core/choices.py:24 events/models.py:154 msgid "Other" msgstr "Other" @@ -244,108 +243,108 @@ msgstr "No" msgid "{model_name_cap} creation requires a request object." msgstr "{model_name_cap} creation requires a request object." -#: core/models.py:71 +#: core/models.py:81 msgid "conference" msgstr "conference" -#: core/models.py:84 events/models.py:193 +#: core/models.py:94 events/models.py:190 msgid "title" msgstr "title" -#: core/models.py:89 +#: core/models.py:99 msgid "category" msgstr "category" -#: core/models.py:95 +#: core/models.py:105 msgid "language" msgstr "language" -#: core/models.py:101 +#: core/models.py:111 msgid "abstract" msgstr "abstract" -#: core/models.py:106 templates/default/reviews/review_form.html:53 +#: core/models.py:116 templates/default/reviews/review_form.html:53 msgid "Python level" msgstr "Python level" -#: core/models.py:112 +#: core/models.py:122 msgid "detailed description" msgstr "detailed description" -#: core/models.py:117 +#: core/models.py:127 msgid "recording policy" msgstr "recording release" -#: core/models.py:123 +#: core/models.py:133 msgid "live stream policy" msgstr "live stream policy" -#: core/models.py:129 +#: core/models.py:139 msgid "referring policy" msgstr "referral policy" -#: core/models.py:135 +#: core/models.py:145 msgid "slide link" msgstr "slide link" -#: core/models.py:141 +#: core/models.py:151 msgid "slido embed link" msgstr "Slido embed link" -#: core/models.py:147 events/models.py:258 +#: core/models.py:157 events/models.py:255 msgid "HackMD embed link" msgstr "HackMD embed link" -#: core/models.py:159 +#: core/models.py:169 msgid "last updated at" msgstr "last updated at" -#: core/models.py:164 +#: core/models.py:174 msgid "prefer event time" msgstr "prefer event time" -#: core/models.py:170 +#: core/models.py:180 msgid "living in Taiwan" msgstr "living in Taiwan" -#: core/models.py:176 +#: core/models.py:186 msgid "attending PyCon TW in person" msgstr "attending PyCon TW in person" -#: core/models.py:208 reviews/admin.py:51 +#: core/models.py:218 reviews/admin.py:51 msgid "Key" msgstr "Key" -#: core/models.py:212 proposals/models.py:62 users/models.py:198 +#: core/models.py:222 proposals/models.py:62 users/models.py:198 #: users/models.py:313 msgid "user" msgstr "user" -#: core/models.py:215 +#: core/models.py:225 msgid "Created" msgstr "created at" -#: core/models.py:218 +#: core/models.py:228 msgid "Token" msgstr "" -#: core/models.py:219 +#: core/models.py:229 msgid "Tokens" msgstr "" -#: events/admin.py:26 +#: events/admin.py:30 msgid "time value" msgstr "time value" -#: events/admin.py:100 events/models.py:173 +#: events/admin.py:104 events/models.py:170 msgid "begin time" msgstr "begin time" -#: events/admin.py:106 events/models.py:182 +#: events/admin.py:110 events/models.py:179 msgid "end time" msgstr "end time" -#: events/admin.py:128 +#: events/admin.py:132 #: templates/default/users/_includes/dashboard_proposal_table.html:32 msgid "Edit" msgstr "Edit" @@ -362,70 +361,70 @@ msgstr "time" msgid "times" msgstr "times" -#: events/models.py:144 +#: events/models.py:141 msgid "All rooms" msgstr "All rooms" -#: events/models.py:145 +#: events/models.py:142 msgid "R0, R1, R2" msgstr "R1, R2, R3" -#: events/models.py:146 +#: events/models.py:143 msgid "R0" msgstr "R0" -#: events/models.py:147 +#: events/models.py:144 msgid "R0_1" msgstr "R0_1" -#: events/models.py:148 +#: events/models.py:145 msgid "R0_2" msgstr "R0_2" # #: events/models.py:122 # msgid "R0" # msgstr "R0" -#: events/models.py:149 events/templatetags/events.py:15 +#: events/models.py:146 msgid "R1" msgstr "R1" -#: events/models.py:150 +#: events/models.py:147 msgid "R1_1" msgstr "R1_1" -#: events/models.py:151 +#: events/models.py:148 msgid "R1_2" msgstr "R1_2" -#: events/models.py:152 events/templatetags/events.py:16 +#: events/models.py:149 msgid "R2" msgstr "R2" -#: events/models.py:153 +#: events/models.py:150 msgid "R2_1" msgstr "R2_1" -#: events/models.py:154 +#: events/models.py:151 msgid "R2_2" msgstr "R2_2" -#: events/models.py:155 events/templatetags/events.py:17 +#: events/models.py:152 msgid "R3" msgstr "R3" -#: events/models.py:156 +#: events/models.py:153 msgid "Open Space" msgstr "Open Spaces" -#: events/models.py:165 +#: events/models.py:162 msgid "location" msgstr "location" -#: events/models.py:197 +#: events/models.py:194 msgid "is break event" msgstr "is break event" -#: events/models.py:200 +#: events/models.py:197 msgid "" "Whether this event is displays as a break. A break can be visually " "distinguished from \"real\" conference sessions, such as keynotes, talks, " @@ -434,71 +433,71 @@ msgstr "" "Whether this event is displays as a break. A break can be visually " "distinguished from “real” conference sessions, such as keynotes, talks, etc." -#: events/models.py:206 +#: events/models.py:203 msgid "event description" msgstr "event description" -#: events/models.py:209 +#: events/models.py:206 msgid "link path" msgstr "link path" -#: events/models.py:214 +#: events/models.py:211 msgid "custom event" msgstr "custom event" -#: events/models.py:215 +#: events/models.py:212 msgid "custom events" msgstr "custom events" -#: events/models.py:224 users/models.py:118 +#: events/models.py:221 users/models.py:118 msgid "speaker name" msgstr "speaker name" -#: events/models.py:229 +#: events/models.py:226 msgid "speaker bio" msgstr "speaker bio" -#: events/models.py:233 +#: events/models.py:230 msgid "speaker photo" msgstr "speaker photo" -#: events/models.py:237 +#: events/models.py:234 msgid "Raster format of the speaker's photo, e.g. PNG, JPEG." msgstr "Raster format of the speaker's photo, e.g. PNG, JPEG." -#: events/models.py:241 +#: events/models.py:238 msgid "keynote session title" msgstr "keynote session title" -#: events/models.py:246 +#: events/models.py:243 msgid "keynote session description" msgstr "keynote session description" -#: events/models.py:250 +#: events/models.py:247 msgid "session slides" msgstr "session slides" -#: events/models.py:254 +#: events/models.py:251 msgid "slido" msgstr "Slido" -#: events/models.py:263 +#: events/models.py:260 msgid "social linkedin" msgstr "Linkedin" -#: events/models.py:267 +#: events/models.py:264 msgid "social twitter" msgstr "Twitter" -#: events/models.py:271 +#: events/models.py:268 msgid "social github" msgstr "Github" -#: events/models.py:275 events/models.py:360 +#: events/models.py:272 events/models.py:357 msgid "slug" msgstr "slug" -#: events/models.py:277 +#: events/models.py:274 #, python-brace-format msgid "" "This is used to link to the speaker's introduction on the Keynote page, e.g. " @@ -507,33 +506,33 @@ msgstr "" "This is used to link to the speaker's introduction on the Keynote page, e.g. " "'liang2' will link to '{link}#keynote-speaker-liang2'." -#: events/models.py:284 events/models.py:403 events/models.py:439 +#: events/models.py:281 events/models.py:400 events/models.py:436 msgid "is remote" msgstr "is remote" -#: events/models.py:288 events/models.py:363 events/models.py:407 -#: events/models.py:443 +#: events/models.py:285 events/models.py:360 events/models.py:404 +#: events/models.py:440 msgid "youtube id" msgstr "youtube id" -#: events/models.py:294 +#: events/models.py:291 msgid "keynote event" msgstr "keynote event" -#: events/models.py:295 +#: events/models.py:292 msgid "keynote events" msgstr "keynote events" -#: events/models.py:298 +#: events/models.py:295 #, python-brace-format msgid "Keynote: {speaker}" msgstr "Keynote: {speaker}" -#: events/models.py:337 sponsors/models.py:101 sponsors/models.py:117 +#: events/models.py:334 sponsors/models.py:101 sponsors/models.py:117 msgid "sponsor" msgstr "sponsor" -#: events/models.py:342 events/models.py:343 +#: events/models.py:339 events/models.py:340 #: templates/pycontw-2020/_includes/menu.html:104 #: templates/pycontw-2020/contents/_default/events/job-listings.html:33 #: templates/pycontw-2021/contents/_default/events/job-listings.html:33 @@ -542,117 +541,48 @@ msgstr "sponsor" msgid "Job Listings" msgstr "Job Listings" -#: events/models.py:346 +#: events/models.py:343 #, python-brace-format msgid "Open Role of Sponsor: {sponsor}" msgstr "Open Role of Sponsor: {sponsor}" -#: events/models.py:355 +#: events/models.py:352 msgid "host" msgstr "host" -#: events/models.py:369 +#: events/models.py:366 msgid "sponsored event" msgstr "sponsored event" -#: events/models.py:370 +#: events/models.py:367 msgid "sponsored events" msgstr "sponsored events" -#: events/models.py:398 events/models.py:429 reviews/models.py:76 +#: events/models.py:395 events/models.py:426 reviews/models.py:76 #: reviews/models.py:197 msgid "proposal" msgstr "proposal" -#: events/models.py:415 +#: events/models.py:412 msgid "talk event" msgstr "talk event" -#: events/models.py:416 +#: events/models.py:413 msgid "talk events" msgstr "talk events" -#: events/models.py:434 +#: events/models.py:431 msgid "registration link" msgstr "registration link" -#: events/models.py:451 +#: events/models.py:448 msgid "tutorial event" msgstr "tutorial event" -#: events/models.py:452 +#: events/models.py:449 msgid "tutorial events" msgstr "tutorial events" -#: events/models.py:466 -msgid "HTML" -msgstr "HTML" - -#: events/models.py:474 templates/pycontw-2016/_includes/nav/front_nav.html:40 -#: templates/pycontw-2016/events/schedule.html:6 -#: templates/pycontw-2016/events/schedule.html:8 -#: templates/pycontw-2017/contents/_default/portal.html:16 -#: templates/pycontw-2017/events/schedule.html:6 -#: templates/pycontw-2017/events/schedule.html:17 -#: templates/pycontw-2018/_includes/menu.html:54 -#: templates/pycontw-2018/contents/_default/portal.html:17 -#: templates/pycontw-2018/events/schedule.html:6 -#: templates/pycontw-2018/events/schedule.html:20 -#: templates/pycontw-2019/_includes/menu.html:59 -#: templates/pycontw-2019/_includes/portal.html:4 -#: templates/pycontw-2019/events/schedule.html:6 -#: templates/pycontw-2019/events/schedule.html:20 -#: templates/pycontw-2020/_includes/menu.html:80 -#: templates/pycontw-2020/_includes/portal.html:4 -#: templates/pycontw-2020/events/schedule.html:6 -#: templates/pycontw-2020/events/schedule.html:21 -#: templates/pycontw-2021/_includes/portal.html:4 -#: templates/pycontw-2021/events/schedule.html:6 -#: templates/pycontw-2021/events/schedule.html:21 -#: templates/pycontw-2022/_includes/portal.html:4 -#: templates/pycontw-2022/events/schedule.html:6 -#: templates/pycontw-2022/events/schedule.html:21 -#: templates/pycontw-2023/_includes/portal.html:4 -#: templates/pycontw-2023/events/schedule.html:6 -#: templates/pycontw-2023/events/schedule.html:21 -msgid "Schedule" -msgstr "Schedule" - -#: events/models.py:475 -msgid "Schedules" -msgstr "Schedules" - -#: events/models.py:480 -msgid "Schedule created at {}" -msgstr "Schedule created at {}" - -#: events/renderers.py:34 -msgid "Keynote" -msgstr "Keynote" - -#: events/renderers.py:43 -msgid "EN Slides" -msgstr "EN Slides" - -# #: events/models.py:125 -# msgid "R4" -# msgstr "R4" -#: events/templatetags/events.py:18 -msgid "Multifunction room" -msgstr "Multifunction room" - -#: events/templatetags/events.py:19 -msgid "Goodideas Studio" -msgstr "Goodideas Studio" - -#: events/templatetags/events.py:20 -msgid "R1, R2, R3" -msgstr "R1, R2, R3" - -#: events/views.py:121 -msgid "New talk schedule generated successfully." -msgstr "New talk schedule generated successfully." - #: proposals/forms/mixins.py:16 #, python-brace-format msgid "" @@ -662,7 +592,7 @@ msgstr "" "Only authenticated user with complete speaker profile may create a " "{model_name}." -#: proposals/forms/mixins.py:44 proposals/forms/mixins.py:156 +#: proposals/forms/mixins.py:44 proposals/forms/mixins.py:153 msgid "" "

      Proposal Examples.

      The overview of what " @@ -676,7 +606,7 @@ msgstr "" "here. If your talk is accepted, this will be displayed on both the website " "and the handbook. Should be one paragraph.

      " -#: proposals/forms/mixins.py:53 proposals/forms/mixins.py:165 +#: proposals/forms/mixins.py:53 proposals/forms/mixins.py:162 #, python-brace-format msgid "" "The choice of talk level matters during the review process. More definition " @@ -693,7 +623,7 @@ msgstr "" "contact you to change the talk level when we find the content is too-hard or " "too-easy for the target audience." -#: proposals/forms/mixins.py:64 proposals/forms/mixins.py:176 +#: proposals/forms/mixins.py:64 proposals/forms/mixins.py:173 msgid "" "

      Proposal Examples.

      Try not be " @@ -730,7 +660,7 @@ msgstr "" "found at Recording Release page." -#: proposals/forms/mixins.py:88 proposals/forms/mixins.py:198 +#: proposals/forms/mixins.py:88 proposals/forms/mixins.py:195 msgid "" "You can add your slide link near or after the conference day. Not required " "for review." @@ -762,7 +692,7 @@ msgstr "" "the room, what will they learn that they didn't know before? This is NOT " "made public and for REVIEW ONLY.

      " -#: proposals/forms/mixins.py:107 proposals/forms/mixins.py:209 +#: proposals/forms/mixins.py:107 proposals/forms/mixins.py:206 msgid "" "Anything else you'd like the program committee to know when making their " "selection: your past speaking experience, community experience, etc. This is " @@ -794,7 +724,7 @@ msgstr "" "href='http://daringfireball.net/projects/markdown/basics' target='_blank' " "rel='noopener'>Markdown. This is NOT made public and for REVIEW ONLY.

      " -#: proposals/forms/mixins.py:127 proposals/forms/mixins.py:225 +#: proposals/forms/mixins.py:127 proposals/forms/mixins.py:222 msgid "" "If you disagree to authorize PyCon Taiwan to record video, whether you agree " "to let PyCon Taiwan live stream your presentation only for the remote " @@ -806,11 +736,11 @@ msgstr "" "attendees to watch ? (we will not release audio and video of your " "presentation)" -#: proposals/forms/mixins.py:153 +#: proposals/forms/mixins.py:150 msgid "

      Tutorials are limited to 1.5 hours in length this year.

      " msgstr "

      Tutorials are limited to 1.5 hours in length this year.

      " -#: proposals/forms/mixins.py:190 +#: proposals/forms/mixins.py:187 #, python-brace-format msgid "" "Whether you agree to give permission to PyCon Taiwan to record, edit, and " @@ -823,7 +753,7 @@ msgstr "" "at Recording Release page." -#: proposals/forms/mixins.py:202 +#: proposals/forms/mixins.py:199 msgid "" "Who is the intended audience for your talk? (Be specific, \"Python users\" " "is not a good answer). And what will the attendees get out of your talk? " @@ -835,7 +765,7 @@ msgstr "" "they leave the room, what will they learn that they didn't know before? This " "is NOT made public and for REVIEW ONLY." -#: proposals/forms/mixins.py:217 +#: proposals/forms/mixins.py:214 msgid "" "How the tutorial will be arranged. You should enumerate over each section in " "your talk and attach each section with the estimated time length. Edit using " @@ -1244,40 +1174,40 @@ msgstr "Talk proposal {title} updated." msgid "Tutorial proposal {title} updated." msgstr "Tutorial proposal {title} updated." -#: pycontw2016/settings/base.py:301 +#: pycontw2016/settings/base.py:300 msgid "PyCon Taiwan 2016" msgstr "PyCon Taiwan 2016" -#: pycontw2016/settings/base.py:302 templates/pycontw-2017/index.html:6 +#: pycontw2016/settings/base.py:301 templates/pycontw-2017/index.html:6 msgid "PyCon Taiwan 2017" msgstr "PyCon Taiwan 2017" -#: pycontw2016/settings/base.py:303 templates/pycontw-2018/index.html:14 +#: pycontw2016/settings/base.py:302 templates/pycontw-2018/index.html:14 msgid "PyCon Taiwan 2018" msgstr "PyCon Taiwan 2018" -#: pycontw2016/settings/base.py:304 templates/pycontw-2019/index.html:14 +#: pycontw2016/settings/base.py:303 templates/pycontw-2019/index.html:14 msgid "PyCon Taiwan 2019" msgstr "PyCon Taiwan 2019" -#: pycontw2016/settings/base.py:305 templates/pycontw-2020/index.html:14 +#: pycontw2016/settings/base.py:304 templates/pycontw-2020/index.html:14 msgid "PyCon Taiwan 2020" msgstr "PyCon Taiwan 2020" -#: pycontw2016/settings/base.py:306 templates/pycontw-2021/index.html:14 +#: pycontw2016/settings/base.py:305 templates/pycontw-2021/index.html:14 #: templates/pycontw-2022/index.html:14 templates/pycontw-2023/index.html:14 msgid "PyCon Taiwan 2021" msgstr "PyCon Taiwan 2021" -#: pycontw2016/settings/base.py:307 +#: pycontw2016/settings/base.py:306 msgid "PyCon Taiwan 2022" msgstr "PyCon Taiwan 2022" -#: pycontw2016/settings/base.py:308 +#: pycontw2016/settings/base.py:307 msgid "PyCon Taiwan 2023" msgstr "PyCon Taiwan 2023" -#: pycontw2016/settings/base.py:321 +#: pycontw2016/settings/base.py:320 #: pycontw2016/settings/production/pycontw2016.py:16 #: pycontw2016/settings/production/pycontw2021.py:15 #: pycontw2016/settings/production/pycontw2022.py:14 @@ -1288,7 +1218,7 @@ msgstr "PyCon Taiwan 2023" msgid "No preference" msgstr "No preference" -#: pycontw2016/settings/base.py:322 +#: pycontw2016/settings/base.py:321 #: pycontw2016/settings/production/pycontw2021.py:16 #: pycontw2016/settings/production/pycontw2022.py:15 #: pycontw2016/settings/production/pycontw2023.py:15 @@ -1298,7 +1228,7 @@ msgstr "No preference" msgid "Prefer 15min" msgstr "Prefer 15min" -#: pycontw2016/settings/base.py:323 +#: pycontw2016/settings/base.py:322 #: pycontw2016/settings/production/pycontw2021.py:17 #: pycontw2016/settings/production/pycontw2022.py:16 #: pycontw2016/settings/production/pycontw2023.py:16 @@ -1308,13 +1238,13 @@ msgstr "Prefer 15min" msgid "Prefer 30min" msgstr "Prefer 30min" -#: pycontw2016/settings/base.py:327 +#: pycontw2016/settings/base.py:326 #: pycontw2016/settings/production/pycontw2016.py:22 #: templates/pycontw-2016/events/schedule.html:42 msgid "Day 1" msgstr "Day 1" -#: pycontw2016/settings/base.py:328 +#: pycontw2016/settings/base.py:327 #: pycontw2016/settings/production/pycontw2016.py:23 #: templates/pycontw-2016/events/schedule.html:45 msgid "Day 2" @@ -2331,7 +2261,7 @@ msgstr "We screwed up. It’s not your fault." #: templates/pycontw-2020/_includes/menu.html:42 #: templates/pycontw-2021/_includes/menu.html:42 #: templates/pycontw-2022/_includes/menu.html:42 -#: templates/pycontw-2023/_includes/menu.html:42 +#: templates/pycontw-2023/_includes/menu.html:41 msgid "About" msgstr "About" @@ -2393,6 +2323,33 @@ msgstr "Events" msgid "Overview" msgstr "Overview" +#: templates/pycontw-2016/_includes/nav/front_nav.html:40 +#: templates/pycontw-2016/events/schedule.html:6 +#: templates/pycontw-2016/events/schedule.html:8 +#: templates/pycontw-2017/contents/_default/portal.html:16 +#: templates/pycontw-2017/events/schedule.html:6 +#: templates/pycontw-2017/events/schedule.html:17 +#: templates/pycontw-2018/_includes/menu.html:54 +#: templates/pycontw-2018/contents/_default/portal.html:17 +#: templates/pycontw-2018/events/schedule.html:6 +#: templates/pycontw-2018/events/schedule.html:20 +#: templates/pycontw-2019/_includes/menu.html:59 +#: templates/pycontw-2019/_includes/portal.html:4 +#: templates/pycontw-2019/events/schedule.html:6 +#: templates/pycontw-2019/events/schedule.html:20 +#: templates/pycontw-2020/_includes/menu.html:80 +#: templates/pycontw-2020/_includes/portal.html:4 +#: templates/pycontw-2020/events/schedule.html:6 +#: templates/pycontw-2020/events/schedule.html:21 +#: templates/pycontw-2021/_includes/portal.html:4 +#: templates/pycontw-2021/events/schedule.html:6 +#: templates/pycontw-2021/events/schedule.html:21 +#: templates/pycontw-2022/_includes/portal.html:4 +#: templates/pycontw-2022/events/schedule.html:6 +#: templates/pycontw-2022/events/schedule.html:21 +msgid "Schedule" +msgstr "Schedule" + #: templates/pycontw-2016/_includes/nav/front_nav.html:41 #: templates/pycontw-2018/_includes/menu.html:55 #: templates/pycontw-2018/contents/en/events/overview.html:38 @@ -2580,7 +2537,6 @@ msgstr "Quick Jump" #: templates/pycontw-2020/events/schedule_create.html:100 #: templates/pycontw-2021/events/schedule_create.html:100 #: templates/pycontw-2022/events/schedule_create.html:100 -#: templates/pycontw-2023/events/schedule_create.html:100 msgid "Schedule table generation requires JavaScript. Please. (´･_･`)" msgstr "Schedule table generation requires JavaScript. Please. (´･_･`)" @@ -2591,7 +2547,6 @@ msgstr "Schedule table generation requires JavaScript. Please. (´･_･`)" #: templates/pycontw-2020/events/schedule_create.html:109 #: templates/pycontw-2021/events/schedule_create.html:109 #: templates/pycontw-2022/events/schedule_create.html:109 -#: templates/pycontw-2023/events/schedule_create.html:109 msgid "Generate" msgstr "Generate" @@ -2920,7 +2875,7 @@ msgstr "Portal" #: templates/pycontw-2020/_includes/portal.html:8 #: templates/pycontw-2021/_includes/portal.html:8 #: templates/pycontw-2022/_includes/portal.html:8 -#: templates/pycontw-2023/_includes/portal.html:8 +#: templates/pycontw-2023/_includes/portal.html:4 msgid "Collaborative Notes" msgstr "Collaborative Notes" @@ -2941,7 +2896,7 @@ msgstr "Quiz Leaderboard" #: templates/pycontw-2020/_includes/portal.html:16 #: templates/pycontw-2021/_includes/portal.html:16 #: templates/pycontw-2022/_includes/portal.html:16 -#: templates/pycontw-2023/_includes/portal.html:16 +#: templates/pycontw-2023/_includes/portal.html:12 msgid "Facebook Fan Page" msgstr "Facebook Fan Page" @@ -2985,8 +2940,6 @@ msgstr "Unconference" #: templates/pycontw-2021/events/schedule_create.html:16 #: templates/pycontw-2022/events/schedule_create.html:7 #: templates/pycontw-2022/events/schedule_create.html:16 -#: templates/pycontw-2023/events/schedule_create.html:7 -#: templates/pycontw-2023/events/schedule_create.html:16 msgid "Export New Schedule" msgstr "Export New Schedule" @@ -3199,7 +3152,7 @@ msgstr "Registration" #: templates/pycontw-2020/_includes/menu.html:138 #: templates/pycontw-2021/_includes/menu.html:152 #: templates/pycontw-2022/_includes/menu.html:152 -#: templates/pycontw-2023/_includes/menu.html:152 +#: templates/pycontw-2023/_includes/menu.html:150 msgid "My PyCon" msgstr "My PyCon" @@ -4270,7 +4223,7 @@ msgstr "Warm-Up Session" #: templates/pycontw-2020/_includes/menu.html:132 #: templates/pycontw-2021/_includes/menu.html:146 #: templates/pycontw-2022/_includes/menu.html:146 -#: templates/pycontw-2023/_includes/menu.html:146 +#: templates/pycontw-2023/_includes/menu.html:144 msgctxt "COVID-19 Guidelines" msgid "COVID-19 Guidelines" msgstr "COVID-19 Guidelines" @@ -4278,14 +4231,14 @@ msgstr "COVID-19 Guidelines" #: templates/pycontw-2020/_includes/portal.html:12 #: templates/pycontw-2021/_includes/portal.html:12 #: templates/pycontw-2022/_includes/portal.html:12 -#: templates/pycontw-2023/_includes/portal.html:12 +#: templates/pycontw-2023/_includes/portal.html:8 msgid "Discord Chat Room" msgstr "Discord 聊天室" #: templates/pycontw-2020/_includes/portal.html:20 #: templates/pycontw-2021/_includes/portal.html:20 #: templates/pycontw-2022/_includes/portal.html:20 -#: templates/pycontw-2023/_includes/portal.html:20 +#: templates/pycontw-2023/_includes/portal.html:16 msgid "Open space" msgstr "Open space" @@ -5020,3 +4973,21 @@ msgstr "" #: users/views.py:129 msgid "Password reset successful. You can now login." msgstr "Password reset successful. You can now login." + +#~ msgid "Keynote" +#~ msgstr "Keynote" + +#~ msgid "EN Slides" +#~ msgstr "EN Slides" + +# #: events/models.py:125 +# msgid "R4" +# msgstr "R4" +#~ msgid "Multifunction room" +#~ msgstr "Multifunction room" + +#~ msgid "Goodideas Studio" +#~ msgstr "Goodideas Studio" + +#~ msgid "R1, R2, R3" +#~ msgstr "R1, R2, R3" diff --git a/src/locale/zh_Hant/LC_MESSAGES/django.po b/src/locale/zh_Hant/LC_MESSAGES/django.po index 43f4f6e24..ae89202de 100644 --- 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-03-08 22:50+0800\n" +"POT-Creation-Date: 2023-03-16 11:24+0800\n" "PO-Revision-Date: 2022-07-11 02:25+0800\n" "Last-Translator: Tom Chen \n" "Language-Team: Chinese Traditional (http://www.transifex.com/pycon-taiwan/" @@ -40,7 +40,7 @@ msgstr "驗證碼" msgid "verified" msgstr "已認證" -#: attendee/models.py:9 core/models.py:153 events/models.py:469 +#: attendee/models.py:9 core/models.py:163 msgid "created at" msgstr "建立時間" @@ -90,8 +90,7 @@ msgstr "演講" msgid "Current" msgstr "" -#: core/admin.py:16 core/choices.py:24 events/models.py:157 -#: events/templatetags/events.py:21 +#: core/admin.py:16 core/choices.py:24 events/models.py:154 msgid "Other" msgstr "其他" @@ -251,108 +250,108 @@ msgstr "否" msgid "{model_name_cap} creation requires a request object." msgstr "建立 {model_name_cap} 需要一個 request 物件。" -#: core/models.py:71 +#: core/models.py:81 msgid "conference" msgstr "會議" -#: core/models.py:84 events/models.py:193 +#: core/models.py:94 events/models.py:190 msgid "title" msgstr "題目" -#: core/models.py:89 +#: core/models.py:99 msgid "category" msgstr "分類" -#: core/models.py:95 +#: core/models.py:105 msgid "language" msgstr "語言" -#: core/models.py:101 +#: core/models.py:111 msgid "abstract" msgstr "摘要" -#: core/models.py:106 templates/default/reviews/review_form.html:53 +#: core/models.py:116 templates/default/reviews/review_form.html:53 msgid "Python level" msgstr "Python 難易度" -#: core/models.py:112 +#: core/models.py:122 msgid "detailed description" msgstr "詳細說明" -#: core/models.py:117 +#: core/models.py:127 msgid "recording policy" msgstr "議程錄影釋出" -#: core/models.py:123 +#: core/models.py:133 msgid "live stream policy" msgstr "議程直播" -#: core/models.py:129 +#: core/models.py:139 msgid "referring policy" msgstr "轉介至地方社群" -#: core/models.py:135 +#: core/models.py:145 msgid "slide link" msgstr "投影片連結" -#: core/models.py:141 +#: core/models.py:151 msgid "slido embed link" msgstr "Slido 嵌入連結" -#: core/models.py:147 events/models.py:258 +#: core/models.py:157 events/models.py:255 msgid "HackMD embed link" msgstr "HackMD 嵌入連結" -#: core/models.py:159 +#: core/models.py:169 msgid "last updated at" msgstr "最後更新" -#: core/models.py:164 +#: core/models.py:174 msgid "prefer event time" msgstr "偏好議程時間" -#: core/models.py:170 +#: core/models.py:180 msgid "living in Taiwan" msgstr "是否住在台灣" -#: core/models.py:176 +#: core/models.py:186 msgid "attending PyCon TW in person" msgstr "是否願意以實體方式與會" -#: core/models.py:208 reviews/admin.py:51 +#: core/models.py:218 reviews/admin.py:51 msgid "Key" msgstr "鍵" -#: core/models.py:212 proposals/models.py:62 users/models.py:198 +#: core/models.py:222 proposals/models.py:62 users/models.py:198 #: users/models.py:313 msgid "user" msgstr "使用者" -#: core/models.py:215 +#: core/models.py:225 msgid "Created" msgstr "建立時間" -#: core/models.py:218 +#: core/models.py:228 msgid "Token" msgstr "驗證碼" -#: core/models.py:219 +#: core/models.py:229 msgid "Tokens" msgstr "驗證碼" -#: events/admin.py:26 +#: events/admin.py:30 msgid "time value" msgstr "時間值" -#: events/admin.py:100 events/models.py:173 +#: events/admin.py:104 events/models.py:170 msgid "begin time" msgstr "開始時間" -#: events/admin.py:106 events/models.py:182 +#: events/admin.py:110 events/models.py:179 msgid "end time" msgstr "結束時間" -#: events/admin.py:128 +#: events/admin.py:132 #: templates/default/users/_includes/dashboard_proposal_table.html:32 msgid "Edit" msgstr "編輯" @@ -369,70 +368,70 @@ msgstr "時間" msgid "times" msgstr "時間" -#: events/models.py:144 +#: events/models.py:141 msgid "All rooms" msgstr "全體會議" -#: events/models.py:145 +#: events/models.py:142 msgid "R0, R1, R2" msgstr "R1、R2、R3" -#: events/models.py:146 +#: events/models.py:143 msgid "R0" msgstr "" -#: events/models.py:147 +#: events/models.py:144 msgid "R0_1" msgstr "" -#: events/models.py:148 +#: events/models.py:145 msgid "R0_2" msgstr "" # #: events/models.py:122 # msgid "R0" # msgstr "R0" -#: events/models.py:149 events/templatetags/events.py:15 +#: events/models.py:146 msgid "R1" msgstr "R1" -#: events/models.py:150 +#: events/models.py:147 msgid "R1_1" msgstr "" -#: events/models.py:151 +#: events/models.py:148 msgid "R1_2" msgstr "" -#: events/models.py:152 events/templatetags/events.py:16 +#: events/models.py:149 msgid "R2" msgstr "R2" -#: events/models.py:153 +#: events/models.py:150 msgid "R2_1" msgstr "" -#: events/models.py:154 +#: events/models.py:151 msgid "R2_2" msgstr "" -#: events/models.py:155 events/templatetags/events.py:17 +#: events/models.py:152 msgid "R3" msgstr "R3" -#: events/models.py:156 +#: events/models.py:153 msgid "Open Space" msgstr "開放空間" -#: events/models.py:165 +#: events/models.py:162 msgid "location" msgstr "地點" -#: events/models.py:197 +#: events/models.py:194 msgid "is break event" msgstr "休息" -#: events/models.py:200 +#: events/models.py:197 msgid "" "Whether this event is displays as a break. A break can be visually " "distinguished from \"real\" conference sessions, such as keynotes, talks, " @@ -441,71 +440,71 @@ msgstr "" "此活動是否應該被顯示為休息時間。休息時間的顯示會與「真的」會議時段，例如基調" "演講、一般演講不同。" -#: events/models.py:206 +#: events/models.py:203 msgid "event description" msgstr "活動說明" -#: events/models.py:209 +#: events/models.py:206 msgid "link path" msgstr "連結路徑" -#: events/models.py:214 +#: events/models.py:211 msgid "custom event" msgstr "自訂活動" -#: events/models.py:215 +#: events/models.py:212 msgid "custom events" msgstr "自訂活動" -#: events/models.py:224 users/models.py:118 +#: events/models.py:221 users/models.py:118 msgid "speaker name" msgstr "演講者" -#: events/models.py:229 +#: events/models.py:226 msgid "speaker bio" msgstr "演講者介紹" -#: events/models.py:233 +#: events/models.py:230 msgid "speaker photo" msgstr "演講者照片" -#: events/models.py:237 +#: events/models.py:234 msgid "Raster format of the speaker's photo, e.g. PNG, JPEG." msgstr "演講者照片使用點陣格式，例如PNG, JPEG" -#: events/models.py:241 +#: events/models.py:238 msgid "keynote session title" msgstr "演講標題" -#: events/models.py:246 +#: events/models.py:243 msgid "keynote session description" msgstr "演講介紹" -#: events/models.py:250 +#: events/models.py:247 msgid "session slides" msgstr "演講投影片" -#: events/models.py:254 +#: events/models.py:251 msgid "slido" msgstr "Slido" -#: events/models.py:263 +#: events/models.py:260 msgid "social linkedin" msgstr "Linkedin" -#: events/models.py:267 +#: events/models.py:264 msgid "social twitter" msgstr "Twitter" -#: events/models.py:271 +#: events/models.py:268 msgid "social github" msgstr "Github" -#: events/models.py:275 events/models.py:360 +#: events/models.py:272 events/models.py:357 msgid "slug" msgstr "網址文字" -#: events/models.py:277 +#: events/models.py:274 #, python-brace-format msgid "" "This is used to link to the speaker's introduction on the Keynote page, e.g. " @@ -514,33 +513,33 @@ msgstr "" "用來連結至基調演講頁面上的講者簡介，如「liang2」可連結至「{link}#keynote-" "speaker-liang2」。" -#: events/models.py:284 events/models.py:403 events/models.py:439 +#: events/models.py:281 events/models.py:400 events/models.py:436 msgid "is remote" msgstr "遠端演講" -#: events/models.py:288 events/models.py:363 events/models.py:407 -#: events/models.py:443 +#: events/models.py:285 events/models.py:360 events/models.py:404 +#: events/models.py:440 msgid "youtube id" msgstr "youtube id" -#: events/models.py:294 +#: events/models.py:291 msgid "keynote event" msgstr "基調演講" -#: events/models.py:295 +#: events/models.py:292 msgid "keynote events" msgstr "基調演講" -#: events/models.py:298 +#: events/models.py:295 #, python-brace-format msgid "Keynote: {speaker}" msgstr "基調演講：{speaker}" -#: events/models.py:337 sponsors/models.py:101 sponsors/models.py:117 +#: events/models.py:334 sponsors/models.py:101 sponsors/models.py:117 msgid "sponsor" msgstr "贊助" -#: events/models.py:342 events/models.py:343 +#: events/models.py:339 events/models.py:340 #: templates/pycontw-2020/_includes/menu.html:104 #: templates/pycontw-2020/contents/_default/events/job-listings.html:33 #: templates/pycontw-2021/contents/_default/events/job-listings.html:33 @@ -549,117 +548,48 @@ msgstr "贊助" msgid "Job Listings" msgstr "徵才資訊" -#: events/models.py:346 +#: events/models.py:343 #, python-brace-format msgid "Open Role of Sponsor: {sponsor}" msgstr "徵才中贊助商: {sponsor}" -#: events/models.py:355 +#: events/models.py:352 msgid "host" msgstr "主持人" -#: events/models.py:369 +#: events/models.py:366 msgid "sponsored event" msgstr "贊助演講" -#: events/models.py:370 +#: events/models.py:367 msgid "sponsored events" msgstr "贊助演講" -#: events/models.py:398 events/models.py:429 reviews/models.py:76 +#: events/models.py:395 events/models.py:426 reviews/models.py:76 #: reviews/models.py:197 msgid "proposal" msgstr "提案" -#: events/models.py:415 +#: events/models.py:412 msgid "talk event" msgstr "演講" -#: events/models.py:416 +#: events/models.py:413 msgid "talk events" msgstr "演講" -#: events/models.py:434 +#: events/models.py:431 msgid "registration link" msgstr "報名連結" -#: events/models.py:451 +#: events/models.py:448 msgid "tutorial event" msgstr "專業課程" -#: events/models.py:452 +#: events/models.py:449 msgid "tutorial events" msgstr "專業課程" -#: events/models.py:466 -msgid "HTML" -msgstr "HTML" - -#: events/models.py:474 templates/pycontw-2016/_includes/nav/front_nav.html:40 -#: templates/pycontw-2016/events/schedule.html:6 -#: templates/pycontw-2016/events/schedule.html:8 -#: templates/pycontw-2017/contents/_default/portal.html:16 -#: templates/pycontw-2017/events/schedule.html:6 -#: templates/pycontw-2017/events/schedule.html:17 -#: templates/pycontw-2018/_includes/menu.html:54 -#: templates/pycontw-2018/contents/_default/portal.html:17 -#: templates/pycontw-2018/events/schedule.html:6 -#: templates/pycontw-2018/events/schedule.html:20 -#: templates/pycontw-2019/_includes/menu.html:59 -#: templates/pycontw-2019/_includes/portal.html:4 -#: templates/pycontw-2019/events/schedule.html:6 -#: templates/pycontw-2019/events/schedule.html:20 -#: templates/pycontw-2020/_includes/menu.html:80 -#: templates/pycontw-2020/_includes/portal.html:4 -#: templates/pycontw-2020/events/schedule.html:6 -#: templates/pycontw-2020/events/schedule.html:21 -#: templates/pycontw-2021/_includes/portal.html:4 -#: templates/pycontw-2021/events/schedule.html:6 -#: templates/pycontw-2021/events/schedule.html:21 -#: templates/pycontw-2022/_includes/portal.html:4 -#: templates/pycontw-2022/events/schedule.html:6 -#: templates/pycontw-2022/events/schedule.html:21 -#: templates/pycontw-2023/_includes/portal.html:4 -#: templates/pycontw-2023/events/schedule.html:6 -#: templates/pycontw-2023/events/schedule.html:21 -msgid "Schedule" -msgstr "時間表" - -#: events/models.py:475 -msgid "Schedules" -msgstr "時間表" - -#: events/models.py:480 -msgid "Schedule created at {}" -msgstr "時間表建立於 {}" - -#: events/renderers.py:34 -msgid "Keynote" -msgstr "基調演講" - -#: events/renderers.py:43 -msgid "EN Slides" -msgstr "英文投影片" - -# #: events/models.py:126 -# msgid "R4" -# msgstr "R4" -#: events/templatetags/events.py:18 -msgid "Multifunction room" -msgstr "多功能廳" - -#: events/templatetags/events.py:19 -msgid "Goodideas Studio" -msgstr "好想工作室" - -#: events/templatetags/events.py:20 -msgid "R1, R2, R3" -msgstr "R1、R2、R3" - -#: events/views.py:121 -msgid "New talk schedule generated successfully." -msgstr "演講時間表產生成功。" - #: proposals/forms/mixins.py:16 #, python-brace-format msgid "" @@ -667,7 +597,7 @@ msgid "" "{model_name}." msgstr "只有完成認證並填寫講者資訊的人才能建立 {model_name}。" -#: proposals/forms/mixins.py:44 proposals/forms/mixins.py:156 +#: proposals/forms/mixins.py:44 proposals/forms/mixins.py:153 msgid "" "

      Proposal Examples.

      The overview of what " @@ -680,7 +610,7 @@ msgstr "" "要特別的背景知識（domain knowledge），應註記在此。若您的演講入選，這段文字會" "公佈在網站與大會手冊中。應為單一段落。

      " -#: proposals/forms/mixins.py:53 proposals/forms/mixins.py:165 +#: proposals/forms/mixins.py:53 proposals/forms/mixins.py:162 #, python-brace-format msgid "" "The choice of talk level matters during the review process. More definition " @@ -695,7 +625,7 @@ msgstr "" "如何投稿一文。注意：投稿不會因為級別是「入門」就比較容易上。若我們認為這" "講題對聽眾來說過於簡單或困難時，可能會和你討論是否需要修改。" -#: proposals/forms/mixins.py:64 proposals/forms/mixins.py:176 +#: proposals/forms/mixins.py:64 proposals/forms/mixins.py:173 msgid "" "

      Proposal Examples.

      Try not be " @@ -728,7 +658,7 @@ msgstr "" "錄影釋出" "一頁。" -#: proposals/forms/mixins.py:88 proposals/forms/mixins.py:198 +#: proposals/forms/mixins.py:88 proposals/forms/mixins.py:195 msgid "" "You can add your slide link near or after the conference day. Not required " "for review." @@ -757,7 +687,7 @@ msgstr "" "從這演講中得到什麼？當他們離開了演講廳後，有沒有學到什麼以前不知道的？本欄位" "不公開僅供審查使用。

      " -#: proposals/forms/mixins.py:107 proposals/forms/mixins.py:209 +#: proposals/forms/mixins.py:107 proposals/forms/mixins.py:206 msgid "" "Anything else you'd like the program committee to know when making their " "selection: your past speaking experience, community experience, etc. This is " @@ -787,7 +717,7 @@ msgstr "" "href='http://daringfireball.net/projects/markdown/basics' target='_blank' " "rel='noopener'>Markdown 格式編輯。本欄位不公開僅供審查使用。

      " -#: proposals/forms/mixins.py:127 proposals/forms/mixins.py:225 +#: proposals/forms/mixins.py:127 proposals/forms/mixins.py:222 msgid "" "If you disagree to authorize PyCon Taiwan to record video, whether you agree " "to let PyCon Taiwan live stream your presentation only for the remote " @@ -797,11 +727,11 @@ msgstr "" "若您不同意授權讓 PyCon Taiwan 錄影，是否同意讓 PyCon Taiwan 直播您的演講僅供" "遠端參與者觀看? (我們將不會釋出您演講的影音)" -#: proposals/forms/mixins.py:153 +#: proposals/forms/mixins.py:150 msgid "

      Tutorials are limited to 1.5 hours in length this year.

      " msgstr "

      今年 Tutorial 時間長度僅開放 1.5 小時。

      " -#: proposals/forms/mixins.py:190 +#: proposals/forms/mixins.py:187 #, python-brace-format msgid "" "Whether you agree to give permission to PyCon Taiwan to record, edit, and " @@ -813,7 +743,7 @@ msgstr "" "href='{frontend_host}/zh-hant/speaking/recording' target='_blank'>錄影釋出一頁。" -#: proposals/forms/mixins.py:202 +#: proposals/forms/mixins.py:199 msgid "" "Who is the intended audience for your talk? (Be specific, \"Python users\" " "is not a good answer). And what will the attendees get out of your talk? " @@ -824,7 +754,7 @@ msgstr "" "講中得到什麼？當他們離開了演講廳後，有沒有學到什麼以前不知道的？本欄位不公開" "僅供審查使用。" -#: proposals/forms/mixins.py:217 +#: proposals/forms/mixins.py:214 msgid "" "How the tutorial will be arranged. You should enumerate over each section in " "your talk and attach each section with the estimated time length. Edit using " @@ -1206,40 +1136,40 @@ msgstr "已完成更新《{title}》演講提案。" msgid "Tutorial proposal {title} updated." msgstr "已完成更新《{title}》專業課程提案。" -#: pycontw2016/settings/base.py:301 +#: pycontw2016/settings/base.py:300 msgid "PyCon Taiwan 2016" msgstr "PyCon Taiwan 2016" -#: pycontw2016/settings/base.py:302 templates/pycontw-2017/index.html:6 +#: pycontw2016/settings/base.py:301 templates/pycontw-2017/index.html:6 msgid "PyCon Taiwan 2017" msgstr "PyCon Taiwan 2017" -#: pycontw2016/settings/base.py:303 templates/pycontw-2018/index.html:14 +#: pycontw2016/settings/base.py:302 templates/pycontw-2018/index.html:14 msgid "PyCon Taiwan 2018" msgstr "PyCon Taiwan 2018" -#: pycontw2016/settings/base.py:304 templates/pycontw-2019/index.html:14 +#: pycontw2016/settings/base.py:303 templates/pycontw-2019/index.html:14 msgid "PyCon Taiwan 2019" msgstr "PyCon Taiwan 2019" -#: pycontw2016/settings/base.py:305 templates/pycontw-2020/index.html:14 +#: pycontw2016/settings/base.py:304 templates/pycontw-2020/index.html:14 msgid "PyCon Taiwan 2020" msgstr "PyCon Taiwan 2020" -#: pycontw2016/settings/base.py:306 templates/pycontw-2021/index.html:14 +#: pycontw2016/settings/base.py:305 templates/pycontw-2021/index.html:14 #: templates/pycontw-2022/index.html:14 templates/pycontw-2023/index.html:14 msgid "PyCon Taiwan 2021" msgstr "PyCon Taiwan 2021" -#: pycontw2016/settings/base.py:307 +#: pycontw2016/settings/base.py:306 msgid "PyCon Taiwan 2022" msgstr "PyCon Taiwan 2022" -#: pycontw2016/settings/base.py:308 +#: pycontw2016/settings/base.py:307 msgid "PyCon Taiwan 2023" msgstr "PyCon Taiwan 2023" -#: pycontw2016/settings/base.py:321 +#: pycontw2016/settings/base.py:320 #: pycontw2016/settings/production/pycontw2016.py:16 #: pycontw2016/settings/production/pycontw2021.py:15 #: pycontw2016/settings/production/pycontw2022.py:14 @@ -1250,7 +1180,7 @@ msgstr "PyCon Taiwan 2023" msgid "No preference" msgstr "無偏好" -#: pycontw2016/settings/base.py:322 +#: pycontw2016/settings/base.py:321 #: pycontw2016/settings/production/pycontw2021.py:16 #: pycontw2016/settings/production/pycontw2022.py:15 #: pycontw2016/settings/production/pycontw2023.py:15 @@ -1260,7 +1190,7 @@ msgstr "無偏好" msgid "Prefer 15min" msgstr "偏好 15 分鐘" -#: pycontw2016/settings/base.py:323 +#: pycontw2016/settings/base.py:322 #: pycontw2016/settings/production/pycontw2021.py:17 #: pycontw2016/settings/production/pycontw2022.py:16 #: pycontw2016/settings/production/pycontw2023.py:16 @@ -1270,13 +1200,13 @@ msgstr "偏好 15 分鐘" msgid "Prefer 30min" msgstr "偏好 30 分鐘" -#: pycontw2016/settings/base.py:327 +#: pycontw2016/settings/base.py:326 #: pycontw2016/settings/production/pycontw2016.py:22 #: templates/pycontw-2016/events/schedule.html:42 msgid "Day 1" msgstr "第 1 天" -#: pycontw2016/settings/base.py:328 +#: pycontw2016/settings/base.py:327 #: pycontw2016/settings/production/pycontw2016.py:23 #: templates/pycontw-2016/events/schedule.html:45 msgid "Day 2" @@ -2269,7 +2199,7 @@ msgstr "我們搞砸了，這不是你的問題。" #: templates/pycontw-2020/_includes/menu.html:42 #: templates/pycontw-2021/_includes/menu.html:42 #: templates/pycontw-2022/_includes/menu.html:42 -#: templates/pycontw-2023/_includes/menu.html:42 +#: templates/pycontw-2023/_includes/menu.html:41 msgid "About" msgstr "關於" @@ -2331,6 +2261,33 @@ msgstr "活動" msgid "Overview" msgstr "總覽" +#: templates/pycontw-2016/_includes/nav/front_nav.html:40 +#: templates/pycontw-2016/events/schedule.html:6 +#: templates/pycontw-2016/events/schedule.html:8 +#: templates/pycontw-2017/contents/_default/portal.html:16 +#: templates/pycontw-2017/events/schedule.html:6 +#: templates/pycontw-2017/events/schedule.html:17 +#: templates/pycontw-2018/_includes/menu.html:54 +#: templates/pycontw-2018/contents/_default/portal.html:17 +#: templates/pycontw-2018/events/schedule.html:6 +#: templates/pycontw-2018/events/schedule.html:20 +#: templates/pycontw-2019/_includes/menu.html:59 +#: templates/pycontw-2019/_includes/portal.html:4 +#: templates/pycontw-2019/events/schedule.html:6 +#: templates/pycontw-2019/events/schedule.html:20 +#: templates/pycontw-2020/_includes/menu.html:80 +#: templates/pycontw-2020/_includes/portal.html:4 +#: templates/pycontw-2020/events/schedule.html:6 +#: templates/pycontw-2020/events/schedule.html:21 +#: templates/pycontw-2021/_includes/portal.html:4 +#: templates/pycontw-2021/events/schedule.html:6 +#: templates/pycontw-2021/events/schedule.html:21 +#: templates/pycontw-2022/_includes/portal.html:4 +#: templates/pycontw-2022/events/schedule.html:6 +#: templates/pycontw-2022/events/schedule.html:21 +msgid "Schedule" +msgstr "時間表" + #: templates/pycontw-2016/_includes/nav/front_nav.html:41 #: templates/pycontw-2018/_includes/menu.html:55 #: templates/pycontw-2018/contents/en/events/overview.html:38 @@ -2517,7 +2474,6 @@ msgstr "跳至" #: templates/pycontw-2020/events/schedule_create.html:100 #: templates/pycontw-2021/events/schedule_create.html:100 #: templates/pycontw-2022/events/schedule_create.html:100 -#: templates/pycontw-2023/events/schedule_create.html:100 msgid "Schedule table generation requires JavaScript. Please. (´･_･`)" msgstr "需要 JavaScript 才能產生時間表。求求你～ (´･_･`)" @@ -2528,7 +2484,6 @@ msgstr "需要 JavaScript 才能產生時間表。求求你～ (´･_･`)" #: templates/pycontw-2020/events/schedule_create.html:109 #: templates/pycontw-2021/events/schedule_create.html:109 #: templates/pycontw-2022/events/schedule_create.html:109 -#: templates/pycontw-2023/events/schedule_create.html:109 msgid "Generate" msgstr "產生" @@ -2853,7 +2808,7 @@ msgstr "傳送門" #: templates/pycontw-2020/_includes/portal.html:8 #: templates/pycontw-2021/_includes/portal.html:8 #: templates/pycontw-2022/_includes/portal.html:8 -#: templates/pycontw-2023/_includes/portal.html:8 +#: templates/pycontw-2023/_includes/portal.html:4 msgid "Collaborative Notes" msgstr "共筆" @@ -2874,7 +2829,7 @@ msgstr "猜謎排行榜" #: templates/pycontw-2020/_includes/portal.html:16 #: templates/pycontw-2021/_includes/portal.html:16 #: templates/pycontw-2022/_includes/portal.html:16 -#: templates/pycontw-2023/_includes/portal.html:16 +#: templates/pycontw-2023/_includes/portal.html:12 msgid "Facebook Fan Page" msgstr "Facebook 粉絲頁" @@ -2918,8 +2873,6 @@ msgstr "非正式會議" #: templates/pycontw-2021/events/schedule_create.html:16 #: templates/pycontw-2022/events/schedule_create.html:7 #: templates/pycontw-2022/events/schedule_create.html:16 -#: templates/pycontw-2023/events/schedule_create.html:7 -#: templates/pycontw-2023/events/schedule_create.html:16 msgid "Export New Schedule" msgstr "輸出新時間表" @@ -3124,7 +3077,7 @@ msgstr "報到" #: templates/pycontw-2020/_includes/menu.html:138 #: templates/pycontw-2021/_includes/menu.html:152 #: templates/pycontw-2022/_includes/menu.html:152 -#: templates/pycontw-2023/_includes/menu.html:152 +#: templates/pycontw-2023/_includes/menu.html:150 msgid "My PyCon" msgstr "My PyCon" @@ -4156,7 +4109,7 @@ msgstr "暖身活動" #: templates/pycontw-2020/_includes/menu.html:132 #: templates/pycontw-2021/_includes/menu.html:146 #: templates/pycontw-2022/_includes/menu.html:146 -#: templates/pycontw-2023/_includes/menu.html:146 +#: templates/pycontw-2023/_includes/menu.html:144 msgctxt "COVID-19 Guidelines" msgid "COVID-19 Guidelines" msgstr "COVID-19 防疫守則" @@ -4164,14 +4117,14 @@ msgstr "COVID-19 防疫守則" #: templates/pycontw-2020/_includes/portal.html:12 #: templates/pycontw-2021/_includes/portal.html:12 #: templates/pycontw-2022/_includes/portal.html:12 -#: templates/pycontw-2023/_includes/portal.html:12 +#: templates/pycontw-2023/_includes/portal.html:8 msgid "Discord Chat Room" msgstr "Discord 聊天室" #: templates/pycontw-2020/_includes/portal.html:20 #: templates/pycontw-2021/_includes/portal.html:20 #: templates/pycontw-2022/_includes/portal.html:20 -#: templates/pycontw-2023/_includes/portal.html:20 +#: templates/pycontw-2023/_includes/portal.html:16 msgid "Open space" msgstr "Open space 揪團" @@ -4894,3 +4847,21 @@ msgstr "" #: users/views.py:129 msgid "Password reset successful. You can now login." msgstr "密碼重設成功。您現在即可登入。" + +#~ msgid "Keynote" +#~ msgstr "基調演講" + +#~ msgid "EN Slides" +#~ msgstr "英文投影片" + +# #: events/models.py:126 +# msgid "R4" +# msgstr "R4" +#~ msgid "Multifunction room" +#~ msgstr "多功能廳" + +#~ msgid "Goodideas Studio" +#~ msgstr "好想工作室" + +#~ msgid "R1, R2, R3" +#~ msgstr "R1、R2、R3" From 9d43edd0d2deda6cdce72811a3bc02d49705d68e Mon Sep 17 00:00:00 2001 From: Matt Wang Date: Thu, 16 Mar 2023 11:28:53 +0800 Subject: [PATCH 41/44] chore(deps): remove unused dependency --- requirements/base.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index e0167b507..0bd0505e6 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -86,10 +86,6 @@ pytz==2019.3 # https://sorl-thumbnail.readthedocs.io sorl-thumbnail==12.6.2 -# Python Sorted Container Types: SortedList, SortedDict, and SortedSet. -# http://www.grantjenks.com/docs/sortedcontainers/ -sortedcontainers==2.1.0 - # Tabulate, an utility for pretty-print tabular data # https://bitbucket.org/astanin/python-tabulate tabulate==0.8.6 From d5e160a1b35b222394f224ba122b240b54913c2d Mon Sep 17 00:00:00 2001 From: Matt Wang Date: Thu, 16 Mar 2023 11:41:16 +0800 Subject: [PATCH 42/44] chore(events/model): remove unused method --- src/events/models.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/events/models.py b/src/events/models.py index a55513247..5f799abbd 100644 --- a/src/events/models.py +++ b/src/events/models.py @@ -120,19 +120,6 @@ class Location: R4 = '7-r4' OTHER = '8-oth' - @classmethod - def get_md_width(cls, value): - return { - '2-all': 4, - '3-r012': 3, - '4-r0': 1, - '5-r1': 1, - '6-r2': 1, - '1-r3': 1, - '7-r4': 1, - '8-oth': 1, - }[value] - class BaseEvent(ConferenceRelated): """Base interface for all events in the schedule. From daa9f1bfcba8ff46b949f461027138e7a37e664d Mon Sep 17 00:00:00 2001 From: iknowright Date: Wed, 25 Oct 2023 22:05:45 +0800 Subject: [PATCH 43/44] fix(category-filter): add query string for both ordering and category work at the same time --- src/reviews/views.py | 1 - .../reviews/_includes/proposal_table.html | 26 +++++++++---------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/reviews/views.py b/src/reviews/views.py index 9fd08f261..47675612d 100644 --- a/src/reviews/views.py +++ b/src/reviews/views.py @@ -153,7 +153,6 @@ def get_context_data(self, **kwargs): **self.reviews_state._asdict(), **self.get_category_metrics(context), }) - print(context) return context def get_stage_1_reviews(self): diff --git a/src/templates/default/reviews/_includes/proposal_table.html b/src/templates/default/reviews/_includes/proposal_table.html index 49acb05a1..fb4a65a2f 100644 --- a/src/templates/default/reviews/_includes/proposal_table.html +++ b/src/templates/default/reviews/_includes/proposal_table.html @@ -4,9 +4,9 @@ {% if not verdict %} - + {% trans 'Reviewed' %} @@ -15,8 +15,8 @@ {% endif %} - + {% trans 'Title' %} @@ -24,9 +24,9 @@ - + {% trans 'Lang' %} @@ -34,16 +34,16 @@ - {% if not category %} - + {% else %} - - + + {% endif %} {% for category_option in category_options %} {% if category != category_option %} - + {% endif %} {% endfor %} From 620fe2ae5eddc856779e03a04681ab21d19fb7cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Nov 2023 10:14:46 +0000 Subject: [PATCH 44/44] chore(deps): bump cached-path-relative from 1.0.2 to 1.1.0 Bumps [cached-path-relative](https://github.com/ashaffer/cached-path-relative) from 1.0.2 to 1.1.0. - [Release notes](https://github.com/ashaffer/cached-path-relative/releases) - [Commits](https://github.com/ashaffer/cached-path-relative/commits) --- updated-dependencies: - dependency-name: cached-path-relative dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 6739457f6..e9ad15eea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1145,9 +1145,9 @@ cache-base@^1.0.1: unset-value "^1.0.0" cached-path-relative@^1.0.0, cached-path-relative@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.2.tgz#a13df4196d26776220cc3356eb147a52dba2c6db" - integrity sha512-5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg== + version "1.1.0" + resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.1.0.tgz#865576dfef39c0d6a7defde794d078f5308e3ef3" + integrity sha512-WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA== call-bind@^1.0.0: version "1.0.2"