diff --git a/events/forms.py b/events/forms.py index a026f22..5b6d11f 100644 --- a/events/forms.py +++ b/events/forms.py @@ -215,7 +215,7 @@ class Meta: def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.fields["city"].required = True - self.fields["access"].choices = [(0, "Public"), (2, "Private")] + self.fields["access"].choices = [(0, _("Public")), (2, _("Private"))] class NewTeamForm(forms.ModelForm): @@ -228,7 +228,7 @@ class Meta: def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.fields["city"].required = True - self.fields["access"].choices = [(0, "Public"), (2, "Private")] + self.fields["access"].choices = [(0, _("Public")), (2, _("Private"))] class TeamDefinitionForm(forms.ModelForm): diff --git a/get_together/templates/get_together/events/edit_event.html b/get_together/templates/get_together/events/edit_event.html index 3ad5ad0..ebd6fbf 100644 --- a/get_together/templates/get_together/events/edit_event.html +++ b/get_together/templates/get_together/events/edit_event.html @@ -14,7 +14,7 @@

{% blocktrans with event_name=event.name %}Updating {{event_name}}{% endbloc {% include "events/event_form.html" %}
{% trans "Back" %} - + {% if event.status == event.CANCELED %} {% trans "Restore" %} diff --git a/get_together/templates/get_together/events/manage_attendees.html b/get_together/templates/get_together/events/manage_attendees.html index 63205eb..36b1a5a 100644 --- a/get_together/templates/get_together/events/manage_attendees.html +++ b/get_together/templates/get_together/events/manage_attendees.html @@ -84,13 +84,13 @@

{% blocktrans with event_url=event.get_absolute_url event_name=event.name co
-

Contact


+

{% trans "Contact" %}


{% csrf_token %} {{ contact_form.as_p }} - +
@@ -132,4 +132,4 @@

Contact


$("#attendee-actual-form-"+attendee_id).show() } -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/get_together/templates/get_together/users/login.html b/get_together/templates/get_together/users/login.html index 3099fdc..f970204 100644 --- a/get_together/templates/get_together/users/login.html +++ b/get_together/templates/get_together/users/login.html @@ -17,7 +17,7 @@

{% trans "Login to your account" %}

{% if settings.SOCIAL_AUTH_TWITTER_KEY %} Twitter
{% endif %} {% comment %}{% if settings.SOCIAL_AUTH_LINKEDIN_KEY %} LinkedIn
{% endif %}{% endcomment %} {% if settings.SOCIAL_AUTH_GITHUB_KEY %} GitHub
{% endif %} -

OR

+

{% trans "OR" %}

diff --git a/get_together/views/events.py b/get_together/views/events.py index bc84035..6161e77 100644 --- a/get_together/views/events.py +++ b/get_together/views/events.py @@ -316,13 +316,13 @@ def manage_attendees(request, event_id): if attendee.user.user.account.is_email_confirmed ] default_choices = [ - ("all", "Everyone (%s)" % len(attendee_choices)), - ("hosts", "Only Hosts"), + ("all", _("Everyone (%s)" % len(attendee_choices))), + ("hosts", _("Only Hosts")), ] if event.is_over: - default_choices.append(("attended", "Only Attended")) + default_choices.append(("attended", _("Only Attended"))) else: - default_choices.append(("attending", "Only Attending")) + default_choices.append(("attending", _("Only Attending"))) if request.method == "POST": contact_form = EventContactForm(request.POST) diff --git a/get_together/views/teams.py b/get_together/views/teams.py index 9c74a6d..4cd44f3 100644 --- a/get_together/views/teams.py +++ b/get_together/views/teams.py @@ -262,8 +262,8 @@ def manage_members(request, team_id): if member.user.user.account.is_email_confirmed ] default_choices = [ - ("all", "All Members (%s)" % len(member_choices)), - ("admins", "Only Administrators"), + ("all", _("All Members (%s)" % len(member_choices))), + ("admins", _("Only Administrators")), ] if request.method == "POST": contact_form = TeamContactForm(request.POST)