Skip to content

Commit 5e13043

Browse files
dogedededogedede
authored
Merge branch 'master' into fix-remove-wiki-references
2 parents e23638d + 23a9073 commit 5e13043

24 files changed

+373
-111
lines changed

‎_data/donate.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
community:
2+
13
- name: Luanti Staff Tips
24
i18n_name: true
35
description: >-
@@ -8,14 +10,13 @@
810
- name: celeron55
911
title: founder
1012
description: >-
11-
You can tip money to celeron55. He is the original creator of Luanti,
12-
and hosts the forums and wikis. While he isn't involved in active
13-
development, he plays an advisory role and breaks ties.
13+
While he isn't involved in active development, he hosts the forums and plays
14+
an advisory role.
1415
links:
1516
Liberapay: https://liberapay.com/celeron55/
1617
PayPal: https://paypal.me/celeron55
1718

18-
- name: Other
19+
- name: Community
1920
i18n_name: true
2021
i18n_links: true
2122
description: >-

‎_includes/footer.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ <h5 class="footer-title">{{ "Development" | i18n }}</h5>
5151
<li><a href="https://docs.luanti.org/about/irc/">{{ "#luanti-dev on Libera IRC" | i18n }}</a></li>
5252
<li><a href="https://docs.luanti.org/">{{ "Luanti Documentation" | i18n }}</a></li>
5353
<li><a href="https://api.luanti.org">{{ "Lua API reference" | i18n }}</a></li>
54-
<li><a href="{{ '/get-involved/' | locale_url }}#donate">{{ "Donate" | i18n }}</a></li>
54+
<li><a href="{{ '/en/donate/' | locale_url }}">{{ "Donate" | i18n }}</a></li>
5555
<li><a href="https://rubenwardy.com/minetest_modding_book/">{{ "Luanti Modding Book" | i18n }}</a></li>
5656
</ul>
5757
</div>

‎_includes/header.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
</div>
4747
</div>
4848
<div class="navbar-item">
49-
<a href="{{ '/en/get-involved/' | locale_url }}#donate" class="button is-primary">
49+
<a href="{{ '/en/donate/' | locale_url }}" class="button is-primary">
5050
<i class="fas fa-heart mr-2"></i>
5151
{{ "Donate" | i18n }}
5252
</a>

‎_includes/layouts/base.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
<meta name="og:url" content="https://www.luanti.org{{ page.url }}">
1212
<meta name="og:title" content="{{ title | i18n | escape }}">
1313
<meta name="og:site_name" content="{{ 'Luanti' | i18n }}">
14-
{% if page.description %}
14+
{% if description %}
1515
<meta name="og:description" content="{{ description | i18n | escape | strip }}">
1616
<meta name="description" content="{{ description | i18n | escape | strip }}">
1717
{% endif %}
18-
{% if page.image %}
18+
{% if image %}
1919
<meta name="og:image" content="{{ image | absolute_url }}">
2020
{% endif %}
2121
<link rel="alternate" hreflang="{{ lang }}" href="{{ page.url | absolute_url }}">

‎_includes/pages/donate.html‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
---
2+
title: Donate
3+
description: >-
4+
Support Luanti with a financial contribution.
5+
layout: base
6+
---
7+
{% assign langPrefix = "/" | append: lang | append: "/" %}
8+
9+
<main>
10+
<div class="container">
11+
<h1 id="donate" class="title main-title">{{ "Donate" | i18n }}</h1>
12+
<div class="columns">
13+
<article class="column is-half content">
14+
<h2 class="title is-size-2" id="support-luanti">{{ "Support Luanti" | i18n }}</h2>
15+
<p>
16+
{{ "Luanti is a member of Open Collective Europe, a non-profit based in Belgium." | i18n }}
17+
{{ "It is equivalent to a US 501(c)3 non-profit for public benefit." | i18n }}
18+
{{ "You can donate to Luanti's non-profit collective to help support and grow the project. " | i18n }}
19+
</p>
20+
<p>
21+
{{ "We use the Open Collective platform to collect donations." | i18n }}
22+
{{ "It provides a public and transparent ledger for our finances, allowing you to see where the money is going." | i18n }}
23+
</p>
24+
<p class="is-flex is-align-items-center is-gap-4">
25+
<a class="button is-large is-primary" href='https://opencollective.com/luanti/'>
26+
{{ "Donate" | i18n }}
27+
</a>
28+
<a href='https://blog.luanti.org/2025/11/05/non-profit/'>
29+
{{ "Read the announcement" | i18n }}
30+
</a>
31+
</p>
32+
</article>
33+
</div>
34+
</div>
35+
36+
<section class="section">
37+
<div class="container">
38+
<h3 class="title is-size-3" id="credits">{{ "Supporters" | i18n }}</h3>
39+
<noscript>
40+
<!-- to reduce translator burden, not making this translatable -->
41+
<p>
42+
JavaScript is required to see supporters here.
43+
Alternatively, you can view them on <a href="https://opencollective.com/luanti">Open Collective</a>.
44+
</p>
45+
</noscript>
46+
<p id="credits-loading">{{ "Loading…" | i18n }}</p>
47+
<div id="credits-container" class="columns is-multiline"></div>
48+
<script src="/assets/js/opencollective.js"></script>
49+
</div>
50+
</section>
51+
52+
<section class="section">
53+
<div class="container">
54+
<h2 class="title is-size-2">{{ "Support staff and the community" | i18n }}</span></h2>
55+
56+
<div class="columns is-multiline">
57+
{% for point in donate.community %}
58+
<div class="column is-one-third">
59+
<article class="card" style="display: flex; flex-direction: column; min-height: 100%;">
60+
<div class="card-content">
61+
<h3 class="title is-4">
62+
{% if point.i18n_name %}
63+
{{ point.name | i18n }}
64+
{% else %}
65+
{{ point.name }}
66+
{% endif %}
67+
{% if point.title %}
68+
<span class="is-size-5 has-text-grey has-text-weight-normal">
69+
({{ point.title | i18n }})
70+
</span>
71+
{% endif %}
72+
</h3>
73+
<p>
74+
{{ point.description | i18n }}
75+
</p>
76+
</div>
77+
<footer class="card-footer" style="margin-top: auto;">
78+
{% for pair in point.links %}
79+
<a class="card-footer-item" href="{{ pair[1] }}">
80+
{% if point.i18n_links %}
81+
{{ pair[0] | i18n }}
82+
{% else %}
83+
{{ pair[0] }}
84+
{% endif %}
85+
</a>
86+
{% endfor %}
87+
</footer>
88+
</article>
89+
</div>
90+
{% endfor %}
91+
</div>
92+
</div>
93+
</section>
94+
</main>

‎_includes/pages/get-involved.html‎

Lines changed: 3 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ <h3 id="everyone" class="is-size-3 mb-4">{{ "Everyone" | i18n }}</h3>
5151
pull requests</a>." | i18n }}
5252
</li>
5353
<li>
54-
{{ "<a href='#donate'>Donate</a> money to pay for infrastructure, and
54+
{{ "<a href='/en/donate/'>Donate</a> money to pay for infrastructure, and
5555
<a href='https://content.luanti.org/donate/'>support your favourite contributors</a>." |
56-
i18n }}
56+
i18n | replace: "/en/", langPrefix }}
5757
</li>
5858
</ul>
5959
</div>
@@ -320,54 +320,14 @@ <h3 class="is-size-3">{{ "Where?" | i18n }}</h3>
320320
<div class="container">
321321
<h2 id="donate" class="title section-title">{{ "Donate" | i18n }}</h2>
322322
<div class="content">
323-
<h3 class="is-size-3">Luanti</span></h3>
324323
<p>
325324
{{ "You can donate to Luanti's non-profit collective hosted by Open Collective Europe."}}
326325
</p>
327326
<p>
328-
<a class="button is-large is-primary" href='https://opencollective.com/luanti/'>
327+
<a class="button is-large is-primary" href="{{ '/en/donate/' | locale_url }}">
329328
{{ "Support Luanti" | i18n }}
330329
</a>
331330
</p>
332-
333-
<h3 class="is-size-3">{{ "Donate to Individuals" | i18n }}</span></h3>
334-
335-
<div class="columns is-multiline">
336-
{% for point in donate %}
337-
<div class="column is-one-third">
338-
<article class="card" style="display: flex; flex-direction: column; min-height: 100%;">
339-
<div class="card-content">
340-
<h3 class="title is-4">
341-
{% if point.i18n_name %}
342-
{{ point.name | i18n }}
343-
{% else %}
344-
{{ point.name }}
345-
{% endif %}
346-
{% if point.title %}
347-
<span class="is-size-5 has-text-grey has-text-weight-normal">
348-
({{ point.title | i18n }})
349-
</span>
350-
{% endif %}
351-
</h3>
352-
<p>
353-
{{ point.description | i18n }}
354-
</p>
355-
</div>
356-
<footer class="card-footer" style="margin-top: auto;">
357-
{% for pair in point.links %}
358-
<a class="card-footer-item" href="{{ pair[1] }}">
359-
{% if point.i18n_links %}
360-
{{ pair[0] | i18n }}
361-
{% else %}
362-
{{ pair[0] }}
363-
{% endif %}
364-
</a>
365-
{% endfor %}
366-
</footer>
367-
</article>
368-
</div>
369-
{% endfor %}
370-
</div>
371331
</div>
372332
</div>
373333
</section>

‎content/de/donate.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
layout: pages/donate.html
3+
---

‎content/en/donate.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
layout: pages/donate.html
3+
redirect_from:
4+
- /donate/
5+
- /support/
6+
---

‎content/en/get-involved.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,4 @@
1010
- /development.html
1111
- /development/
1212
- /reporting_issues/
13-
- /donate/
14-
- /support/
1513
---

‎content/es/donate.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
layout: pages/donate.html
3+
---

0 commit comments

Comments
 (0)