Skip to content

Miscellaneous fixups to text & templates#675

Merged
freakboy3742 merged 22 commits intobeeware:lektorfrom
johnzhou721:patch-17
Jun 27, 2025
Merged

Miscellaneous fixups to text & templates#675
freakboy3742 merged 22 commits intobeeware:lektorfrom
johnzhou721:patch-17

Conversation

@johnzhou721
Copy link
Copy Markdown
Contributor

DO NOT MERGE. Will collect several more here.

PR Checklist:

  • All new features have been tested
  • All new features have been documented
  • I have read the CONTRIBUTING.md file
  • I will abide by the code of conduct

@johnzhou721 johnzhou721 marked this pull request as ready for review June 25, 2025 23:47
@johnzhou721
Copy link
Copy Markdown
Contributor Author

johnzhou721 commented Jun 25, 2025

Ready for review + merge. Rest assured I have forced Weblate to commit.

EDIT Do not merge yet. I plan on finding more issues after supper.

@johnzhou721 johnzhou721 marked this pull request as draft June 25, 2025 23:56
@johnzhou721
Copy link
Copy Markdown
Contributor Author

@freakboy3742 Apply preview as I have added a check to see just link the video is not embeddable to prevent black squares on the page.

Talking about How to Write a Python Transpiler at https://beeware.org/community/resources/

Comment thread content/contributing/first-time/github/contents.lr
Comment thread content/community/resources/djangocon-us-2013/contents.lr
@johnzhou721 johnzhou721 marked this pull request as ready for review June 26, 2025 00:34
@johnzhou721
Copy link
Copy Markdown
Contributor Author

johnzhou721 commented Jun 26, 2025

@freakboy3742

(EDITED, too many changes...)

Summary of changes:

  • af1da5f and 3ceb57f changes Github into GitHub.
  • d771666 (EDITED fix hash) changes Beeware into BeeWare.
  • 3ee7f2a and 8239ce1 replaces a dead link.
  • d57d8be and 7ed1581 fixes issues in my own paragraph about translations -- fixes wrong order of words and clarifies minor things
  • 51ee2f3 removes an unwatchable video in the Resources page in Community.
  • 2efb7c3, 7092f6f, 6ff84d2, 3e8db61, 3b59803, cc3d03d, 32600ea, and 6433669 (I made so many mistakes...) link to unembeddable YouTube videos the regular way.
  • 9d744b6 uses the correct canonical full form for PyPI.
  • bf65f20 merges main.
  • 6e1385c fixes a place where a translation string is not added.
  • 9be1d7a improves a translation.
  • 3061a5a makes Donate highlighted in the top bar when on Membership page.

Apply preview and verify those changes before merging this Pull Request.

EDIT apologies for so many trivial changes.

Comment thread templates/macros/video.html Outdated
@johnzhou721
Copy link
Copy Markdown
Contributor Author

I've also made the video link display a link icon + the title of the video, and also adjusted PyPI's full form.

@freakboy3742 freakboy3742 added the preview Approved for an automated preview label Jun 26, 2025
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Jun 26, 2025

Visit the preview URL for this PR (updated for commit 44013cb):

https://beeware-org--pr675-patch-17-0dmt0y60.web.app

(expires Fri, 04 Jul 2025 13:13:24 GMT)

🔥 via Firebase Hosting GitHub Action 🌎

Sign: b0da44bc067e7d9a4255c77cb2c5fce572218cec

Copy link
Copy Markdown
Member

@freakboy3742 freakboy3742 left a comment

Choose a reason for hiding this comment

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

A couple of minor tweaks, but mostly looks good.

Comment thread content/contributing/first-time/github/contents.lr
Comment thread content/contributing/first-time/github/contents.lr
Comment thread content/contributing/first-time/github/contents.lr
@johnzhou721
Copy link
Copy Markdown
Contributor Author

DO NOT MERGE — unembedsable video links aren’t showing up

Committed into wrong branch, correcting
Comment thread models/event.ini Outdated
Comment thread models/event.ini Outdated
Comment thread templates/macros/video.html Outdated
@johnzhou721
Copy link
Copy Markdown
Contributor Author

After much of using codespaces on a phone on a bus this is working!

@johnzhou721 johnzhou721 requested a review from freakboy3742 June 27, 2025 00:52
@johnzhou721 johnzhou721 changed the title Fixups identified during translation Miscellaneous fixups to text & templates Jun 27, 2025
@johnzhou721
Copy link
Copy Markdown
Contributor Author

Fixed bug where Donate is not highlighted in the top bar in the membership page! Sorry, I kept trying to convince myself to let it go and finalize this, but I keep finding more bugs, and they always bother me. Anyways, please apply preview when it's convenient.

So: This is ready for re-review. I will edit the list of changes.

@johnzhou721
Copy link
Copy Markdown
Contributor Author

Done updating changelog.

  • af1da5f and 3ceb57f changes Github into GitHub.
  • d771666 (EDITED fix hash) changes Beeware into BeeWare.
  • 3ee7f2a and 8239ce1 replaces a dead link.
  • d57d8be and 7ed1581 fixes issues in my own paragraph about translations -- fixes wrong order of words and clarifies minor things
  • 51ee2f3 removes an unwatchable video in the Resources page in Community.
  • 2efb7c3, 7092f6f, 6ff84d2, 3e8db61, 3b59803, cc3d03d, 32600ea, and 6433669 (I made so many mistakes...) link to unembeddable YouTube videos the regular way.
  • 9d744b6 uses the correct canonical full form for PyPI.
  • bf65f20 merges main.
  • 6e1385c fixes a place where a translation string is not added.
  • 9be1d7a improves a translation.
  • 3061a5a makes Donate highlighted in the top bar when on Membership page.

Imagine if Website had towncrier...

Copy link
Copy Markdown
Member

@freakboy3742 freakboy3742 left a comment

Choose a reason for hiding this comment

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

One clarification, but otherwise looks like a good set of cleanups.

There's no problem adding more fixes as you find them - but each time you add a fix to a PR that was 95% there, the PR gets a little further from being merged.

I'll do another preview and final review once the last issue is resolved.

Comment thread templates/layout.html Outdated
@johnzhou721 johnzhou721 requested a review from freakboy3742 June 27, 2025 12:39
@freakboy3742 freakboy3742 added preview Approved for an automated preview and removed preview Approved for an automated preview labels Jun 27, 2025
Copy link
Copy Markdown
Member

@freakboy3742 freakboy3742 left a comment

Choose a reason for hiding this comment

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

LGTM - thanks!

@freakboy3742 freakboy3742 merged commit 1fab0d1 into beeware:lektor Jun 27, 2025
2 checks passed
@johnzhou721
Copy link
Copy Markdown
Contributor Author

You’re welcome and if this was the only thing you were working on, sorry for having you stay up until 11pm just to merge this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

preview Approved for an automated preview

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants