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 17c3156..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 0a09a35..533e635 100644 --- a/footer.fr.po +++ b/footer.fr.po @@ -7,19 +7,19 @@ msgid "" msgstr "" "Project-Id-Version: ilot.io\n" -"POT-Creation-Date: 2024-10-09 18:45-0400\n" -"PO-Revision-Date: 2024-10-09 18:46-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" "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:

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" @@ -77,10 +77,18 @@ msgstr "Nouvelles" msgid "Subscribe to our [[newsletter|https://notif.ilot.io/archive]]" msgstr "S'abonner à notre [[liste de diffusion|https://notif.ilot.io/archive]]" +#. type: Content of:

      + + + +
      + +
      + +
      +
      +
      +
      +

      Ilot is a GRIP-UQAM working group

      diff --git a/footer.pot b/footer.pot index 390df37..69e81cf 100644 --- a/footer.pot +++ b/footer.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-10-09 18:45-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" @@ -76,10 +76,18 @@ msgstr "" msgid "Subscribe to our [[newsletter|https://notif.ilot.io/archive]]" msgstr "" +#. type: Content of:

      +[[!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."