diff --git a/cfp/views.py b/cfp/views.py index cb78971..d688fbf 100644 --- a/cfp/views.py +++ b/cfp/views.py @@ -120,7 +120,7 @@ def volunteer_mail_token(request): subject=_("[%(conference)s] Someone asked to access your profil") % {'conference': request.conference}, content=body, ) - messages.success(request, _('A email have been sent with a link to access to your profil.')) + messages.success(request, _('An email has been sent with a link to access to your profil.')) return redirect(reverse('volunteer-mail-token')) return render(request, 'cfp/volunteer_mail_token.html', { 'form': form, @@ -331,7 +331,7 @@ Thanks! }, content=body, ) - messages.success(request, _('Your proposition have been successfully submitted!')) + messages.success(request, _('Your proposition has been successfully submitted!')) return redirect(reverse('proposal-talk-details', kwargs=dict(speaker_token=speaker.token, talk_id=talk.pk))) return render(request, 'cfp/proposal_home.html', { 'speaker_form': speaker_form, @@ -372,7 +372,7 @@ Sincerely, }, content=body, ) - messages.success(request, _('A email have been sent with a link to access to your profil.')) + messages.success(request, _('An email has been sent with a link to access to your profil.')) return redirect(reverse('proposal-mail-token')) return render(request, 'cfp/proposal_mail_token.html', { 'form': form, @@ -414,7 +414,7 @@ def proposal_talk_edit(request, speaker, talk_id=None): else: # TODO: it could be great to receive the proposition by mail # but this is not crucial as the speaker already have a link in its mailbox - messages.success(request, _('Your proposition have been successfully submitted!')) + messages.success(request, _('Your proposition has been successfully submitted!')) return redirect(reverse('proposal-talk-details', kwargs=dict(speaker_token=speaker.token, talk_id=talk.pk))) return render(request, 'cfp/proposal_talk_form.html', { 'speaker': speaker, @@ -584,17 +584,17 @@ def talk_acknowledgment(request, talk_id, confirm): talk.confirmed = confirm talk.save() if confirm: - confirmation_message= _('The speaker confirmation have been noted.') + confirmation_message= _('The speaker confirmation has been noted.') action = _('confirmed') - thread_note = _('The talk have been confirmed.') + thread_note = _('The talk has been confirmed.') else: - confirmation_message = _('The speaker unavailability have been noted.') + confirmation_message = _('The speaker unavailability has been noted.') action = _('cancelled') - thread_note = _('The talk have been %(action)s.') % {'action': action} + thread_note = _('The talk has been %(action)s.') % {'action': action} send_message( thread=talk.conversation, author=request.user, - subject=_("[%(conference)s] The talk '%(talk)s' have been %(action)s.") % { + subject=_("[%(conference)s] The talk '%(talk)s' has been %(action)s.") % { 'conference': request.conference, 'talk': talk, 'action': action, @@ -695,7 +695,7 @@ def talk_list(request): send_message( thread=talk.conversation, author=request.user, - subject=_("[%(conference)s] The talk '%(talk)s' have been %(action)s") % { + subject=_("[%(conference)s] The talk '%(talk)s' has been %(action)s") % { 'conference': request.conference, 'talk': talk, 'action': action, @@ -830,7 +830,7 @@ def talk_decide(request, talk_id, accept): send_message( thread=participant.conversation, author=request.conference, - subject=_("[%(conference)s] Your talk '%(talk)s' have been %(action)s") % { + subject=_("[%(conference)s] Your talk '%(talk)s' has been %(action)s") % { 'conference': request.conference, 'talk': talk, 'action': action, @@ -841,7 +841,7 @@ def talk_decide(request, talk_id, accept): send_message( thread=talk.conversation, author=request.user, - subject=_("[%(conference)s] The talk '%(talk)s' have been %(action)s") % { + subject=_("[%(conference)s] The talk '%(talk)s' has been %(action)s") % { 'conference': request.conference, 'talk': talk, 'action': action, diff --git a/doc/installation-guide.rst b/doc/installation-guide.rst index 572f39e..845355f 100644 --- a/doc/installation-guide.rst +++ b/doc/installation-guide.rst @@ -12,7 +12,7 @@ Commands starting with ``$`` must be run as ``ponyconf`` user. Requirements ------------ -PonyConf have been tested with python 3.5 and 3.6. +PonyConf has been tested with python 3.5 and 3.6. Preparation