AO3-7500 Update donation page and add new donation link to footer and site map#5891
AO3-7500 Update donation page and add new donation link to footer and site map#5891JSLarson wants to merge 3 commits into
Conversation
|
Hi, James Larson! Thank you so much for this pull request. Someone will be along to review it soon. In the meantime, we've updated the Jira issue status to In Review so no one mistakenly creates a duplicate pull request. If you'd like the ability to comment on, assign, and transition issues in the future, you're welcome to create a Jira account! It makes things a bit easier for us on the organizational side if the Full Name on your Jira account either closely matches the name you'd like us to credit in the release notes or includes it in parentheses, e.g. "Nickname (CREDIT NAME)." It looks like your Jira account is not showing up in our Jira admin panel. Please either reply here or send an email to otw-coders@transformativeworks.org with your account name and your email address and we'll set up the permissions for you. Thanks again for contributing! If you have any questions, you can contact us at the same email address listed above. |
|
Some tests didn't pass at first, they should be good now. |
|
Probably should have sent a screenshot with the original PR. Oh well. |
brianjaustin
left a comment
brianjaustin
left a comment
There was a problem hiding this comment.
Thank you! A few comments, mostly around our internationalization guidelines
| @@ -1,18 +1,38 @@ | |||
| <h2 class="heading"><%= t(".general.title") %></h2> | |||
| <h3 class="heading"><%= t(".general.text") %></h3> | |||
| <h2 class="heading"><%= t(".page_title") %></h2> | |||
There was a problem hiding this comment.
Per our internationalization guidelines
| <h2 class="heading"><%= t(".page_title") %></h2> | |
| <h2 class="heading"><%= t(".page_heading") %></h2> |
This will also require adding the appropriate key to the locale config (en.yml). There is some duplication with the page title, but it fits our translation team's workflow to have 1 key per usage in most cases.
| <p> | ||
| <%= t(".money.details_html", | ||
| donation_link: link_to(t(".money.donation"), "https://donate.transformativeworks.org/otwgive"), | ||
| budget_reports_link: link_to(t(".money.budget_reports"), "/admin_posts?tag=174"), |
There was a problem hiding this comment.
Could you use the Rails URL helper for this link? It should be something like
| budget_reports_link: link_to(t(".money.budget_reports"), "/admin_posts?tag=174"), | |
| budget_reports_link: link_to(t(".money.budget_reports"), admin_posts_path(tag: 174)), |
| listings: open volunteer position listings | ||
| listings_html: We encourage you to browse through our %{listings_link} and apply for any volunteer roles that match your qualifications and interests. If there are no roles currently recruiting, you can sign up for %{news_link} or follow us on %{social_link}. | ||
| news: OTW News by Email | ||
| otw: Organization for Transformative Works |
There was a problem hiding this comment.
To have the key match the text more closely:
| otw: Organization for Transformative Works | |
| organization_for_transformative_works: Organization for Transformative Works |
| <ul class="menu"> | ||
| <li><%= link_to t(".contact_us.pac"), new_abuse_report_path %></li> | ||
| <li><%= link_to t(".contact_us.support"), new_feedback_report_path %></li> | ||
| <li><%= link_to t(".contact_us.donations"), donate_path %></li> |
There was a problem hiding this comment.
To match a suggested change below:
| <li><%= link_to t(".contact_us.donations"), donate_path %></li> | |
| <li><%= link_to t(".contact_us.donate_or_volunteer"), donate_path %></li> |
| my_profile: My Profile | ||
| contact_us: | ||
| donations: Donations | ||
| donations: Donate or Volunteer |
There was a problem hiding this comment.
To match the content:
| donations: Donate or Volunteer | |
| donate_or_volunteer: Donate or Volunteer |
| takedown_policy: DMCA & TIDA Policies | ||
| tos: Terms of Service | ||
| contact_us: | ||
| donations: Donate or Volunteer |
There was a problem hiding this comment.
| donations: Donate or Volunteer | |
| donate_or_volunteer: Donate or Volunteer |
3 participants
Pull Request Checklist
as the first thing in your pull request title (e.g.
AO3-1234 Fix thing)until they are reviewed and merged before creating new pull requests.
Issue
https://otwarchive.atlassian.net/browse/AO3-7500
Purpose
Updates the donation page as per the Jira ticket. Formatting looks a bit strange but I'm not entirely used to the style guide and I copied everything exactly.
Credit
James Larson (he/she)
Jira account should have the same name.