Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/api/conferences/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ def from_django_model(cls, instance, info):
class Conference:
id: strawberry.ID

name: str = strawberry.field(resolver=make_localized_resolver("name"))
name: str
introduction: str = strawberry.field(
resolver=make_localized_resolver("introduction")
)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated manually to change conference name from I18nCharField to CharField

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('conferences', '0054_conference_frontend_revalidate_secret_and_more'),
]

operations = [
migrations.AlterField(
model_name='conference',
name='name',
field=models.CharField(max_length=100, verbose_name='name'),
),
]
4 changes: 2 additions & 2 deletions backend/conferences/models/conference.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from timezone_field import TimeZoneField

from helpers.models import GeoLocalizedModel
from i18n.fields import I18nCharField, I18nTextField
from i18n.fields import I18nTextField

from .deadline import Deadline, DeadlineStatus

Expand All @@ -24,7 +24,7 @@ class Conference(GeoLocalizedModel, TimeFramedModel, TimeStampedModel):
null=True,
)

name = I18nCharField(_("name"), max_length=100)
name = models.CharField(_("name"), max_length=100)
code = models.CharField(_("code"), max_length=100, unique=True)
timezone = TimeZoneField()
logo = models.ImageField(_("logo"), upload_to=get_upload_to, blank=True)
Expand Down
2 changes: 1 addition & 1 deletion backend/conferences/tests/factories.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

class ConferenceFactory(DjangoModelFactory):
organizer = factory.SubFactory(OrganizerFactory)
name = LanguageFactory("name")
name = factory.Faker("word")
code = factory.Sequence(lambda n: "code{}".format(n))
introduction = LanguageFactory("sentence")

Expand Down
3 changes: 1 addition & 2 deletions backend/conferences/tests/test_models.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
from conferences.tests.factories import ConferenceFactory
from pytest import mark

from i18n.strings import LazyI18nString
from conferences.models.conference import get_upload_to

pytestmark = mark.django_db


def test_conference_to_str():
assert "Ciao Mondo <ep1>" == str(
ConferenceFactory(name=LazyI18nString({"en": "Ciao Mondo"}), code="ep1")
ConferenceFactory(name="Ciao Mondo", code="ep1")
)


Expand Down
2 changes: 1 addition & 1 deletion backend/grants/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ def _new_send_grant_email(
):
conference = grant.conference
user = grant.user
conference_name = grant.conference.name.localize("en")
conference_name = grant.conference.name

email_template = EmailTemplate.objects.for_conference(conference).get_by_identifier(
template_identifier
Expand Down
14 changes: 7 additions & 7 deletions backend/grants/tests/test_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def test_send_grant_reply_rejected_email():
recipient=user,
placeholders={
"user_name": "Marco Acierno",
"conference_name": grant.conference.name.localize("en"),
"conference_name": grant.conference.name,
},
)

Expand Down Expand Up @@ -67,7 +67,7 @@ def test_send_grant_reply_waiting_list_email(settings):
recipient=user,
placeholders={
"user_name": "Marco Acierno",
"conference_name": grant.conference.name.localize("en"),
"conference_name": grant.conference.name,
"grants_update_deadline": "1 March 2023",
"reply_url": "https://pycon.it/grants/reply/",
},
Expand Down Expand Up @@ -101,7 +101,7 @@ def test_handle_grant_reply_sent_reminder(settings):
recipient=user,
placeholders={
"user_name": "Marco Acierno",
"conference_name": grant.conference.name.localize("en"),
"conference_name": grant.conference.name,
"start_date": "2 May",
"end_date": "6 May",
"deadline_date_time": "1 February 2023 23:59 UTC",
Expand Down Expand Up @@ -144,7 +144,7 @@ def test_handle_grant_approved_ticket_travel_accommodation_reply_sent(settings):
recipient=user,
placeholders={
"user_name": "Marco Acierno",
"conference_name": grant.conference.name.localize("en"),
"conference_name": grant.conference.name,
"start_date": "2 May",
"end_date": "6 May",
"travel_amount": "680",
Expand Down Expand Up @@ -218,7 +218,7 @@ def test_handle_grant_approved_ticket_only_reply_sent(settings):
recipient=user,
placeholders={
"user_name": "Marco Acierno",
"conference_name": grant.conference.name.localize("en"),
"conference_name": grant.conference.name,
"start_date": "2 May",
"end_date": "6 May",
"deadline_date_time": "1 February 2023 23:59 UTC",
Expand Down Expand Up @@ -262,7 +262,7 @@ def test_handle_grant_approved_travel_reply_sent(settings):
recipient=user,
placeholders={
"user_name": "Marco Acierno",
"conference_name": grant.conference.name.localize("en"),
"conference_name": grant.conference.name,
"start_date": "2 May",
"end_date": "6 May",
"deadline_date_time": "1 February 2023 23:59 UTC",
Expand Down Expand Up @@ -295,7 +295,7 @@ def test_send_grant_reply_waiting_list_update_email(settings):
"it": "Update Grants in Waiting List",
},
)
conference_name = grant.conference.name.localize("en")
conference_name = grant.conference.name

with patch("grants.tasks.EmailTemplate") as mock_email_template:
send_grant_reply_waiting_list_update_email(
Expand Down
6 changes: 3 additions & 3 deletions backend/schedule/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def send_schedule_invitation_email(*, schedule_item_id, is_reminder):
submission_title = submission.title.localize(language_code)

speaker = User.objects.get(id=speaker_id)
conference_name = conference.name.localize("en")
conference_name = conference.name

email_template = EmailTemplate.objects.for_conference(conference).get_by_identifier(
EmailTemplateIdentifier.proposal_scheduled
Expand Down Expand Up @@ -81,7 +81,7 @@ def send_submission_time_slot_changed_email(*, schedule_item_id):

proposal_speaker = User.objects.get(id=speaker_id)
conference = schedule_item.conference
conference_name = schedule_item.conference.name.localize("en")
conference_name = schedule_item.conference.name

email_template = EmailTemplate.objects.for_conference(conference).get_by_identifier(
EmailTemplateIdentifier.proposal_scheduled_time_changed
Expand Down Expand Up @@ -188,7 +188,7 @@ def send_speaker_communication_email(
email_template.send_email(
recipient=user,
placeholders={
"conference_name": conference.name.localize("en"),
"conference_name": conference.name,
"user_name": get_name(user, "there"),
"body": body.replace("\n", "<br />"),
"subject": subject,
Expand Down
4 changes: 2 additions & 2 deletions backend/schedule/tests/test_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ def test_send_speaker_communication_email_to_speakers_without_ticket(
recipient=user,
placeholders={
"user_name": "Marco Acierno",
"conference_name": conference.name.localize("en"),
"conference_name": conference.name,
"body": "test body",
"subject": "test subject",
},
Expand Down Expand Up @@ -265,7 +265,7 @@ def test_send_speaker_communication_email_to_everyone(
placeholders={
"user_name": "Marco Acierno",
"body": "test body",
"conference_name": conference.name.localize("en"),
"conference_name": conference.name,
"subject": "test subject",
},
)
Expand Down
4 changes: 2 additions & 2 deletions backend/schedule/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ def test_user_schedule_item_favourites_calendar(client):
calendar = icalendar.Calendar.from_ical(response.content)
assert (
calendar.get("x-wr-calname")
== f"Your {conference.name.localize('en')}'s Schedule"
== f"Your {conference.name}'s Schedule"
)

assert len(calendar.subcomponents) == 2
Expand All @@ -148,7 +148,7 @@ def test_user_schedule_item_favourites_calendar(client):

assert (
event_schedule_item_1.get("summary")
== f"[{conference.name.localize('en')}] {schedule_item_1.title}"
== f"[{conference.name}] {schedule_item_1.title}"
)
assert event_schedule_item_1.get("location") == "Room Name"
assert (
Expand Down
2 changes: 1 addition & 1 deletion backend/schedule/video_upload.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def create_video_info(schedule_item: ScheduleItem) -> VideoInfo:
"abstract": schedule_item.abstract,
"slug": schedule_item.slug,
"elevator_pitch": schedule_item.elevator_pitch,
"conference_name": schedule_item.conference.name.localize("en"),
"conference_name": schedule_item.conference.name,
"hashtags": " ".join([f"#{tag}" for tag in tags]),
}

Expand Down
2 changes: 1 addition & 1 deletion backend/schedule/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def user_schedule_item_favourites_calendar(request, conference_id, hash_user_id)
.values_list("schedule_item_id", flat=True)
)

conference_name = conference.name.localize("en")
conference_name = conference.name
conference_code = conference.code
conference_timezone = conference.timezone

Expand Down
2 changes: 1 addition & 1 deletion backend/sponsors/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def send_sponsor_brochure(sponsor_lead_id):
recipient_email=sponsor_lead.email,
placeholders={
"brochure_url": brochure_url,
"conference_name": conference.name.localize("en"),
"conference_name": conference.name,
},
)

Expand Down
2 changes: 1 addition & 1 deletion backend/sponsors/tests/test_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def test_send_sponsor_brochure_task():
recipient_email=sponsor_lead.email,
placeholders={
"brochure_url": f"https://admin.pycon.it{view_brochure_path}?sig={signature}",
"conference_name": sponsor_lead.conference.name.localize("en"),
"conference_name": sponsor_lead.conference.name,
},
)

Expand Down
2 changes: 1 addition & 1 deletion backend/submissions/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ def apply_and_notify_status_change(modeladmin, request, queryset):
for submission in objs:
submission.status = submission.pending_status
placeholders = {
"conference_name": conference.name.localize("en"),
"conference_name": conference.name,
"proposal_title": submission.title.localize("en"),
"proposal_type": submission.type.name,
"speaker_name": get_name(submission.speaker, "there"),
Expand Down
4 changes: 2 additions & 2 deletions backend/submissions/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def send_proposal_rejected_email(proposal_id):

conference = proposal.conference
language_code = proposal.languages.first().code
conference_name = proposal.conference.name.localize(language_code)
conference_name = proposal.conference.name

email_template = EmailTemplate.objects.for_conference(conference).get_by_identifier(
EmailTemplateIdentifier.proposal_rejected
Expand All @@ -96,7 +96,7 @@ def send_proposal_in_waiting_list_email(proposal_id):

conference = proposal.conference
language_code = proposal.languages.first().code
conference_name = proposal.conference.name.localize(language_code)
conference_name = proposal.conference.name

email_template = EmailTemplate.objects.for_conference(conference).get_by_identifier(
EmailTemplateIdentifier.proposal_in_waiting_list
Expand Down
6 changes: 3 additions & 3 deletions backend/submissions/tests/test_admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def test_apply_and_notify_status_change(rf, mocker):
email_template=proposal_accepted_template,
conference=conference,
placeholders={
"conference_name": conference.name.localize("en"),
"conference_name": conference.name,
"proposal_title": accepted_submission.title.localize("en"),
"proposal_type": accepted_submission.type.name,
"speaker_name": "Marco",
Expand All @@ -126,7 +126,7 @@ def test_apply_and_notify_status_change(rf, mocker):
email_template=proposal_rejected_template,
conference=conference,
placeholders={
"conference_name": conference.name.localize("en"),
"conference_name": conference.name,
"proposal_title": rejected_submission.title.localize("en"),
"proposal_type": rejected_submission.type.name,
"speaker_name": "Jane",
Expand All @@ -138,7 +138,7 @@ def test_apply_and_notify_status_change(rf, mocker):
email_template=proposal_in_waiting_list_template,
conference=conference,
placeholders={
"conference_name": conference.name.localize("en"),
"conference_name": conference.name,
"proposal_title": waiting_list_proposal.title.localize("en"),
"proposal_type": waiting_list_proposal.type.name,
"speaker_name": "John",
Expand Down
Loading