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

Fix issue #355 #394

Merged
merged 8 commits into from
Jul 24, 2023
Merged

Fix issue #355 #394

merged 8 commits into from
Jul 24, 2023

Conversation

aaronskiba
Copy link
Collaborator

@aaronskiba aaronskiba commented Jul 21, 2023

Fixes issue #355

#trivial
@aaronskiba
Copy link
Collaborator Author

This implementation doesn't use the Service described in this issue: #390

However, it may be a cleaner approach.

We will not be using the provided LocaleService. Thus, issue #390 can be closed.
@aaronskiba
Copy link
Collaborator Author

aaronskiba commented Jul 21, 2023

Issue #355 now appears to be fixed. However, other anomalies are noticed after testing (Issue #397 has been created as a result):

Also, other link-related issues (#385 and #388) still exist.

Commit affects how "Terms of Use" is routed in footer and how "How to Manage Your Data" is routed on homepage.
This is a temporary change until the corresponding French terms route is available.
'https://assistant.portagenetwork.ca/terms'
end
'https://assistant.portagenetwork.ca/terms'
# if I18n.locale == :'fr-CA'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can leave this code commented out as we know there is a change coming in soon. We should add a comment mentioning this though.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool. I had a little something written there, but this is probably clearer.
I guess adding # TODO is useful too because it works nicely with rake notes.

@@ -32,7 +32,7 @@
<a href="https://doi.org/10.5281/zenodo.4001018">Primer – Data Management Plan</a>
</li>
<li>
<a href="https://portagenetwork.ca/tools-and-resources/dmp-assistant/how-to-manage-your-data/">How to Manage Your Data</a>
<a href="#{how_to_manage_your_data_path}">How to Manage Your Data</a>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call on removing the hardcoded url 👍🏽

@@ -68,7 +68,7 @@
}, Rails.configuration.branding[:organisation][:url])%></li>
<li>•</li>
<li><a href="<%= contact_us %>"><%= _('Contact us') %></a></li>
<li><a href="/terms"><%= _('Terms of use') %></a></li>
<li><a href="<%= terms_of_use_path %>"><%= _('Terms of use') %></a></li>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, good call on removing hardocded urls.

Copy link
Collaborator

@lagoan lagoan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@aaronskiba aaronskiba merged commit 0ec9829 into deployment-portage Jul 24, 2023
@aaronskiba aaronskiba deleted the aaron/issues/355 branch July 24, 2023 19:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants