Skip to content

Commit a5024b5

Browse files
committed
Merge remote-tracking branch 'beeware/lektor' into projects-to-docs
2 parents c8d8556 + 709df8e commit a5024b5

83 files changed

Lines changed: 7882 additions & 5542 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ on:
33
pull_request_target:
44
types: [labeled]
55

6+
permissions:
7+
checks: write #This is required by FirebaseExtended/action-hosting-deploy@v0
8+
contents: read #This is required for private repositories for the actions/checkout@v4 action
9+
pull-requests: write #This is required by FirebaseExtended/action-hosting-deploy@v0
10+
611
jobs:
712
build:
813
name: Build and preview site
@@ -14,6 +19,7 @@ jobs:
1419
with:
1520
ref: ${{ github.event.pull_request.head.sha }}
1621
fetch-depth: 0
22+
persist-credentials: false # This will not store the git credentials on disk, only in memory
1723

1824
- name: Set up Python
1925
uses: actions/setup-python@v5

.github/workflows/publish.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,26 @@ jobs:
4141
lektor plugins reinstall
4242
sudo apt update -y
4343
sudo apt install -y --no-install-recommends gettext
44+
- name: Configure Weblate
45+
env:
46+
WEBLATE_API_TOKEN: ${{ secrets.WEBLATE_API_TOKEN }}
47+
run: |
48+
cat <<EOF > ~/.weblate
49+
[weblate]
50+
url = https://hosted.weblate.org/api/
51+
key = $WEBLATE_API_TOKEN
52+
translation = beeware/website
53+
EOF
54+
55+
- name: Lock Weblate and Sync
56+
run: wlc lock
57+
- name: Commit Weblate changes
58+
run: wlc commit
59+
- name: Push Weblate changes
60+
run: wlc push
61+
- name: Pull translation updates pushed by Weblate
62+
run: git pull origin
63+
4464
- name: Build site
4565
run: |
4666
lektor build --no-prune
@@ -64,6 +84,13 @@ jobs:
6484
git commit -m "Update translations to $(git rev-parse --short HEAD)."
6585
git push origin
6686
87+
- name: Ensure Weblate has current updates
88+
if: steps.updated.outputs.updated == 'true'
89+
run: wlc pull
90+
91+
- name: Unlock Weblate
92+
run: wlc unlock
93+
6794
- name: Publish site
6895
env:
6996
LEKTOR_DEPLOY_USERNAME: brutusthebee

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ i18n/_compiled
1111
local/
1212
output
1313
venv*/
14+
.weblate

BeeWare.lektorproject

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ locale = fa_IR
8181

8282
[packages]
8383
lektor-github-repos = 0.1.1
84-
lektor-gravatar = 0.1.3
8584
lektor-markdown-admonition = 0.3.1
8685
git+https://github.com/beeware/lektor-i18n-plugin@v0.5.4 =
8786

content/about/overview/contents.lr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ various ways BeeWare tools can be used](/project/using/).
4545
If you'd like to keep up to date with what we're doing, follow
4646
[@beeware@fosstodon.org](https://fosstodon.org/@beeware) on Mastodon. If
4747
you'd like to receive updates, hints, tips and announcements about the
48-
BeeWare project, [sign up for the Beeware Enthusiasts mailing
48+
BeeWare project, [sign up for the BeeWare Enthusiasts mailing
4949
list](/community/keep-informed/).
5050

5151
---
@@ -56,7 +56,7 @@ gutter:
5656
- The [History of the BeeWare project](/about/history/)
5757
- [BeeWare test drive](/project/using/)
5858
- [@beeware@fosstodon.org on Mastodon](https://fosstodon.org/@beeware)
59-
- The [Beeware Enthusiasts mailing list](/community/keep-informed/)
59+
- The [BeeWare Enthusiasts mailing list](/community/keep-informed/)
6060

6161
---
6262
incomplete: no

content/about/team/glasnt/contents.lr

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ mastodon_handle: @glasnt@cloudisland.nz
88
---
99
description:
1010

11-
Katie has worn many different hats over the years. She has previously
11+
Katie has worn many different hats over the years. They have previously
1212
been a software developer for many languages, systems administrator for
1313
multiple operating systems, and speaker on many different topics.
1414

15-
When she's not changing the world, she enjoys cooking, making
15+
When they're not changing the world, they enjoy cooking, making
1616
tapestries, and seeing just how well various application stacks handle
1717
emoji.
1818

@@ -22,5 +22,3 @@ github_handle: glasnt
2222
email: katie@beeware.org
2323
---
2424
superpower: batavia, lektor, senior
25-
---
26-
summary: Tasmanian Devil Wrangler
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
description:
2+
3+
Kattni is a creator, community leader, programmer, technical writer, maker, photographer, intermittent chef, classically trained vocalist, air plant cultivator, and fledgling synth nerd. She is passionate about building communities, learning, mentoring, and sharing her knowledge in an approachable way. She will always have a special place in her heart for making things blinky and bright. She is tolerated by a cat and three kittens who continue to let her live with them.
4+
5+
---
6+
name: Kattni
7+
---
8+
summary: It began with a blinking LED.
9+
---
10+
join_date: 2025-10-05
11+
---
12+
github_handle: kattni
13+
---
14+
email: kattni@kattni.com
15+
---
16+
superpower: docs, lektor
17+
---
18+
mastodon_handle: kattni@kattstodon.com
395 KB
Loading

content/community/behavior/changes/contents.lr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ gutter:
2020

2121
Only major substantive changes are listed here; For a complete list of
2222
all changes, see [the changelog of the GitHub
23-
repository](https://github.com/beeware/beeware.github.io/commits/master/content/community/behavior).
23+
repository](https://github.com/beeware/beeware.github.io/commits/lektor/content/community/behavior).
2424

2525
---
2626
sort_key: 3

content/community/behavior/code-of-conduct/contents.lr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ This code of conduct applies both within project spaces and in public
4141
spaces when an individual is representing the project or its community.
4242

4343
If you feel the code of conduct has been violated, please [report the
44-
incident](/community/behavior/making-a-coc-report/) to the Beeware core
44+
incident](/community/behavior/making-a-coc-report/) to the BeeWare core
4545
team.
4646

4747
---

0 commit comments

Comments
 (0)