diff --git a/.forgejo/workflows/cleanup.yaml b/.forgejo/workflows/cleanup.yaml index 69921a7..edb7bc4 100644 --- a/.forgejo/workflows/cleanup.yaml +++ b/.forgejo/workflows/cleanup.yaml @@ -11,12 +11,11 @@ jobs: - name: Environment setup run: | apk add git nodejs jq coreutils curl tree gawk grep - - name: Public repo pull + - name: Pages repo pull uses: actions/checkout@v4 with: fetch-depth: 0 - token: ${{ secrets.PAGES_TOKEN }} - ref: public + ref: pages - name: Render website run: | export GITHUB_PR_NAME=$(grep -l ${{ github.sha }} previews/*/git_sha.txt | awk -F '/' '{print $2}') diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml deleted file mode 100644 index 91fc4ff..0000000 --- a/.forgejo/workflows/deploy.yaml +++ /dev/null @@ -1,27 +0,0 @@ -on: - push: - branches: - - 'public' - -jobs: - deploy: - runs-on: x86_64 - container: alpine:latest - env: - GIT_SSH_COMMAND: ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no - steps: - - name: Environment setup - run: | - apk add git nodejs openssh-client-common openssh-client-default - - name: Start ssh-agent - uses: actions/ssh-agent@v0.9.0 - with: - ssh-private-key: ${{ secrets.PAGES_PRIVKEY }} - - name: Repo pull - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Website upload - run: | - git remote set-url origin ${{ vars.PAGES_TARGET }} - git push -f diff --git a/.forgejo/workflows/pages.yaml b/.forgejo/workflows/pages.yaml index 5a05a58..e37c097 100644 --- a/.forgejo/workflows/pages.yaml +++ b/.forgejo/workflows/pages.yaml @@ -11,28 +11,27 @@ jobs: steps: - name: Environment setup run: | - apk add git ikiwiki po4a perl-yaml-tiny tree nodejs + apk add git ikiwiki po4a perl-yaml-tiny tree nodejs imagemagick-perlmagick imagemagick imagemagick-jpeg findutils bash imagemagick-webp - name: Repo pull - uses: https://github.com/actions/checkout@v4 + uses: actions/checkout@v4 with: fetch-depth: 1 - token: ${{ secrets.PAGES_TOKEN }} - - name: Public repo pull - uses: https://github.com/actions/checkout@v4 + - name: Pages repo pull + uses: actions/checkout@v4 with: fetch-depth: 0 - ref: public + ref: pages path: public - token: ${{ secrets.PAGES_TOKEN }} - name: Render website run: ikiwiki --setup ikiwiki.setup - name: Website upload run: | - rm -Rf public/.forgejo - mkdir -p public/.forgejo/workflows - cp .forgejo/workflows/deploy.yaml public/.forgejo/workflows/. + cp .pages-domains public/.domains + cp .pages-redirect public/_redirects git log -1 --pretty=%B > commit.txt cd public + find -name 'index.html' -type 'l' -delete + find -name 'index.fr.html' -exec bash -c 'ln -s "${0/.*\/}" "${0/.fr/}"' {} \; date > generated.txt # Note: the following account information will not work on GHES git config user.name "forgejo-actions[bot]" diff --git a/.forgejo/workflows/preview.yaml b/.forgejo/workflows/preview.yaml index 3ad603e..e8ec978 100644 --- a/.forgejo/workflows/preview.yaml +++ b/.forgejo/workflows/preview.yaml @@ -10,20 +10,18 @@ jobs: steps: - name: Environment setup run: | - apk add git ikiwiki po4a perl-yaml-tiny tree nodejs jq coreutils curl - echo "GITHUB_PR_NAME=$(curl -Ls ${{ github.server_url }}/api/v1/repos/${{ github.repository }}/pulls/${{ github.ref_name }} | jq .title | tr ' ' '-' | tr -d ':' | tr -d '"' | tr '[:upper:]' '[:lower:]' | tr '/' '-')" >> $GITHUB_ENV + apk add git ikiwiki po4a perl-yaml-tiny tree nodejs jq coreutils curl imagemagick-perlmagick imagemagick imagemagick-jpeg findutils bash imagemagick-webp + echo "GITHUB_PR_NAME=$(curl -Ls ${{ github.server_url }}/api/v1/repos/${{ github.repository }}/pulls/${{ github.ref_name }} -H 'accept: application/json' -H 'Authorization: token ${{ secrets.FORGEJO_TOKEN }}' | jq .title | tr ' ' '-' | tr -d ':' | tr -d '"' | tr '[:upper:]' '[:lower:]' | tr '/' '-' | tr -d ',')" >> $GITHUB_ENV - name: Repo pull uses: actions/checkout@v4 with: fetch-depth: 1 - token: ${{ secrets.PAGES_TOKEN }} - name: Public repo pull uses: actions/checkout@v4 with: fetch-depth: 0 - ref: public + ref: pages path: public - token: ${{ secrets.PAGES_TOKEN }} - name: Render website run: | rm -rf public/previews/$GITHUB_PR_NAME || true @@ -32,11 +30,11 @@ jobs: ikiwiki --setup ikiwiki.setup cd public/previews tree -d -H '.' -L 1 --noreport --charset utf-8 -T "Versions" -o index.html + cd $GITHUB_PR_NAME + find -name 'index.html' -type 'l' -delete + find -name 'index.fr.html' -exec bash -c 'ln -s "${0/.*\/}" "${0/.fr/}"' {} \; - name: Website upload run: | - rm -Rf public/.forgejo - mkdir -p public/.forgejo/workflows - cp .forgejo/workflows/deploy.yaml public/.forgejo/workflows/. git log -1 --pretty=%B > commit.txt cd public date > previews/$GITHUB_PR_NAME/generated.txt diff --git a/.pages-domains b/.pages-domains new file mode 100644 index 0000000..fd7f80a --- /dev/null +++ b/.pages-domains @@ -0,0 +1 @@ +www.ilot.io diff --git a/.pages-redirect b/.pages-redirect new file mode 100644 index 0000000..e69de29 diff --git a/footer.fr.mo b/footer.fr.mo index 00f869a..e93d1db 100644 Binary files a/footer.fr.mo and b/footer.fr.mo differ diff --git a/footer.fr.po b/footer.fr.po index 2880001..533e635 100644 --- a/footer.fr.po +++ b/footer.fr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ilot.io\n" -"POT-Creation-Date: 2025-03-13 17:34-0400\n" -"PO-Revision-Date: 2025-03-13 17:36-0400\n" +"POT-Creation-Date: 2025-06-12 16:36-0400\n" +"PO-Revision-Date: 2025-06-12 16:44-0400\n" "Last-Translator: \n" "Language-Team: dev@ayakael.net\n" "Language: fr\n" @@ -19,7 +19,7 @@ msgstr "" #. type: Content of:

msgid "Support" -msgstr "Soutient" +msgstr "Soutien" #. type: Content of:

  • msgid "[[FAQs|https://support.ilot.io/en/hc/706927618]]" @@ -31,7 +31,7 @@ msgstr "[[Problèmes connus|https://forge.ilot.io/ilot/-/projects/3]]" #. type: Content of:

    • msgid "[[Support ticket|https://support.ilot.io/help/706927618]]" -msgstr "[[Soutient technique|https://support.ilot.io/help/706927618]]" +msgstr "[[Soutien technique|https://support.ilot.io/help/706927618]]" #. type: Content of:

      msgid "Contribute" @@ -87,8 +87,8 @@ msgstr "" #. type: Content of:

      msgid "" -" " +" " msgstr "" #. type: Content of:

      @@ -129,6 +129,14 @@ msgstr "" "dismiss=\"modal\">Fermer " +#. type: Content of:

      diff --git a/footer.pot b/footer.pot index 592d7b8..69e81cf 100644 --- a/footer.pot +++ b/footer.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2025-03-13 17:34-0400\n" +"POT-Creation-Date: 2025-06-12 16:45-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -86,8 +86,8 @@ msgstr "" #. type: Content of:

      msgid "" -" " +" " msgstr "" #. type: Content of:

      @@ -119,3 +119,9 @@ msgid "" "data-bs-dismiss=\"modal\">Close " msgstr "" + +#. type: Content of:

      +msgid "" +"Ilot is a GRIP-UQAM " +"working group" +msgstr "" diff --git a/ikiwiki.setup b/ikiwiki.setup index 75d756a..a05aef6 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -46,6 +46,7 @@ add_plugins: - typography - sidebar2 - po +- inline # plugins to disable disable_plugins: - htmlscrubber diff --git a/index.fr.mo b/index.fr.mo index 7c066f5..24c5bdc 100644 Binary files a/index.fr.mo and b/index.fr.mo differ diff --git a/index.fr.po b/index.fr.po index 3dd3aa1..45b3ada 100644 --- a/index.fr.po +++ b/index.fr.po @@ -5,15 +5,15 @@ msgid "" msgstr "" "Project-Id-Version: ilot.io\n" -"POT-Creation-Date: 2024-09-08 12:28-0400\n" -"PO-Revision-Date: 2024-09-08 12:33-0400\n" +"POT-Creation-Date: 2025-06-12 16:42-0400\n" +"PO-Revision-Date: 2025-06-12 16:45-0400\n" "Last-Translator: Philippe Batailler \n" "Language-Team: dev@ayakael.net\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 3.4.3\n" +"X-Generator: Poedit 3.5\n" #. type: Plain text #, no-wrap @@ -37,49 +37,23 @@ msgstr "" #. type: Plain text msgid "" -"[[ilot|https://ilot.io]] is a cooperative corner of the internet. We operate " -"a Nextcloud instance, a free and open-source collaboration platform " -"analoguous to Google Drive. We aim to eventually incorporate as a " -"cooperative to create a digital infrastructure that is by and for its users " -"as an alternative to the siloed and privatized internet of today. Members " -"fund our operations and decide how to set our community policies, steward " -"our data, and manage our shared technologies. Members also provide the labor " -"to run ilot at all levels." +"[[ilot|https://ilot.io]] is a cooperative corner of the internet. We operate a Nextcloud instance, a free and open-source collaboration platform analoguous to Google Drive. We aim to eventually incorporate as a cooperative to create a digital infrastructure that is by and for its users as an " +"alternative to the siloed and privatized internet of today. Members fund our operations and decide how to set our community policies, steward our data, and manage our shared technologies. Members also provide the labor to run ilot at all levels." msgstr "" -"[[ilot|https://ilot.io]] est une isle coopérative de l'internet. Nous " -"administrons une instance de Nextcloud, une plateformes libre de travail et " -"de stockage de donnée analogue à Google Drive. Notre objectif est de nous " -"constituer en coopérative afin de créer une infrastructure numérique par et " -"pour ses utilisateur-ice-s, en alternative à l'internet cloisonné et " -"privatisé d'aujourd'hui. Les membres financent nos opérations et décident de " -"la manière de définir nos politiques communautaires, de gérer nos données et " -"nos technologies partagées. Les membres fournissent également la main-" -"d'œuvre nécessaire au fonctionnement de l'ilot à tous les niveaux." +"[[ilot|https://ilot.io]] est une ile coopérative de l'internet. Nous administrons une instance de Nextcloud, une plateforme libre de travail et de stockage de donnée analogue à Google Drive. Notre objectif est de nous constituer en coopérative afin de créer une infrastructure numérique par et pour " +"ses utilisateur-ice-s, en alternative à l'internet cloisonné et privatisé d'aujourd'hui. Les membres financent nos opérations et décident de la manière de définir nos politiques communautaires, de gérer nos données et nos technologies partagées. Les membres fournissent également la main-d'œuvre " +"nécessaire au fonctionnement de l'ilot à tous les niveaux." #. type: Plain text -msgid "" -"The project is currently in beta, as there is still a lot of work left to " -"do. While the technical infrastructure is setup and stable, the governance " -"and community guidelines are still a work in progress. If you are interested " -"in joining ilot, visit our [[registration form|join]]." +msgid "The project is currently in beta, as there is still a lot of work left to do. While the technical infrastructure is setup and stable, the governance and community guidelines are still a work in progress. If you are interested in joining ilot, visit our [[registration form|join]]." msgstr "" -"Le projet est actuellement en version bêta, car il reste encore beaucoup de " -"travail à faire. Alors que l'infrastructure technique est mise en place et " -"stable, la gouvernance et les lignes directrices de la communauté sont " -"encore en cours d'élaboration. Si vous souhaitez rejoindre ilot, visitez " -"notre [[formulaire d'inscription|join]]." +"Le projet est actuellement en version bêta, car il reste encore beaucoup de travail à faire. Alors que l'infrastructure technique est mise en place et stable, la gouvernance et les lignes directrices de la communauté sont encore en cours d'élaboration. Si vous souhaitez vous joindre à notre projet, " +"compléter notre [[formulaire d'inscription|join]]." #. type: Plain text -msgid "" -"ilot was started in 2021 when AESA-CIRI, the sociology, anthropology and " -"immigration studies sudent association of UQAM, wanted to create its own " -"digital infrastructure. Since then, we have worked toward the goal of making " -"the project useful to other organisations and individuals." -msgstr "" -"ilot a vu le jour en 2021 lorsque l'AESA-CIRI, l'association des étudiants " -"en sociologie, anthropologie et études de l'immigration de l'UQAM, a voulu " -"créer sa propre infrastructure numérique. Depuis, nous travaillons dans le " -"but de rendre le projet utile à d'autres organisations et individus." +#, no-wrap +msgid "ilot was started in 2021 when AESA-CIRI, the sociology, anthropology and immigration studies sudent association of UQAM, wanted to create its own digital infrastructure. Since then, we have worked toward the goal of making the project useful to other organisations and individuals. Since march of 2025, we are a fiscally sponsored by GRIP-UQAM.\n" +msgstr "ilot a vu le jour en 2021 lorsque l'AESA-CIRI, l'association des étudiants en sociologie, anthropologie et études de l'immigration de l'UQAM, a voulu créer sa propre infrastructure numérique. Depuis, nous travaillons dans le but de rendre le projet utile à d'autres organisations et individus. Depuis mars 2025, le GRIP-UQAM nous héberge fiscalement.\n" #. type: Title ## #, no-wrap diff --git a/index.mdwn b/index.mdwn index 565afce..388748d 100644 --- a/index.mdwn +++ b/index.mdwn @@ -10,7 +10,7 @@ The project is currently in beta, as there is still a lot of work left to do. While the technical infrastructure is setup and stable, the governance and community guidelines are still a work in progress. If you are interested in joining ilot, visit our [[registration form|join]]. -ilot was started in 2021 when AESA-CIRI, the sociology, anthropology and immigration studies sudent association of UQAM, wanted to create its own digital infrastructure. Since then, we have worked toward the goal of making the project useful to other organisations and individuals. +ilot was started in 2021 when AESA-CIRI, the sociology, anthropology and immigration studies sudent association of UQAM, wanted to create its own digital infrastructure. Since then, we have worked toward the goal of making the project useful to other organisations and individuals. Since march of 2025, we are a fiscally sponsored by GRIP-UQAM. ## Learn more diff --git a/index.pot b/index.pot index f378568..bde4679 100644 --- a/index.pot +++ b/index.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-09-11 14:44-0400\n" +"POT-Creation-Date: 2025-06-12 16:45-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -54,12 +54,14 @@ msgid "" msgstr "" #. type: Plain text -#, markdown-text +#, markdown-text, no-wrap msgid "" "ilot was started in 2021 when AESA-CIRI, the sociology, anthropology and " "immigration studies sudent association of UQAM, wanted to create its own " "digital infrastructure. Since then, we have worked toward the goal of making " -"the project useful to other organisations and individuals." +"the project useful to other organisations and individuals. Since march of " +"2025, we are a fiscally sponsored by GRIP-UQAM.\n" msgstr "" #. type: Title ## diff --git a/join.fr.mo b/join.fr.mo index 84b5f10..9585baa 100644 Binary files a/join.fr.mo and b/join.fr.mo differ diff --git a/join.fr.po b/join.fr.po index 5d0c73c..5c646c5 100644 --- a/join.fr.po +++ b/join.fr.po @@ -7,19 +7,20 @@ msgid "" msgstr "" "Project-Id-Version: ilot.io\n" -"POT-Creation-Date: 2024-10-08 11:35-0400\n" -"PO-Revision-Date: 2024-10-08 11:29-0400\n" +"POT-Creation-Date: 2025-04-03 18:26-0400\n" +"PO-Revision-Date: 2025-04-03 18:47-0400\n" "Last-Translator: \n" "Language-Team: dev@ayakael.net\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 3.4.3\n" +"X-Generator: Poedit 3.5\n" #. type: Content of: outside any tag (error?) -msgid "[[!meta title=\"Join\"]]" -msgstr "[[!meta title=\"Se joindre\"]]" +msgid "[[!meta title=\"Join\"]] [[!inline pages=\"join/join-en\" raw=\"yes\"]]" +msgstr "" +"[[!meta title=\"Se joindre\"]] [[!inline pages=\"join/join-fr\" raw=\"yes\"]]" #. type: Content of:

      msgid "Registration Form" @@ -220,6 +221,9 @@ msgstr "" "maxlength=\"50\">

      " +#~ msgid "[[!meta title=\"Join\"]]" +#~ msgstr "[[!meta title=\"Se joindre\"]]" + #~ msgid "" #~ "async function checkDuplicate() { var url='https://lab.ilot.io/api/v4/" #~ "projects/99/issues'; var email = document.getElementById(\"email\")." diff --git a/join.html b/join.html index 416afe4..9f36dc4 100644 --- a/join.html +++ b/join.html @@ -1,6 +1,6 @@ [[!meta title="Join"]] - +[[!inline pages="join/join-en" raw="yes"]]

      Registration Form

      diff --git a/join.pot b/join.pot index 157eb78..be0b1f9 100644 --- a/join.pot +++ b/join.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-10-08 11:35-0400\n" +"POT-Creation-Date: 2025-04-03 18:27-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #. type: Content of: outside any tag (error?) -msgid "[[!meta title=\"Join\"]]" +msgid "[[!meta title=\"Join\"]] [[!inline pages=\"join/join-en\" raw=\"yes\"]]" msgstr "" #. type: Content of:

      diff --git a/js/join.js b/join/join-en.html similarity index 71% rename from js/join.js rename to join/join-en.html index db9e888..f5abb63 100644 --- a/js/join.js +++ b/join/join-en.html @@ -1,10 +1,11 @@ + diff --git a/join/join-fr.html b/join/join-fr.html new file mode 100644 index 0000000..32424fa --- /dev/null +++ b/join/join-fr.html @@ -0,0 +1,77 @@ + diff --git a/platforms.fr.mo b/platforms.fr.mo index 8a7febb..51ac5d1 100644 Binary files a/platforms.fr.mo and b/platforms.fr.mo differ diff --git a/platforms.fr.po b/platforms.fr.po index 20f9d75..1eb0cc9 100644 --- a/platforms.fr.po +++ b/platforms.fr.po @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: ilot.io\n" "POT-Creation-Date: 2024-09-08 12:48-0400\n" -"PO-Revision-Date: 2024-09-08 12:49-0400\n" +"PO-Revision-Date: 2025-04-03 18:49-0400\n" "Last-Translator: \n" "Language-Team: dev@ayakael.net\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 3.4.3\n" +"X-Generator: Poedit 3.5\n" #. type: Plain text #, no-wrap @@ -56,7 +56,7 @@ msgid "" "management of the other platforms, and they are here to give you an overview " "of our infrastructure." msgstr "" -"Les plates-formes suivantes ont plutôt un rôle de soutien. Elles permettent " +"Les plateformes suivantes ont plutôt un rôle de soutien. Elles permettent " "une meilleure gestion des autres plateformes et sont là pour vous donner une " "vue d'ensemble de notre infrastructure."