Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't extraneously include the hostname on links to workshops for emails #256

Merged
merged 2 commits into from
Aug 15, 2017
Merged
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
5 changes: 5 additions & 0 deletions app/assets/stylesheets/_application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,10 @@ table, .table {
overflow: auto !important;
}
}

&.full {
width: 100%;
}
}

.table-scroller {
Expand Down Expand Up @@ -462,6 +466,7 @@ body.expanded-element {

.responsive-table {
display: block;
width: 100%;

.table-td {
padding: 1em;
Expand Down
1 change: 0 additions & 1 deletion app/views/layouts/application.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,3 @@
= javascripts
= inline_scripts
= emit_js_translations
=# javascript_include_tag :jsreader
22 changes: 21 additions & 1 deletion app/views/registration_steps/_review.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,27 @@
= row do
= columns(medium: 12) do
%h4=_'articles.conference_registration.headings.hosting_info', :t
= richtext @host.housing_data['info']
#house-rules{lang: @host.user.locale.to_s == I18n.locale.to_s ? nil : @host.user.locale}
= richtext @host.housing_data['info']
- elsif @guests
= row do
= columns(medium: 12) do
%h3=_'articles.conference_registration.headings.Hosting', :t
%p=_'articles.conference_registration.paragraphs.Hosting', :p, vars: { count: @guests.sum { |s| s.size } }
= row do
= columns(medium: 12) do
%h4=_'articles.conference_registration.headings.guests', :t
- @guests.each do |space, guests|
%h5=_"forms.labels.generic.#{space}"
%table.full
- guests.each do |guest|
%tr
%th=guest.user.name
%th=guest.from
%tr
- if guest.housing_data['other'].present?
%td{colspan: 2, lang: guest.user.locale.to_s == I18n.locale.to_s ? nil : guest.user.locale}
= paragraph guest.housing_data['other']

= row do
= columns(medium: 12) do
Expand Down
4 changes: 2 additions & 2 deletions app/views/user_mailer/workshop_facilitator_request.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

%p
=_'email.workshop.paragraph.request_instructions',"You can approve or deny this request on your workshop page: "
- workshop_link = @host + view_workshop_url(@conference.slug, @workshop.id).html_safe
- workshop_link = view_workshop_url(@conference.slug, @workshop.id).html_safe
%a{href: workshop_link}=_!(workshop_link)

%p=_'email.workshop.paragraph.request_reply_instructions',"You can also reply directly to this email to ask follow-up questions."

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%p
- workshop_link = link_to (_!@workshop.title), @host + view_workshop_url(@conference.slug, @workshop.id)
- workshop_link = link_to (_!@workshop.title), view_workshop_url(@conference.slug, @workshop.id)
=_'email.workshop.paragraph.request_approved',"You have been added as a facilitator of #{workshop_link.html_safe}.", vars: {workshop_title: workshop_link.html_safe}

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
%p
- workshop_link = link_to (_!@workshop.title), @host + view_workshop_url(@conference.slug, @workshop.id).html_safe
- workshop_link = link_to (_!@workshop.title), view_workshop_url(@conference.slug, @workshop.id).html_safe
=_'email.workshop.paragraph.request_denied',"Your request to become a facilitator of #{workshop_link} has been denied. If you think this was in error, you may contact the current facilitators by making another request to facilitate.", vars: {workshop_title: workshop_link.html_safe}
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@

%p
=_'email.workshop.paragraph.view_workshop',"You can view the workshop here: "
- workshop_link = @host + view_workshop_path(@workshop.conference.slug, @workshop.id)
- workshop_link = view_workshop_path(@workshop.conference.slug, @workshop.id)
%a{href: workshop_link}=workshop_link
2 changes: 1 addition & 1 deletion app/views/user_mailer/workshop_translated.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@

%p
=_'email.workshop.paragraph.view_workshop',"You can view the workshop here: "
- workshop_link = @host + view_workshop_url(@workshop.conference.slug, @workshop.id)
- workshop_link = view_workshop_url(@workshop.conference.slug, @workshop.id)
%a{href: workshop_link}=_!(workshop_link)
5 changes: 5 additions & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1725,6 +1725,7 @@ en:
name: Name
languages: Languages spoken
headings:
guests: Guests
pronoun: Pronoun (he/she/they)
Back_to: 'Back to:'
group_ride: Do you plan to attend the group ride?
Expand Down Expand Up @@ -1838,6 +1839,10 @@ en:
housing:
Rules: House Rules
paragraphs:
Hosting:
zero: You have not been selected to host any guests yet, please keep in mind that your guest list may change at any time. If you have any questions or issues about your guests, please reach out to the conference organizers.
one: You have been selected to host one guest, please keep in mind that your guest list may change at any time. If you have any questions or issues about your guests, please reach out to the conference organizers.
other: You have been selected to host %{count} guests, please keep in mind that your guest list may change at any time. If you have any questions or issues about your guests, please reach out to the conference organizers.
Housing: You are staying at %{address}, your host's name is %{name}. You can contact them by email %{email} or by phone at %{phone}. Please take some time to read their house rules below.
pronoun: It is important that communications with you and about you are as
respectful as possible. If you do not provide a pronoun organizers may assume
Expand Down
5 changes: 5 additions & 0 deletions config/locales/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1401,7 +1401,12 @@ es:
pronoun: Pronombre con el que te identificas (él/ella/ellxs)
review: Revisar
your_location: Ciudad o localidad en la que vives?
guests: Invitados
paragraphs:
Hosting:
zero: No ha sido seleccionado para recibir invitados todavía, tenga en cuenta que su lista de invitados puede cambiar en cualquier momento. Si tiene alguna pregunta o problema sobre sus invitados, favor de comunicarse con los organizadores de la conferencia.
one: Usted ha sido seleccionado para recibir un invitado, por favor tenga en cuenta que su lista de invitados puede cambiar en cualquier momento. Si tiene alguna pregunta o problema sobre sus invitados, favor de comunicarse con los organizadores de la conferencia.
other: Usted ha sido seleccionado para recibir %{count} invitados, por favor tenga en cuenta que su lista de invitados puede cambiar en cualquier momento. Si tiene alguna pregunta o problema sobre sus invitados, favor de comunicarse con los organizadores de la conferencia.
Payment_Made: Usted ya ha realizado un pago de %{fees_paid}.
Payment_Add: "¡Gracias! Abajo puedes agregar más dinero a esta cantidad si
deseas realizar otro pago. "
Expand Down
5 changes: 5 additions & 0 deletions config/locales/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1158,6 +1158,7 @@ fr:
recycle_parts: Organismes de vélo à but non lucratif
conference_registration:
headings:
guests: Invités
policy: Politique
Policy_Agreement: Accord d’espace positif
contact_info: Coordonnées
Expand Down Expand Up @@ -1240,6 +1241,10 @@ fr:
quiet: Maison calme
not_attending: Je n’assisterai pas à la conférence
paragraphs:
Hosting:
zero: Vous n'avez pas encore été sélectionné pour héberger des invités, n'oubliez pas que votre liste d'invités peut changer à tout moment. Si vous avez des questions ou des problèmes concernant vos invités, veuillez contacter les organisateurs de la conférence.
one: Vous avez été sélectionné pour héberger un invité, veuillez garder à l'esprit que votre liste d'invités peut changer à tout moment. Si vous avez des questions ou des problèmes concernant vos invités, veuillez contacter les organisateurs de la conférence.
other: Vous avez été sélectionné pour accueillir %{count} invités, n'oubliez pas que votre liste d'invités peut changer à tout moment. Si vous avez des questions ou des problèmes concernant vos invités, veuillez contacter les organisateurs de la conférence.
Contact_Info: Parlez-nous un peu de vous
Confirm_Agreement: En cliquant sur « J’accepte », vous vous engagez à faire
votre possible pour appliquer l’Accord d’espace positif de Bike!Bike! Merci.
Expand Down