-
Notifications
You must be signed in to change notification settings - Fork 176
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
Fixed paragraph formatting and broken links within studio welcome email #3696
Fixed paragraph formatting and broken links within studio welcome email #3696
Conversation
'domain': request.META.get('HTTP_ORIGIN') or "https://{}".format( | ||
request.get_host() or Site.objects.get_current().domain), | ||
'domain': {"domain": "https://{}".format( | ||
Site.objects.get_current().domain)}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I missed this, but looks like we copy and pasted the whole dictionary, not just the value for "domain"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also, do you have pre-commit
installed? I would have expected it to reformat this code. I actually think it's missing from the Studio README/dev setup now that I look...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's also this outstanding issue: #2945 which means that we can't enforce the Python linting checks either.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rtibbles Ah right, I forgot we talked about handling that before the websockets work...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We couldn't though, because my event log PR hadn't been merged! We'll do it once we merge the websockets work instead.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code changes make sense to me! One question about the slideshow itself.
@@ -142,7 +150,7 @@ | |||
<li> | |||
<b>{% translate "Slide gif format:" %}</b> | |||
<a | |||
href="https://docs.google.com/presentation/d/1diRou-RYk7-gYkpMCDB5zs9C7Ywo_qifH0l78nvwVCY/edit#slide=id.g8b5cff85a9_0_78" | |||
href="https://docs.google.com/presentation/d/1diRou-RYk7-gYkpMCDB5zs9C7Ywo_qifH0l78nvwVCY/edit#slide=id.g6b950d4fd1_0_360" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thoughts on linking to a published version of the slideshow instead of the source document?
https://docs.google.com/presentation/d/e/2PACX-1vRLHvRytsoLdOCv5EMlm5_KRKYHdtwpt_FUkC3sLeW5L12Tw9KZj5GA6klbq8dQB1nVtEBGn73GZsU9/pub?start=true&loop=true&delayms=30000&slide=id.g6b950d4fd1_0_360
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think linking to a published version would be a preferable option.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I checked with @lauradanforth and she agreed! If you can update the link, then I think we're good to merge here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Lets test it out on the hotfixes server
Summary
Description of the change(s) you made
This PR fixes the broken links and updates the spacing between the paragraphs in the Studio welcome email. A new
SITE
object has been added to include the hotfixes branch, somedomain
variables forSITE
objects have been updated, and the way theSITE_ID
is retrieved withinsettings.py
has been refactored.References
Fixes #3677
Contributor's Checklist
PR process:
CHANGELOG
label been added to this PR. Note: items with this label will be added to the CHANGELOG at a later timedocs
label has been added if this introduces a change that needs to be updated in the user docs?requirements.txt
files also included in this PRStudio-specifc:
notranslate
class been added to elements that shouldn't be translated by Google Chrome's automatic translation feature (e.g. icons, user-generated text)pages
,components
, andlayouts
directories as described in the docsTesting:
Reviewer's Checklist
This section is for reviewers to fill out.
yarn
andpip
)