From 9045defa5d317782deae398a629c46b4211bc1f7 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 29 Nov 2023 13:16:39 +0100 Subject: [PATCH 01/10] Add fr to the locales definition. --- docs/.vuepress/config.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index 0c689e6..8832a8e 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -19,6 +19,10 @@ export default defineUserConfig({ lang: 'de-DE', title: 'Ocelot.Social', // description: '' + }, + '/fr/': { + lang: 'fr-FR', + title: 'Ocelot.Social', } } }) \ No newline at end of file From 68996cea70864d9d35b3a17fab729ba84eaa3aaa Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 29 Nov 2023 21:37:47 +0100 Subject: [PATCH 02/10] feat(content): set navbar in the locales. --- docs/.vuepress/config/theme.js | 66 +++++++++++++++++++++++++--------- docs/en/impressum/README.md | 4 +-- docs/impressum/README.md | 4 +-- 3 files changed, 51 insertions(+), 23 deletions(-) diff --git a/docs/.vuepress/config/theme.js b/docs/.vuepress/config/theme.js index 50763b7..3c20d1d 100644 --- a/docs/.vuepress/config/theme.js +++ b/docs/.vuepress/config/theme.js @@ -11,24 +11,56 @@ export default hopeTheme({ contributors: false, displayFooter: true, print: false, - copyright: '© by busFaktor() e.V. & Authors | Impressum', - footer: 'Released under the MIT License.', - navbar: [ - { - text: 'Documentation', link: 'https://docs.ocelot.social/' + locales:{ + // The key is the path for the locale to be nested under. + // As a special case, the default locale can use '/' as its path. + '/en/': { + lang: 'en-US', // this will be set as the lang attribute on + title: 'Ocelot.Social', + // description: '' + copyright: '© by busFaktor() e.V. & Authors | Impressum', + footer: 'Released under the MIT License.', + navbar: [ + { + text: 'Documentation', link: 'https://docs.ocelot.social/' + }, + { + text: 'Demo', link: 'https://stage.ocelot.social/' + }, + { + text: 'Github', + link: 'https://github.com/Ocelot-Social-Community' + }, + { + text: 'Imprint', + link: '/impressum/' + }, + ], }, - { - text: 'Demo', link: 'https://stage.ocelot.social/' - }, - { - text: 'Github', - link: 'https://github.com/Ocelot-Social-Community' - }, - { - text: 'Impressum', - link: '/impressum/' - }, - ], + '/': { + lang: 'de-DE', + title: 'Ocelot.Social', + // description: '' + copyright: '© von busFaktor() e.V. & Authoren | Impressum', + footer: 'Unter der MIT License ausgeliefert.', + navbar: [ + { + text: 'Documentation', link: 'https://docs.ocelot.social/' + }, + { + text: 'Demo', link: 'https://stage.ocelot.social/' + }, + { + text: 'Github', + link: 'https://github.com/Ocelot-Social-Community' + }, + { + text: 'Impressum', + link: '/impressum/' + }, + ], + } + }, plugins: { mdEnhance: { align: true, diff --git a/docs/en/impressum/README.md b/docs/en/impressum/README.md index 8d07deb..6edcf5a 100644 --- a/docs/en/impressum/README.md +++ b/docs/en/impressum/README.md @@ -3,9 +3,7 @@ home: false # layout: BlogHome icon: home title: Imprint | Ocelot.Social -heroFullScreen: false -heroImage: /logo.svg -heroText: Free and open-source social network for active citizenship. +sidebar: false tagLine: # actions: # - text: Demo diff --git a/docs/impressum/README.md b/docs/impressum/README.md index 3e6671e..63b7334 100644 --- a/docs/impressum/README.md +++ b/docs/impressum/README.md @@ -3,9 +3,7 @@ home: false # layout: BlogHome icon: home title: Impressum | Ocelot.Social -heroFullScreen: false -heroImage: /logo.svg -heroText: Free and open-source social network for active citizenship. +sidebar: false tagLine: # actions: # - text: Demo From d578e016f00a9b0d570dec15073d67e027b55051 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 29 Nov 2023 21:49:49 +0100 Subject: [PATCH 03/10] Translate the imprint in french. --- docs/en/impressum/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/impressum/README.md b/docs/en/impressum/README.md index 8d07deb..ca2b530 100644 --- a/docs/en/impressum/README.md +++ b/docs/en/impressum/README.md @@ -11,7 +11,7 @@ tagLine: # - text: Demo # link: https://stage.ocelot.social/ --- -## Responsible for the Operation of this Website +## Responsable de l'exploitation de ce site Web busFaktor() e.V. Wolfgang Huß, 2nd Chairman @@ -21,7 +21,7 @@ Haferstr. 5c E-Mail: Telefon: +49 173 622 60 91 -## Contentwise Responsible Editor +## Éditeur responsable du contenu Wolfgang Huß From 377f44dca3175e6ad9e4942d53051a696b235291 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 29 Nov 2023 21:53:13 +0100 Subject: [PATCH 04/10] Switch from 'vous' to 'tu' form. --- docs/fr/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/fr/README.md b/docs/fr/README.md index bc882f5..0212691 100644 --- a/docs/fr/README.md +++ b/docs/fr/README.md @@ -13,6 +13,6 @@ tagLine: --- ## En construction -Notre site web est en construction. Revenez bientôt! +Notre site web est en construction. Reviens bientôt! Entre-temps, tu peux nous trouver sur [GitHub](https://github.com/Ocelot-Social-Community/) ou [Discord](https://discord.gg/AGPJ7YgC). From 28b7f80f2af0d1e2d77bcfaeabe9f9015e214dda Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 29 Nov 2023 21:55:22 +0100 Subject: [PATCH 05/10] Update docs/en/README.md --- docs/en/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/README.md b/docs/en/README.md index 9692b2c..51c39bb 100644 --- a/docs/en/README.md +++ b/docs/en/README.md @@ -13,6 +13,6 @@ tagLine: --- ## Coming soon -Our website is currently under construction. Come back soon! +Our website is under construction. Come back soon! In the meantime you can find us on [GitHub](https://github.com/Ocelot-Social-Community/) or [Discord](https://discord.gg/AGPJ7YgC). From 6898d6f9d94edc843da45eac901ab950448813cc Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 29 Nov 2023 21:58:53 +0100 Subject: [PATCH 06/10] Correct error of imprint translation french was in english and vise versa. --- docs/en/README.md | 2 +- docs/en/impressum/README.md | 4 ++-- docs/fr/impressum/README.md | 20 +++++++++++++++++++- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/docs/en/README.md b/docs/en/README.md index 9692b2c..51c39bb 100644 --- a/docs/en/README.md +++ b/docs/en/README.md @@ -13,6 +13,6 @@ tagLine: --- ## Coming soon -Our website is currently under construction. Come back soon! +Our website is under construction. Come back soon! In the meantime you can find us on [GitHub](https://github.com/Ocelot-Social-Community/) or [Discord](https://discord.gg/AGPJ7YgC). diff --git a/docs/en/impressum/README.md b/docs/en/impressum/README.md index ca2b530..8d07deb 100644 --- a/docs/en/impressum/README.md +++ b/docs/en/impressum/README.md @@ -11,7 +11,7 @@ tagLine: # - text: Demo # link: https://stage.ocelot.social/ --- -## Responsable de l'exploitation de ce site Web +## Responsible for the Operation of this Website busFaktor() e.V. Wolfgang Huß, 2nd Chairman @@ -21,7 +21,7 @@ Haferstr. 5c E-Mail: Telefon: +49 173 622 60 91 -## Éditeur responsable du contenu +## Contentwise Responsible Editor Wolfgang Huß diff --git a/docs/fr/impressum/README.md b/docs/fr/impressum/README.md index 4fef1f9..788f982 100644 --- a/docs/fr/impressum/README.md +++ b/docs/fr/impressum/README.md @@ -10,4 +10,22 @@ tagLine: # actions: # - text: Demo # link: https://stage.ocelot.social/ ---- \ No newline at end of file +--- +## Responsable de l‘exploitation de ce site Web + +busFaktor() e.V. +Wolfgang Huß, 2nd Chairman + +Haferstr. 5c +86179 Augsburg +E-Mail: +Telefon: +49 173 622 60 91 + +## Éditeur responsable du contenu + +Wolfgang Huß + +Steinburger Straße 38 +22527 Hamburg +E-Mail: +Telefon: +49 173 622 60 91 From 854285dd8a726f0cf07deac13d58cd6d6376a85c Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 29 Nov 2023 22:06:06 +0100 Subject: [PATCH 07/10] Add impressum title in french. --- docs/en/impressum/README.md | 4 +--- docs/fr/impressum/README.md | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/docs/en/impressum/README.md b/docs/en/impressum/README.md index 8d07deb..6edcf5a 100644 --- a/docs/en/impressum/README.md +++ b/docs/en/impressum/README.md @@ -3,9 +3,7 @@ home: false # layout: BlogHome icon: home title: Imprint | Ocelot.Social -heroFullScreen: false -heroImage: /logo.svg -heroText: Free and open-source social network for active citizenship. +sidebar: false tagLine: # actions: # - text: Demo diff --git a/docs/fr/impressum/README.md b/docs/fr/impressum/README.md index 788f982..e70bbe6 100644 --- a/docs/fr/impressum/README.md +++ b/docs/fr/impressum/README.md @@ -2,10 +2,8 @@ home: true # layout: BlogHome # icon: home -title: Impressum -heroFullScreen: false -# heroImage: /logo.svg -# heroText: Free and open-source social network for active citizenship. +sidebar: false +title: Mentions légales tagLine: # actions: # - text: Demo From 816c0a1e59c7df54bc0d65d06ab3ccb6fb02e9e6 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 29 Nov 2023 22:07:41 +0100 Subject: [PATCH 08/10] Correct use the right apostrophe. --- docs/fr/impressum/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/fr/impressum/README.md b/docs/fr/impressum/README.md index e70bbe6..69e031e 100644 --- a/docs/fr/impressum/README.md +++ b/docs/fr/impressum/README.md @@ -9,7 +9,7 @@ tagLine: # - text: Demo # link: https://stage.ocelot.social/ --- -## Responsable de l‘exploitation de ce site Web +## Responsable de l’exploitation de ce site Web busFaktor() e.V. Wolfgang Huß, 2nd Chairman From 61681fbcbeb9b95ab3deffea72158b23446c46ad Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 30 Nov 2023 10:21:53 +0100 Subject: [PATCH 09/10] Add VUEPRESS_BASE as env and use it on the config.js. --- .github/workflows/vuepress-deploy.yml | 2 ++ docs/.vuepress/config.js | 16 +--------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/vuepress-deploy.yml b/.github/workflows/vuepress-deploy.yml index 65d9aa2..cdc4936 100644 --- a/.github/workflows/vuepress-deploy.yml +++ b/.github/workflows/vuepress-deploy.yml @@ -19,6 +19,8 @@ jobs: - name: Build Vuepress Pages run: npm install && npm run build + env: + VUEPRESS_BASE: '/ocelot.social/' - name: Deploy Vuepress to Github Pages uses: crazy-max/ghaction-github-pages@v4 diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index 247a98f..e5b3229 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -7,19 +7,5 @@ export default defineUserConfig({ ...meta, theme, plugins, - base: '/ocelot.social/', - locales:{ - // The key is the path for the locale to be nested under. - // As a special case, the default locale can use '/' as its path. - '/en/': { - lang: 'en-US', // this will be set as the lang attribute on - title: 'Ocelot.Social', - // description: '' - }, - '/': { - lang: 'de-DE', - title: 'Ocelot.Social', - // description: '' - } - } + base: process.env.VUEPRESS_BASE ?? '/', }) \ No newline at end of file From e5caa115fc5dd03359d1f19c99586dc1b20fc7a7 Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 30 Nov 2023 14:57:03 +0100 Subject: [PATCH 10/10] Reintroduce the navbar on the config.js, translate the footer, add french the navbar. --- docs/.vuepress/config.js | 11 ++++++ docs/.vuepress/config/theme.js | 65 ++++++++++++++++++++++++---------- docs/fr/impressum/README.md | 2 +- 3 files changed, 58 insertions(+), 20 deletions(-) diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index e5b3229..066f3fe 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -8,4 +8,15 @@ export default defineUserConfig({ theme, plugins, base: process.env.VUEPRESS_BASE ?? '/', + locales: { + '/': { + lang: 'de-DE', + }, + '/en/': { + lang: 'en-EN', + }, + '/fr/': { + lang: 'fr-FR', + }, + } }) \ No newline at end of file diff --git a/docs/.vuepress/config/theme.js b/docs/.vuepress/config/theme.js index 3c20d1d..1734a31 100644 --- a/docs/.vuepress/config/theme.js +++ b/docs/.vuepress/config/theme.js @@ -4,6 +4,7 @@ export default hopeTheme({ favicon: 'favicon.ico', logo: '/logo.svg', docsRepo: 'https://github.com/Ocelot-Social-Community/ocelot.social', + repo: 'https://github.com/Ocelot-Social-Community/Ocelot-Social', docsBranch: 'master', docsDir: 'docs', editLink: true, @@ -11,25 +12,52 @@ export default hopeTheme({ contributors: false, displayFooter: true, print: false, + navbarLayout: { + start: ["Brand"], + center: ["Links"], + end: ["Language", "Repo", "Search"], + }, locales:{ // The key is the path for the locale to be nested under. // As a special case, the default locale can use '/' as its path. + '/': { + lang: 'de-DE', + title: 'Ocelot.Social', + copyright: '© von busFaktor() e.V. & Authoren | Impressum', + footer: 'Unter der MIT Lizenz ausgeliefert.', + navbar: [ + { + text: 'Documentation', + link: 'https://docs.ocelot.social/' , + target: '_self', + }, + { + text: 'Demo', + link: 'https://stage.ocelot.social/', + target: '_self', + }, + { + text: 'Impressum', + link: '/impressum/' + }, + ], + }, '/en/': { lang: 'en-US', // this will be set as the lang attribute on title: 'Ocelot.Social', // description: '' - copyright: '© by busFaktor() e.V. & Authors | Impressum', + copyright: '© by busFaktor() e.V. & Authors | Impressum', footer: 'Released under the MIT License.', navbar: [ { - text: 'Documentation', link: 'https://docs.ocelot.social/' + text: 'Documentation', + link: 'https://docs.ocelot.social/', + target: '_self', }, { - text: 'Demo', link: 'https://stage.ocelot.social/' - }, - { - text: 'Github', - link: 'https://github.com/Ocelot-Social-Community' + text: 'Demo', + link: 'https://stage.ocelot.social/', + target: '_self', }, { text: 'Imprint', @@ -37,25 +65,24 @@ export default hopeTheme({ }, ], }, - '/': { - lang: 'de-DE', + '/fr/': { + lang: 'fr-FR', title: 'Ocelot.Social', - // description: '' - copyright: '© von busFaktor() e.V. & Authoren | Impressum', - footer: 'Unter der MIT License ausgeliefert.', + copyright: '© par busFaktor() e.V. & Auteurs | Mentions légales', + footer: 'Publié sous la licence MIT.', navbar: [ { - text: 'Documentation', link: 'https://docs.ocelot.social/' + text: 'Documentation', + link: 'https://docs.ocelot.social/', + target: '_self', }, { - text: 'Demo', link: 'https://stage.ocelot.social/' + text: 'Demo', + link: 'https://stage.ocelot.social/', + target: '_self', }, { - text: 'Github', - link: 'https://github.com/Ocelot-Social-Community' - }, - { - text: 'Impressum', + text: 'Mentions légales', link: '/impressum/' }, ], diff --git a/docs/fr/impressum/README.md b/docs/fr/impressum/README.md index 69e031e..d2e7306 100644 --- a/docs/fr/impressum/README.md +++ b/docs/fr/impressum/README.md @@ -1,5 +1,5 @@ --- -home: true +home: false # layout: BlogHome # icon: home sidebar: false