Miscellaneous fixups to text & templates (#675)

johnzhou721 · web-flow · commit 1fab0d187172 · 2025-06-27T22:50:40.000+08:00
diff --git a/content/about/overview/contents.lr b/content/about/overview/contents.lr
@@ -45,7 +45,7 @@ various ways BeeWare tools can be used](/project/using/).
 If you'd like to keep up to date with what we're doing, follow
 [@beeware@fosstodon.org](https://fosstodon.org/@beeware) on Mastodon. If
 you'd like to receive updates, hints, tips and announcements about the
-BeeWare project, [sign up for the Beeware Enthusiasts mailing
+BeeWare project, [sign up for the BeeWare Enthusiasts mailing
 list](/community/keep-informed/).
 
 ---
@@ -56,7 +56,7 @@ gutter:
 - The [History of the BeeWare project](/about/history/)
 - [BeeWare test drive](/project/using/)
 - [@beeware@fosstodon.org on Mastodon](https://fosstodon.org/@beeware)
-- The [Beeware Enthusiasts mailing list](/community/keep-informed/)
+- The [BeeWare Enthusiasts mailing list](/community/keep-informed/)
 
 ---
 incomplete: no
diff --git a/content/community/behavior/code-of-conduct/contents.lr b/content/community/behavior/code-of-conduct/contents.lr
@@ -41,7 +41,7 @@ This code of conduct applies both within project spaces and in public
 spaces when an individual is representing the project or its community.
 
 If you feel the code of conduct has been violated, please [report the
-incident](/community/behavior/making-a-coc-report/) to the Beeware core
+incident](/community/behavior/making-a-coc-report/) to the BeeWare core
 team.
 
 ---
diff --git a/content/community/getting-help/contents.lr b/content/community/getting-help/contents.lr
@@ -20,7 +20,7 @@ A lot of project-specific communication happens on the Issues for the
 specific project. Check the [Project](/project) list for specific
 project links.
 
-We also use Github Discussions as a forum to discuss projects. If you
+We also use GitHub Discussions as a forum to discuss projects. If you
 have a question about how to use a BeeWare tool, open a discussion
 thread in the repository for that tool.
 
diff --git a/content/community/resources/djangocon-us-2013/contents.lr b/content/community/resources/djangocon-us-2013/contents.lr
diff --git a/content/community/resources/how-to-write-a-python-transpiler/contents.lr b/content/community/resources/how-to-write-a-python-transpiler/contents.lr
@@ -22,4 +22,6 @@ pub_date: 2017-05-20
 ---
 resource_type: video
 ---
-url: https://www.youtube.com/embed/9c4DEYIXYCM
+url: https://www.youtube.com/watch?v=9c4DEYIXYCM
+---
+embeddable: false
diff --git a/content/community/resources/snek-in-the-browser/contents.lr b/content/community/resources/snek-in-the-browser/contents.lr
@@ -26,4 +26,6 @@ pub_date: 2017-05-19
 ---
 resource_type: video
 ---
-url: https://www.youtube.com/embed/1YmbZQjty3Y
+url: https://www.youtube.com/watch?v=1YmbZQjty3Y
+---
+embeddable: false
diff --git a/content/community/resources/talk-python-79/contents.lr b/content/community/resources/talk-python-79/contents.lr
@@ -13,7 +13,7 @@ apps (be a .app on macOS, .exe on Windows, etc).
 What technology would you use for this? This week I'll introduce you to
 a wide set of small, focused and powerful tools that make all of this,
 and more, possible. We're speaking with Russell Keith-Magee, founder of
-the Beeware project.
+the BeeWare project.
 
 ---
 pub_date: 2016-10-09
diff --git a/content/contributing/challenge-coins/contents.lr b/content/contributing/challenge-coins/contents.lr
@@ -52,7 +52,7 @@ on their blog.
 [Revolution Systems](/community/members/revsys/) provided the funding
 for the second pressing of the BeeWare challenge coins.
 
-[Github](/community/members/github/) provided the funding for the first
+[GitHub](/community/members/github/) provided the funding for the first
 pressing of the BeeWare Yak Herder challenge coins.
 
 <figure>
diff --git a/content/contributing/first-time/github/contents.lr b/content/contributing/first-time/github/contents.lr
@@ -139,7 +139,6 @@ gutter:
 There are many useful resources to help you learn how to log issues and
 raise Pull Requests in GitHub:
 
-- [Contributing to Open
-  Source](https://guides.github.com/activities/contributing-to-open-source/#contributing)
+- [How to Contribute to Open Source](https://opensource.guide/how-to-contribute/)
 - [How to Fork a Repo](https://docs.github.com/articles/fork-a-repo)
 
diff --git a/content/contributing/first-time/what-is-a/package-manager/contents.lr b/content/contributing/first-time/what-is-a/package-manager/contents.lr
@@ -30,7 +30,7 @@ Depending on what family of operating system you run, you'll use
 ## Python
 
 `pip` is the way you can install Python software. Running `pip install`
-uses the [Python Packaging Index](https://pypi.org), also known as
+uses the [Python Package Index](https://pypi.org), also known as
 "PyPI". PyPI is a central repository for Python code. Many BeeWare
 projects can be installed using `pip`.
 
diff --git a/content/contributing/sprint-guide/contents.lr b/content/contributing/sprint-guide/contents.lr
@@ -76,7 +76,7 @@ do know, and we'll work together to figure it out from there.
     bootcamp program? We want to find a problem that is a good match for
     your level experience.
 
-4.  **Are you familiar with Github contribution processes?**
+4.  **Are you familiar with GitHub contribution processes?**
 
     Do you use GitHub (or a similar code-sharing site) for hosting your
     own code or contributing to others' projects? Do you know what CI
@@ -88,7 +88,7 @@ do know, and we'll work together to figure it out from there.
 
     Have you attended a sprint in the past? Have you ever submitted a PR
     (pull request) to an Open Source project? Are you familiar with how
-    to use Github to create a pull request?
+    to use GitHub to create a pull request?
 
 6.  **Do you have any other special skills that might be useful?**
 
diff --git a/content/contributing/translations/contents.lr b/content/contributing/translations/contents.lr
@@ -22,12 +22,12 @@ get started!
 In addition, the [.ini
 databags](https://www.getlektor.com/docs/content/databags/) contain
 recurring phrases used on various components on the website. To translate
-those short phrases, edit then and submit a pull request against the
-``lektor`` branch of
+those short phrases, edit them in your fork and then submit a pull request
+against the ``lektor`` branch of
 [beeware/beeware.github.io](https://github.com/beeware/beeware.github.io)
 to modify those translations. Try to keep the context of those appearing
-phrases in mind; they're used in HTML files in the macros and template
-directories in that repository.
+phrases in mind; they're used in HTML files in the `template` directory
+in that repository.
 
 ## The BeeWare Tutorial
 
diff --git a/content/news/buzz/a-new-yak-for-the-herd-beekeeper/contents.lr b/content/news/buzz/a-new-yak-for-the-herd-beekeeper/contents.lr
@@ -113,7 +113,7 @@ fateful question "How hard could it be?" And so, today, I'm announcing
 [BeeKeeper](/project/attic/beekeeper) - BeeWare's own CI service.
 
 BeeKeeper deploys as a Heroku website, written using Django. After
-configuring it with Github and AWS credentials, it listens for Github
+configuring it with GitHub and AWS credentials, it listens for GitHub
 webhooks. When a Pull Request or Push is detected, BeeKeeper creates a
 build request; that build request inspects the code in the repository
 looking for a `beekeeper.yml` configuration file. That configuration
diff --git a/content/news/buzz/february-2023-status-update/contents.lr b/content/news/buzz/february-2023-status-update/contents.lr
@@ -55,9 +55,9 @@ progress against our overall project goals.
   backend](https://github.com/beeware/briefcase/pull/1113) that would
   cause intermittent errors when loading a web app.
 - We updated our CI infrastructure to make better use of shared task
-  definitions. BeeWare has a lot of Github repositories, and a lot of
+  definitions. BeeWare has a lot of GitHub repositories, and a lot of
   common tasks (such as rolling out an app across multiple Python and
-  operating system versions). Previously, each Github repository had an
+  operating system versions). Previously, each GitHub repository had an
   independent set of CI task definitions; we've now got a central
   collection of task definitions that is used by all repositories.
 - We cleaned up the [table in Toga's documentation describing the state
diff --git a/content/news/buzz/february-2024-status-update/contents.lr b/content/news/buzz/february-2024-status-update/contents.lr
@@ -35,7 +35,7 @@ less progress to report!
   officially supported ARM64 on macOS for some time, but we've been
   unable to test this support as part of our CI and release procedure -
   we've had to do ad-hoc testing on the machines we're using to develop
-  on a day to day basis. As a result of improvements to Github's CI
+  on a day to day basis. As a result of improvements to GitHub's CI
   infrastructure, we're now able to perform automated testing. As part
   of these changes, we've also added testing for Python 3.13 (which will
   be released around October of this year).
diff --git a/content/news/buzz/hello-website/contents.lr b/content/news/buzz/hello-website/contents.lr
@@ -21,7 +21,7 @@ time out from working on BeeWare itself, and rewrote the site.
 The new website uses [Lektor](https://www.getlektor.com), a static site
 generator tool written by well known Pythonista [Armin
 Ronacher](http://lucumr.pocoo.org/). This allows us to continue hosting
-the website using Github Pages, but gives us the flexibility to define a
+the website using GitHub Pages, but gives us the flexibility to define a
 light database for the many types of content we need to manage.
 
 Although we're launching the site today, it's not complete. There's
diff --git a/content/news/buzz/january-2023-status-update/contents.lr b/content/news/buzz/january-2023-status-update/contents.lr
@@ -67,7 +67,7 @@ made some very specific progress during January:
   completed. Development versions of Toga will now report a specific
   version control commit; release versions have their version determined
   by the git tag used to produce the release.
-- We completed a major review of the way we're using Github issue
+- We completed a major review of the way we're using GitHub issue
   labels, and modified those labels to be consistent across all
   repositories.
 
diff --git a/content/news/buzz/july-2022-status-update/contents.lr b/content/news/buzz/july-2022-status-update/contents.lr
@@ -8,7 +8,7 @@ Another month of important updates to the BeeWare project! This month,
 our focus was on packaging improvements on Linux and Windows.
 
 In addition the technical progress, we welcomed [Malcolm Smith (@mhsmith
-on Github)](https://github.com/mhsmith) to the Anaconda BeeWare team!
+on GitHub)](https://github.com/mhsmith) to the Anaconda BeeWare team!
 Malcolm brings his considerable experience developing and maintaining
 [Chaquopy](https://github.com/chaquo), a set of tools and libraries for
 building Android applications that use Python. Chaquopy tackles the
diff --git a/content/news/buzz/november-2023-status-update/contents.lr b/content/news/buzz/november-2023-status-update/contents.lr
@@ -29,7 +29,7 @@ profile developments in other parts of BeeWare.
   source data](https://github.com/beeware/toga/pull/2231).
 - We [switched CI testing of Android apps to use a Linux
   machine](https://github.com/beeware/toga/pull/2230). This wasn't
-  previously possible, because Github didn't expose the necessary
+  previously possible, because GitHub didn't expose the necessary
   permissions in their Linux images; however, now that *is* possible,
   our Android tests run up to 5 times faster, and are less likely to be
   held up in CI because of availability of macOS testing machines.
diff --git a/content/news/buzz/project-spotlight-colosseum/contents.lr b/content/news/buzz/project-spotlight-colosseum/contents.lr
@@ -52,7 +52,7 @@ yoga only implements the Flexbox portion of the CSS3 specification.
 
 This week, we started a big project: rewriting Colosseum to be a fully
 standard-compliant CSS engine. The work so far can be found in the globe
-branch of the colosseum repository on Github. The first goal is CSS2.1
+branch of the colosseum repository on GitHub. The first goal is CSS2.1
 compliance, with an implementation of the traditional CSS box model and
 flow layout. Once we've got a reasonable implementation of that, we'll
 look to adding Grid and FlexBox layouts from the CSS3 specification set.
diff --git a/content/news/buzz/september-2022-status-update/contents.lr b/content/news/buzz/september-2022-status-update/contents.lr
@@ -54,7 +54,7 @@ from the older Rubicon base to the newer Chaquopy base.
 
 On iOS, we've [reworked how the support packages are
 constructed](https://github.com/beeware/Python-Apple-support/pull/161),
-and [added support for installing binary modules from a Beeware-specific
+and [added support for installing binary modules from a BeeWare-specific
 package repository that includes builds of iOS binary
 wheels](https://github.com/beeware/briefcase/pull/849). We've also added
 asset signing to the iOS Xcode project - and applied the same changes to
diff --git a/content/news/buzz/some-new-ways-to-discuss-beeware/contents.lr b/content/news/buzz/some-new-ways-to-discuss-beeware/contents.lr
@@ -12,7 +12,7 @@ to Discord**.
 
 When we originally set up Gitter, it was a strong option for a chat
 community - especially one that was focussed on a software project, due
-to its tight integration with Github. However, over the years, Gitter
+to its tight integration with GitHub. However, over the years, Gitter
 has undergone multiple changes of ownership, but has remained
 essentially unchanged - in some cases, it's gotten appreciably worse
 (their native iOS and Android clients are effectively deprecated). In
@@ -23,10 +23,10 @@ something we hope to be able to use for coordinating virtual sprints.
 
 To join the new BeeWare Discord server, [visit this link](/bee/chat/).
 
-Secondly, we're going to **start using Github Discussions**.
+Secondly, we're going to **start using GitHub Discussions**.
 
-For many years, we've tried to use Github Issues as a pseudo-forum.
-There's a lot of similarity between how a forum works and how Github
+For many years, we've tried to use GitHub Issues as a pseudo-forum.
+There's a lot of similarity between how a forum works and how GitHub
 displays and manages issues. Each "issue" is effectively a forum thread,
 and each comment is a message in that thread. However, there are also
 some important differences. Issues get closed when they're resolved;
@@ -35,10 +35,10 @@ importantly, "closing" an issue can look like someone is trying to kill
 discussion - when all they're really trying to do is keep the list of
 issues manageable.
 
-The good news is that Github has noticed the similarity too, and has
-launched Github Discussions. Discussions offers a familiar "forum"
-interface, but with the familiar Github message interface, and tight
-integration with Github Issues and pull requests.
+The good news is that GitHub has noticed the similarity too, and has
+launched GitHub Discussions. Discussions offers a familiar "forum"
+interface, but with the familiar GitHub message interface, and tight
+integration with GitHub Issues and pull requests.
 
 We've enabled Discussions on all the key BeeWare projects -
 [Toga](https://github.com/beeware/toga/discussions),
diff --git a/content/project/attic/beefore/contents.lr b/content/project/attic/beefore/contents.lr
@@ -17,7 +17,7 @@ Someone reviewing a patch still needs to check for correct logic, but
 these simple style-check tasks are easy to check programatically. Many
 text editors will (or have extensions that will) do this process for
 you - the task is called *linting*. Beefore is a tool that allows you to
-integrate these checks into your Github pre-merge procedure, in the same
+integrate these checks into your GitHub pre-merge procedure, in the same
 way that can integrate continuous integration and test suite compliance
 before merging.
 
diff --git a/databags/translate.ini b/databags/translate.ini
@@ -987,7 +987,7 @@ thanks_after_name = 所做的贡献！
 
 ; Blog
 posted_by = 由
-on = 在
+on = 于
 ; chinese-specific
 post_posted_date = 发布
 next_entry = 下一个条目
diff --git a/models/resource.ini b/models/resource.ini
@@ -50,3 +50,8 @@ type = string
 [fields.event_url]
 label = Event URL
 type = string
+
+[fields.embeddable]
+label = Video embeddable
+type = boolean
+default = true
diff --git a/templates/blog-post.html b/templates/blog-post.html
@@ -16,7 +16,7 @@ <h1>{{ this.title }}</h1>
         {% else %}
         {{ this.author }}
         {% endif %}
-        {{ "on"|trans }} {{ this.pub_date.strftime('%Y/%m/%d')}}
+        {{ "on"|trans }} {{ this.pub_date.strftime('%Y/%m/%d')}} {{ "post_posted_date"|trans }}
     </p>
   </div>
 </div>
diff --git a/templates/layout.html b/templates/layout.html
@@ -1,5 +1,5 @@
 {%- macro menu_item(identifier) -%}
-  {%- set identifier_url = '/' + identifier -%}
+  {%- set identifier_url = ('/' + identifier).replace('/donate', '/membership') -%}
   {%- set trans_url = identifier_url|url(alt=this.alt) -%}
   {%- set this_is_child = this.is_child_of(identifier_url) -%}
   <li class="nav-item{% if this_is_child %} active{% endif %}">
@@ -70,11 +70,7 @@
       {{ menu_item('community') }}
       {{ menu_item('contributing') }}
       {{ menu_item('news') }}
-      <li class="nav-item">
-        <a class="nav-link" href={{ "/membership"|url(alt=this.alt) }}>
-          {{ "donate"|trans("menu") }}
-        </a>
-      </li>
+      {{ menu_item('donate') }}
     </ul>
     <ul class="nav navbar-nav navbar-right">
       {%- if this.alt == "en" -%}
diff --git a/templates/macros/video.html b/templates/macros/video.html
@@ -4,8 +4,7 @@ <h2><i class="fa fa-video-camera" aria-hidden="true"></i> {{ video.title }}</h2>
     {{ "by"|trans }}{% if "space_after_by"|trans != 'false' %} {% endif %}{{ video.author }};
     {{ "published"|trans }} {{ video.pub_date.strftime('%-d %B %Y') }}
   </p>
-  <iframe class="video" src="{{ video.url }}" frameborder="0" allowfullscreen></iframe>
-  <p>{{ video.description }}</p>
+  {{ render_video(video) }}
   {% if video.event_url %}
   <p><a href="{{ video.event_url }}">{{ "as_seen_at"|trans }} {{ video.event_name }}</a></p>
   {% else %}
@@ -14,6 +13,10 @@ <h2><i class="fa fa-video-camera" aria-hidden="true"></i> {{ video.title }}</h2>
 {% endmacro %}
 
 {% macro render_video(video) %}
+  {% if video.embeddable %}
   <iframe class="video" src="{{ video.url }}" frameborder="0" allowfullscreen></iframe>
+  {% else %}
+  <p><a href="{{ video.url }}"><i class="fa fa-link" aria-hidden="true"></i>{{ video.title }}</a></p>
+  {% endif %}
   {{ video.description }}
 {% endmacro %}
