diff --git a/src/_data/global.json b/src/_data/global.json
new file mode 100644
index 0000000..1263fe0
--- /dev/null
+++ b/src/_data/global.json
@@ -0,0 +1,19 @@
+{
+ "title": "sp-codes",
+ "description": "Samuel Philipp - Software Engineer from Magdeburg",
+ "url": "https://sp-codes.de",
+ "baseUrl": "/",
+ "author": "Samuel Philipp",
+ "languages": [
+ {
+ "label": "English",
+ "code": "en",
+ "icon": "us"
+ },
+ {
+ "label": "Deutsch",
+ "code": "de",
+ "icon": "de"
+ }
+ ]
+}
diff --git a/src/_data/site.js b/src/_data/site.js
index a4c5cf4..3c5f555 100644
--- a/src/_data/site.js
+++ b/src/_data/site.js
@@ -1,20 +1,3 @@
-module.exports = {
- title: "sp-codes",
- description: "Samuel Philipp - Software Engineer from Magdeburg",
- url: "https://sp-codes.de",
- baseUrl: "/",
- author: "Samuel Philipp",
- buildTime: new Date(),
- languages: [
- {
- label: "English",
- code: "en",
- icon: "us"
- },
- {
- label: "Deutsch",
- code: "de",
- icon: "de"
- }
- ]
-};
+const site = require("./global.json");
+site.buildTime = new Date();
+module.exports = site;
diff --git a/src/_data/strings.json b/src/_data/strings.json
deleted file mode 100644
index 098bfea..0000000
--- a/src/_data/strings.json
+++ /dev/null
@@ -1,136 +0,0 @@
-{
- "menu": {
- "title": {
- "de": "Menü",
- "en": "Menu"
- },
- "imprint": {
- "de": "Impressum",
- "en": "Imprint"
- },
- "privacy": {
- "de": "Datenschutz",
- "en": "Privacy"
- },
- "code": {
- "de": "Code",
- "en": "Code"
- },
- "stats": {
- "de": "Statistiken",
- "en": "Stats"
- }
- },
- "state": {
- "title": {
- "de": "Status",
- "en": "State"
- },
- "operational": {
- "de": "Online",
- "en": "Online"
- },
- "outage": {
- "de": "Ausfall",
- "en": "Outage"
- },
- "maintenance": {
- "de": "Wartung",
- "en": "Maintenance"
- }
- },
- "donations": {
- "supporters": {
- "de": "Unterstützende",
- "en": "Supporters"
- },
- "date": {
- "de": "Datum",
- "en": "Date"
- },
- "amount": {
- "de": "Betrag",
- "en": "Amount"
- },
- "via": {
- "de": "Via",
- "en": "Via"
- },
- "from": {
- "de": "Von",
- "en": "Form"
- },
- "banktransfer": {
- "de": "Überweisung",
- "en": "Bank transfer"
- },
- "opencollective": {
- "de": "Open Collective",
- "en": "Open Collective"
- },
- "total": {
- "de": "Gesamt",
- "en": "Total"
- },
- "name": {
- "de": "Name",
- "en": "Name"
- },
- "type": {
- "de": "Typ",
- "en": "Type"
- },
- "provider": {
- "de": "Anbieter",
- "en": "Provider"
- },
- "location": {
- "de": "Standort",
- "en": "Location"
- },
- "month": {
- "de": "Monat",
- "en": "Month"
- },
- "year": {
- "de": "Jahr",
- "en": "Year"
- }
- },
- "service": {
- "overview": {
- "de": "Zurück zur Übersicht",
- "en": "Back to overview"
- }
- },
- "article": {
- "seriesParts": {
- "de": "Alle Teile dieser Serie",
- "en": "All parts of this series"
- },
- "relatedService": {
- "de": "Zugehöriger Dienst",
- "en": "Related Service"
- },
- "questions": {
- "de": "Du hast eine Frage dazu?",
- "en": "Do you have a question?"
- },
- "questionsContent": {
- "de": "
Komm gerne in der Matrix-Gruppe vorbei und lass uns diskutieren. Ich freue mich auf dein Feedback!
#sp-codes:matrix.sp-codes.de",
- "en": "Join the Matrix group and let's discuss. I look forward to your feedback!
#sp-codes:matrix.sp-codes.de"
- },
- "aboutMe": {
- "de": "Über mich",
- "en": "About me"
- },
- "aboutMeContent": {
- "de": "Mein Name ist Samuel Philipp und ich bin ein Software Engineer aus Magdeburg. In meiner Freizeit hoste ich verschiedene freie Dienste. Hier schreibe ich Artikel rund um Sicherheit und Datenschutz.
Mehr erfahren",
- "en": "My name is Samuel Philipp and I am a software engineer from Magdeburg, Germany. In my spare time, I host various free services. Here I write articles about security and privacy.
Read more"
- },
- "yourOpinion": {
- "de": "Schreib mir deine Meinung",
- "en": "Send me your opinion"
- }
- }
-}
diff --git a/src/_includes/donations-current.html b/src/_includes/donations-current.html
index ec60a4c..5ecb715 100644
--- a/src/_includes/donations-current.html
+++ b/src/_includes/donations-current.html
@@ -2,17 +2,17 @@
- {{strings.donations.date[locale]}} |
- {{strings.donations.via[locale]}} |
- {{strings.donations.from[locale]}} |
- {{strings.donations.amount[locale]}} |
+ {{strings.donations.date}} |
+ {{strings.donations.via}} |
+ {{strings.donations.from}} |
+ {{strings.donations.amount}} |
{% for donation in donations[0].donations %}
{{donation.date}} |
- {{strings.donations[donation.via][locale]}} |
+ {{strings.donations[donation.via]}} |
{% if donation.from %}
{{donation.from}} |
{% else %}
@@ -24,7 +24,7 @@
- {{strings.donations.total[locale]}} |
+ {{strings.donations.total}} |
{{donations[0].donations | sum | amount}} € |
diff --git a/src/_includes/donations.html b/src/_includes/donations.html
index 7a373b5..06ea695 100644
--- a/src/_includes/donations.html
+++ b/src/_includes/donations.html
@@ -5,17 +5,17 @@
- {{strings.donations.date[locale]}} |
- {{strings.donations.via[locale]}} |
- {{strings.donations.from[locale]}} |
- {{strings.donations.amount[locale]}} |
+ {{strings.donations.date}} |
+ {{strings.donations.via}} |
+ {{strings.donations.from}} |
+ {{strings.donations.amount}} |
{% for donation in year.donations %}
{{donation.date}} |
- {{strings.donations[donation.via][locale]}} |
+ {{strings.donations[donation.via]}} |
{% if donation.from %}
{{donation.from}} |
{% else %}
@@ -27,7 +27,7 @@
- {{strings.donations.total[locale]}} |
+ {{strings.donations.total}} |
{{year.donations | sum | amount}} € |
diff --git a/src/_includes/expenses-current.html b/src/_includes/expenses-current.html
index 0fef736..033b407 100644
--- a/src/_includes/expenses-current.html
+++ b/src/_includes/expenses-current.html
@@ -2,12 +2,12 @@
- {{strings.donations.name[locale]}} |
- {{strings.donations.type[locale]}} |
- {{strings.donations.provider[locale]}} |
- {{strings.donations.location[locale]}} |
- {{strings.donations.amount[locale]}} / {{strings.donations.month[locale]}} |
- {{strings.donations.amount[locale]}} / {{strings.donations.year[locale]}} |
+ {{strings.donations.name}} |
+ {{strings.donations.type}} |
+ {{strings.donations.provider}} |
+ {{strings.donations.location}} |
+ {{strings.donations.amount}} / {{strings.donations.month}} |
+ {{strings.donations.amount}} / {{strings.donations.year}} |
@@ -28,7 +28,7 @@
- {{strings.donations.total[locale]}} |
+ {{strings.donations.total}} |
{{expenses | sum | amount}} € |
{{expenses | sum | year | amount}} € |
diff --git a/src/_includes/layouts/article.njk b/src/_includes/layouts/article.njk
index 3c33b88..8b4e771 100644
--- a/src/_includes/layouts/article.njk
+++ b/src/_includes/layouts/article.njk
@@ -16,7 +16,7 @@ layout: base.njk
{% if series %}
-
{{ strings.article.seriesParts[locale] }}
+
{{ strings.article.seriesParts }}
{%- for post in collections.all %}
{% if post.data.series == series %}
@@ -34,7 +34,7 @@ layout: base.njk
{% set service = services | getServiceById(service) %}
{% if service %}
-
{{ strings.article.relatedService[locale] }}
+
{{ strings.article.relatedService }}
{% if service.beta == true %}
@@ -48,7 +48,7 @@ layout: base.njk
{% if service.status %}
@@ -59,15 +59,15 @@ layout: base.njk
{% endif %}
-
{{ strings.article.questions[locale] }}
-
{{ strings.article.questionsContent[locale] | safe }}
+
{{ strings.article.questions }}
+
{{ strings.article.questionsContent | safe }}
-
{{ strings.article.aboutMe[locale] }}
-
{{ strings.article.aboutMeContent[locale] | safe }}
+
{{ strings.article.aboutMe }}
+
{{ strings.article.aboutMeContent | safe }}
-
{{ strings.article.yourOpinion[locale] }}
+
{{ strings.article.yourOpinion }}
diff --git a/src/_includes/layouts/service.njk b/src/_includes/layouts/service.njk
index c21c57d..850d923 100644
--- a/src/_includes/layouts/service.njk
+++ b/src/_includes/layouts/service.njk
@@ -4,8 +4,8 @@ layout: base.njk
{% set service = services | getServiceById(key) %}
{% if service %}
-
{{ strings.service.overview[locale] }}
-
{{title}}
+
{{ strings.service.overview }}
+
{{title}}
diff --git a/src/_includes/services-extended.html b/src/_includes/services.html
similarity index 73%
rename from src/_includes/services-extended.html
rename to src/_includes/services.html
index b721ee2..a3a16ec 100644
--- a/src/_includes/services-extended.html
+++ b/src/_includes/services.html
@@ -12,7 +12,7 @@
{% if service.status %}
{% endif %}
diff --git a/src/de/all-donations.html b/src/de/all-donations.html
index fed3912..e53a14c 100644
--- a/src/de/all-donations.html
+++ b/src/de/all-donations.html
@@ -2,6 +2,7 @@
layout: base.njk
key: all-donations
title: Unterstützen
+summary: Unterstütze sp-codes mit einer Spende – hilf mit, die Dienste dauerhaft für die Community bereitstellen zu können.
---
Alle Spenden
diff --git a/src/de/contact.html b/src/de/contact.html
index 19e1b04..94a52d2 100644
--- a/src/de/contact.html
+++ b/src/de/contact.html
@@ -2,6 +2,7 @@
layout: base.njk
key: contact
title: Kontakt
+summary: Kontaktinformationen zu Admins oder Moderation von sp-codes.
eleventyNavigation:
key: contact
title: Kontakt
diff --git a/src/de/de.json b/src/de/de.json
index 6ba62f7..c21cdb6 100644
--- a/src/de/de.json
+++ b/src/de/de.json
@@ -1,3 +1,46 @@
{
- "locale": "de"
+ "locale": "de",
+ "strings": {
+ "menu": {
+ "title": "Menü",
+ "imprint": "Impressum",
+ "privacy": "Datenschutz",
+ "code": "Code",
+ "stats": "Statistiken"
+ },
+ "state": {
+ "title": "Status",
+ "operational": "Online",
+ "outage": "Ausfall",
+ "maintenance": "Wartung"
+ },
+ "donations": {
+ "supporters": "Unterstützende",
+ "date": "Datum",
+ "amount": "Betrag",
+ "via": "Via",
+ "from": "Von",
+ "banktransfer": "Überweisung",
+ "opencollective": "Open Collective",
+ "total": "Gesamt",
+ "name": "Name",
+ "type": "Typ",
+ "provider": "Anbieter",
+ "location": "Standort",
+ "month": "Monat",
+ "year": "Jahr"
+ },
+ "service": {
+ "overview": "Zurück zur Übersicht"
+ },
+ "article": {
+ "seriesParts": "Alle Teile dieser Serie",
+ "relatedService": "Zugehöriger Dienst",
+ "questions": "Du hast eine Frage dazu?",
+ "questionsContent": "
Komm gerne in der Matrix-Gruppe vorbei und lass uns diskutieren. Ich freue mich auf dein Feedback!
#sp-codes:matrix.sp-codes.de",
+ "aboutMe": "Über mich",
+ "aboutMeContent": "
Mein Name ist Samuel Philipp und ich bin ein Software Engineer aus Magdeburg. In meiner Freizeit hoste ich verschiedene freie Dienste. Hier schreibe ich Artikel rund um Sicherheit und Datenschutz.
Mehr erfahren",
+ "yourOpinion": "Schreib mir deine Meinung"
+ }
+ }
}
diff --git a/src/de/donate.html b/src/de/donate.html
index 9e5d8d9..df941b9 100644
--- a/src/de/donate.html
+++ b/src/de/donate.html
@@ -2,6 +2,7 @@
layout: base.njk
key: donate
title: Unterstützen
+summary: Unterstütze sp-codes mit einer Spende – hilf mit, die Dienste dauerhaft für die Community bereitstellen zu können.
eleventyNavigation:
key: donate
title: Unterstützen
@@ -24,12 +25,12 @@ eleventyNavigation:
Banküberweisung
-
Wenn Du mir etwas überweisen willst, schreib mir einfach eine kurze
Nachricht.
+
Wenn du mir etwas überweisen willst, schreib mir einfach eine kurze
Nachricht.
Ich schicke dir dann schnellstmöglich meine Bankverbindung zu. Ganz besonders freue ich mich auch über
einen Dauerauftrag.
-
+
@@ -38,8 +39,8 @@ eleventyNavigation:
Wer mir etwas Bargeld zukommen lassen möchte, darf das gerne an die Adresse aus dem
Impressum senden.
-
+
diff --git a/src/de/imprint.html b/src/de/imprint.html
index 5a74299..44ab596 100644
--- a/src/de/imprint.html
+++ b/src/de/imprint.html
@@ -1,6 +1,7 @@
---
layout: base.njk
title: Impressum
+summary: Impressum von sp-codes – Informationen zu Rechtsinhaber und Kontaktangaben.
---
Impressum
diff --git a/src/de/index.html b/src/de/index.html
index b039f7f..a9470ee 100644
--- a/src/de/index.html
+++ b/src/de/index.html
@@ -2,12 +2,12 @@
layout: base.njk
key: home
title: Home
+summary: sp-codes stellt verschiedene Open-Source-Tools zur allgemeinen Verfügung. Alle Dienste sind kostenlos und werbefrei.
eleventyNavigation:
key: home
title: Home
icon: i-home
---
-
@@ -77,7 +77,7 @@ eleventyNavigation:
Tool-Übersicht
Alle Dienste anzeigen
- {% include "services-extended.html" %}
+ {% include "services.html" %}
diff --git a/src/de/privacy.html b/src/de/privacy.html
index f65b7e2..3e5d976 100644
--- a/src/de/privacy.html
+++ b/src/de/privacy.html
@@ -1,6 +1,7 @@
---
layout: base.njk
title: Datenschutzerklärung
+summary: Datenschutzerklärung von sp-codes – Informationen zur Datenverarbeitung.
---
Datenschutzerklärung
diff --git a/src/de/services.html b/src/de/services.html
index cfa2ace..202bdcd 100644
--- a/src/de/services.html
+++ b/src/de/services.html
@@ -2,6 +2,7 @@
layout: base.njk
key: services
title: Dienste
+summary: sp-codes stellt verschiedene Open-Source-Tools zur allgemeinen Verfügung. Alle Dienste sind kostenlos und werbefrei.
eleventyNavigation:
key: services
title: Dienste
@@ -27,5 +28,5 @@ eleventyNavigation:
- {% include "services-extended.html" %}
+ {% include "services.html" %}
diff --git a/src/en/all-donations.html b/src/en/all-donations.html
index 7093449..6e922f2 100644
--- a/src/en/all-donations.html
+++ b/src/en/all-donations.html
@@ -1,7 +1,8 @@
---
layout: base.njk
key: all-donations
-title: Unterstützen
+title: Donate
+summary: Support sp-codes with a donation - help us to provide the services for the community in the long term.
---
All Donations
diff --git a/src/en/contact.html b/src/en/contact.html
index 5d5f422..1f1a866 100644
--- a/src/en/contact.html
+++ b/src/en/contact.html
@@ -2,6 +2,7 @@
layout: base.njk
key: contact
title: Contact
+summary: Contact information for admins or moderation of sp-codes.
eleventyNavigation:
key: contact
title: Contact
diff --git a/src/en/donate.html b/src/en/donate.html
index 7f33544..c35fc2e 100644
--- a/src/en/donate.html
+++ b/src/en/donate.html
@@ -2,6 +2,7 @@
layout: base.njk
key: donate
title: Donate
+summary: Support sp-codes with a donation - help us to provide the services for the community in the long term.
eleventyNavigation:
key: donate
title: Donate
@@ -26,8 +27,8 @@ eleventyNavigation:
If you want to transfer some money to me, just write me a short
message. I
will then send you my bank details as soon as possible. I am especially happy about a standing order.
-
+
@@ -36,8 +37,8 @@ eleventyNavigation:
If you want to send me some cash, feel free to send it to the address provided in the
imprint.
-
+
diff --git a/src/en/en.json b/src/en/en.json
index d160103..5fce4cd 100644
--- a/src/en/en.json
+++ b/src/en/en.json
@@ -1,3 +1,47 @@
{
- "locale": "en"
+ "locale": "en",
+ "strings": {
+ "locale": "en",
+ "menu": {
+ "title": "Menu",
+ "imprint": "Imprint",
+ "privacy": "Privacy",
+ "code": "Code",
+ "stats": "Stats"
+ },
+ "state": {
+ "title": "State",
+ "operational": "Online",
+ "outage": "Outage",
+ "maintenance": "Maintenance"
+ },
+ "donations": {
+ "supporters": "Supporters",
+ "date": "Date",
+ "amount": "Amount",
+ "via": "Via",
+ "from": "Form",
+ "banktransfer": "Bank transfer",
+ "opencollective": "Open Collective",
+ "total": "Total",
+ "name": "Name",
+ "type": "Type",
+ "provider": "Provider",
+ "location": "Location",
+ "month": "Month",
+ "year": "Year"
+ },
+ "service": {
+ "overview": "Back to overview"
+ },
+ "article": {
+ "seriesParts": "All parts of this series",
+ "relatedService": "Related Service",
+ "questions": "Do you have a question?",
+ "questionsContent": "
Join the Matrix group and let's discuss. I look forward to your feedback!
#sp-codes:matrix.sp-codes.de",
+ "aboutMe": "About me",
+ "aboutMeContent": "
My name is Samuel Philipp and I am a software engineer from Magdeburg, Germany. In my spare time, I host various free services. Here I write articles about security and privacy.
Read more",
+ "yourOpinion": "Send me your opinion"
+ }
+ }
}
diff --git a/src/en/imprint.html b/src/en/imprint.html
index 5d44c81..9f12b0b 100644
--- a/src/en/imprint.html
+++ b/src/en/imprint.html
@@ -1,6 +1,7 @@
---
layout: base.njk
-title: sp-codes
+title: Impressum
+summary: Imprint of sp-codes - Information on legal owner and contact details.
---
Imprint
diff --git a/src/en/index.html b/src/en/index.html
index 6d898bb..54811a7 100644
--- a/src/en/index.html
+++ b/src/en/index.html
@@ -2,12 +2,12 @@
layout: base.njk
key: home
title: Home
+summary: sp-codes provides various open source tools for general use. All services are for free and without advertising.
eleventyNavigation:
key: home
title: Home
icon: i-home
---
-
@@ -76,7 +76,7 @@ eleventyNavigation:
Tool Overview
View all services
- {% include "services-extended.html" %}
+ {% include "services.html" %}
diff --git a/src/en/privacy.html b/src/en/privacy.html
index 99213bd..6b5ff2d 100644
--- a/src/en/privacy.html
+++ b/src/en/privacy.html
@@ -1,6 +1,7 @@
---
layout: base.njk
title: Privacy
+summary: Privacy policy of sp-codes - Information on data processing.
---
Privacy
Sorry, this document is only available in German so far. Read it here.
diff --git a/src/en/services.html b/src/en/services.html
index 265ea08..d921c00 100644
--- a/src/en/services.html
+++ b/src/en/services.html
@@ -2,6 +2,7 @@
layout: base.njk
key: services
title: Services
+summary: sp-codes provides various open source tools for general use. All services are for free and without advertising.
eleventyNavigation:
key: services
title: Services
@@ -26,5 +27,5 @@ eleventyNavigation:
- {% include "services-extended.html" %}
+ {% include "services.html" %}