From 1fb1da04134db643277cd88158f24365325da12c Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 13 Mar 2025 17:51:31 -0400 Subject: [PATCH 1/6] footer: update newsletter uuid --- footer.fr.mo | Bin 2837 -> 2837 bytes footer.fr.po | 8 ++++---- footer.html | 2 +- footer.pot | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/footer.fr.mo b/footer.fr.mo index 00f869ad64b02ced6c394d0174db4fccd24b1670..30a9b74402ebd20009bf3d4919c8bc2d503e01a2 100644 GIT binary patch delta 15 WcmbO#HdSnc3LBHD;bt|q_bdP;c?4?! delta 15 WcmbO#HdSnc3LBHL*=9Ai_bdP;i3Dx{ diff --git a/footer.fr.po b/footer.fr.po index 2880001..feea225 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-03-13 17:50-0400\n" +"PO-Revision-Date: 2025-03-13 17:51-0400\n" "Last-Translator: \n" "Language-Team: dev@ayakael.net\n" "Language: fr\n" @@ -87,8 +87,8 @@ msgstr "" #. type: Content of:

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

diff --git a/footer.html b/footer.html index 87f8021..e9b9b79 100644 --- a/footer.html +++ b/footer.html @@ -48,7 +48,7 @@ - +
diff --git a/footer.pot b/footer.pot index 592d7b8..326cd0a 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-03-13 17:50-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:

From 2f88882e0dd2021c90aeeb443d50156db3b1fb4a Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sun, 23 Mar 2025 16:09:33 -0400 Subject: [PATCH 2/6] footer: update newsletter --- footer.fr.po | 4 ++-- footer.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/footer.fr.po b/footer.fr.po index feea225..af75473 100644 --- a/footer.fr.po +++ b/footer.fr.po @@ -87,8 +87,8 @@ msgstr "" #. type: Content of:

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

diff --git a/footer.html b/footer.html index e9b9b79..fe7c91b 100644 --- a/footer.html +++ b/footer.html @@ -48,7 +48,7 @@ - +
From aec1460de90c9e162abe2b809a0651924404f68e Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 31 Mar 2025 20:28:00 -0400 Subject: [PATCH 3/6] ci: move to pages server --- .forgejo/workflows/cleanup.yaml | 5 ++--- .forgejo/workflows/deploy.yaml | 27 --------------------------- .forgejo/workflows/pages.yaml | 19 +++++++++---------- .forgejo/workflows/preview.yaml | 14 ++++++-------- .pages-domains | 1 + .pages-redirect | 0 6 files changed, 18 insertions(+), 48 deletions(-) delete mode 100644 .forgejo/workflows/deploy.yaml create mode 100644 .pages-domains create mode 100644 .pages-redirect 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 From 78a1b6627f99c756fa7ae74fed0a2de553f07fe9 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 3 Apr 2025 15:57:14 -0400 Subject: [PATCH 4/6] join: migrate registration form to Forgejo backend --- ikiwiki.setup | 1 + join.fr.mo | Bin 12916 -> 8321 bytes join.fr.po | 14 +++--- join.html | 2 +- join.pot | 4 +- js/join.js => join/join-en.html | 26 +++++------ join/join-fr.html | 77 ++++++++++++++++++++++++++++++++ 7 files changed, 103 insertions(+), 21 deletions(-) rename js/join.js => join/join-en.html (71%) create mode 100644 join/join-fr.html 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/join.fr.mo b/join.fr.mo index 84b5f10e829e310b96c47ef7e648488c8497f1c3..efd408c22b28598bd1326da10a1f149ad6552cd1 100644 GIT binary patch delta 505 zcmaKoKS%;$7{;F~D>cmglW8Sgx0Ym@QGtUk4bDNJ4pvurg^40%Q6lt@tffO}HJght zT5^rnn!{*rXb6X<=sBEPdb#KO-SfWR_uhM7W2q3zzgcx9FznO-RioTgRN%sRCd1SV zrO>-ufe-SSOpqBJa7xz6Zc=FjI>{YU^GBqEXD`Tk`kQtjORw($ets*2DjKs^w`oV^*^)!3_bp=cTwBaxv*ay^lh#Z-Jn&IBc8Bas}{7LS~i#B_W! xDCOjg6pN_~PM;~@@s4}EesOGa+CQO|op&t(qxvo^R%@bQmeYT_;TPNDS-SuL delta 4963 zcmeHLUuYaf7@ughwh~i|)mr~BIW)JSxxJ<>)udi)OoN8nHl)#%Qk1#fxw}dBcGlV1 zOH&Dp6n&{x@DP3U4@m2q)OW%7CW7FT6hvPI--;kY@i)77m%H>5Ew*`T$mW}w{l1y+ z-+bS1^VZlkH~wY&rVj~zcHns&&v$s9z~lAc4}N|HJ&NZyJad@m?k41S(2qd{==n{A zybJmV=r+)E_YiVF=mk(S{|NM9$X)_Hh50x45)xs)b2A~=35m&j_Yo4{#loKG;jhJ9z*71K1FBx{r{*AS*!s#N63Q$XW26eiU+;|FnycYoL>l zrHUScbr&(e1Zs>u04sOkeDX2|=HMb|1{-M5Gnjw$Bq3j6ehqXl=ogfb53v4oKePw+ zGK6foi;%ZLuj2jtPZ6>e^Z5ZnKF9l-m3nm7AR*7esAoXImYfAbw&UroS9>=1?5IaQ zM|&SKi}*3#BUgUtxzHOE7B2b@Ek(Ygh4iUY;m-V#DDZ^CG`9xno3zFhjg(i&R3(8(W!#BQt2%m>2Pb)RBIusp4UP0f!`8U_#Rp*G|QP8bi>i!kNoeIErC*YI^e3 zv6+e7%!#8D$Frj}TlNB`bJI+oJ~{jPzEj64^DnC5k@*9&wd@ehj!R$T?A**^z`-47 zS&-Tau`nnb0tM8~DeQ|h~sqcaFzBTlV|m=n^#CR-;vPbBH@FyEJ&7C8bR=*2eS zxLvx#yZr^48OfwtCR@!a>6fYDq0A2#xN6&`eV6pUth&byy-ed980*)aCDM2MH%V!cV~trxB7%+H4$u#I*y5lvSUV!c0X&Ch?PI14xjP!~B6}eD?XWaFy2Tv|xYI8x{DcjtpL&u@)OLBou()0jRcvsxg6u`O7VN-T( zWl@Slt`b$_u2tE}NGE4_+BAitExB~iJg5<`69MB3%Sz>cq(zu-;^Air48)>$E0Y zSGaFAdy#1{&2ghIp?$S@lJ<27HL1hIlab@_kcY-T2!jcxF|Sb%lRHnts8|(RbJwP0 zbU~_lfeKVsG74~Cszv0`g77?w=8vsHx+o)sz1nJNSdmJ5i}k-Z&mIq>Ai(VT268Yr z$8=d6;X-HUN=c+-yPC<8m7OqejF!n95=%z1e!g#S@BZBIp4^^i>G1IA-jVvZeP3_d zZ|~b$|FOrpa&_CezB}ON4!G$CP49r4TLW&!ao?5T9`!j5IGShx+_3zmR-D#^%QG=9 zY8Q~SKFm4Bq8bx`ylVM!`Uzn8moMY5KvlXK&=aqPdaTSiM>T9{e6d2aa=S~4FR z5sYym2>1>PE+Dq9r~W(O0l2ym@oXUAiC4jwMx)*^z!Rf+-+*{F5b(q;c-BHLYeLi8 z0eIpS6alc61ik~s+-|@Vx8ar+;@LpJ6W`>=_^k#!aW}-%74RHsT=-B%Rn#7vzTzhc z2bIi?QpA%~1AHT*IC=PnLaE@2(V8^XPWUU(*2Tve{wWaB!0U@bT2#CgngZi7Q6GFH Nm|6vc?Ei^_$Uh(YL;3&! diff --git a/join.fr.po b/join.fr.po index 5d0c73c..e779ed8 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:36-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 @@ + From 76360bcc2f6e3f0f82106f0ee4e058a9465e5828 Mon Sep 17 00:00:00 2001 From: ayakael Date: Thu, 3 Apr 2025 18:49:30 -0400 Subject: [PATCH 5/6] *: fix grammar errors --- footer.fr.mo | Bin 2837 -> 2835 bytes footer.fr.po | 10 +++++----- index.fr.mo | Bin 3486 -> 3499 bytes index.fr.po | 12 ++++++------ join.fr.mo | Bin 8321 -> 8321 bytes join.fr.po | 2 +- platforms.fr.mo | Bin 6263 -> 6259 bytes platforms.fr.po | 6 +++--- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/footer.fr.mo b/footer.fr.mo index 30a9b74402ebd20009bf3d4919c8bc2d503e01a2..b2c045df9bccf1b9c68c8a157b705f8f52820cc9 100644 GIT binary patch delta 134 zcmbO#Hd$x#z6WDkhTTV8e9wv zl0Z5QNSg!c1|V$%q;~*mSs?v&b0*_v7A_NA17ih43o8@j&1!5~%$ox_3mLf-N>YdtxOF!tFdV@GnQ-);4EZhESY?e GD+mAyP7{y- diff --git a/footer.fr.po b/footer.fr.po index af75473..3151399 100644 --- a/footer.fr.po +++ b/footer.fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ilot.io\n" "POT-Creation-Date: 2025-03-13 17:50-0400\n" -"PO-Revision-Date: 2025-03-13 17:51-0400\n" +"PO-Revision-Date: 2025-04-03 18:43-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" @@ -81,8 +81,8 @@ msgstr "S'abonner à notre [[liste de diffusion|https://notif.ilot.io/archive]]" msgid "" "document.addEventListener('keydown', function (event) { if (event.keyCode " "=== 13 && event.target.nodeName === 'INPUT') { var form = event.target.form; " -"var index = Array.prototype.indexOf.call(form, event.target); " -"form.elements[index + 1].focus(); event.preventDefault(); } });" +"var index = Array.prototype.indexOf.call(form, event.target); form." +"elements[index + 1].focus(); event.preventDefault(); } });" msgstr "" #. type: Content of:

      diff --git a/index.fr.mo b/index.fr.mo index 7c066f5c15e1a3d2c3c99d1b175167839ee9bdfd..57e09688e1a92a3de18e6a8496522b93670056df 100644 GIT binary patch delta 159 zcmbOyy;^!gimNgs1A{Ib14B6j14AG?0|OtBJ_)2#fZ{iRv@wux%gMkX1*8jsbRdxK z0n!VZ7#QvWX)U0-hK(z?vhteh8kp!B7%LcBSeckk&SrbeXu3I&eGa2WS$=7;LRNle xUP@7_!r=u9dHE$kMnO@2R%(fkLUMj?LC)coC8QppW=?*IjzU>xab`(s)nsALw~WP;xS|+~H%D;=G6MjCMj(*@ diff --git a/index.fr.po b/index.fr.po index 3dd3aa1..b642ca4 100644 --- a/index.fr.po +++ b/index.fr.po @@ -6,14 +6,14 @@ 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" +"PO-Revision-Date: 2025-04-03 18: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 @@ -46,8 +46,8 @@ msgid "" "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 " +"[[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 " @@ -66,8 +66,8 @@ 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]]." +"encore en cours d'élaboration. Si vous souhaitez vous joindre à notre " +"projet, compléter notre [[formulaire d'inscription|join]]." #. type: Plain text msgid "" diff --git a/join.fr.mo b/join.fr.mo index efd408c22b28598bd1326da10a1f149ad6552cd1..9585baaf0a74305328990dd4567f6a2e4fb56b6f 100644 GIT binary patch delta 15 WcmZp4Y;@dkfS<|4eDfjx{Q>|lWCg?k delta 15 WcmZp4Y;@dkfS<|OZ1W-h{Q>|lR|UcV diff --git a/join.fr.po b/join.fr.po index e779ed8..5c646c5 100644 --- a/join.fr.po +++ b/join.fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ilot.io\n" "POT-Creation-Date: 2025-04-03 18:26-0400\n" -"PO-Revision-Date: 2025-04-03 18:36-0400\n" +"PO-Revision-Date: 2025-04-03 18:47-0400\n" "Last-Translator: \n" "Language-Team: dev@ayakael.net\n" "Language: fr\n" diff --git a/platforms.fr.mo b/platforms.fr.mo index 8a7febb09a6c6c299f9322bed7ac9015e7ee11ad..51ac5d163507929965c63c94eff25abc5f2c0e37 100644 GIT binary patch delta 131 zcmexv@Y!HOP3#v228Jcv3=9%LdL|D8!yiTlhD|{FAdtVFkAXoJNEh-mFkArahd8GnCKc9D;Qc# VzR$g#(RA}n9z~|jd-!&90ss%(9E1P> delta 136 zcmext@ZDfSP3$)Y28Jcv3=9%LdNvOO!yiTlhAlw)Fp$5IkAXoJNSE?6FkA4RWnfSTiHk8XqyYIs8*l#M;xf@Su+%lMP%t!_ ae4l$evx%PZ=IK0&OiabPn|JW-<^%wyz8$Xs 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." From a398d3a6d96806e390de5372478f347d10cc1d76 Mon Sep 17 00:00:00 2001 From: ayakael Date: Thu, 12 Jun 2025 16:46:20 -0400 Subject: [PATCH 6/6] {footer,index}: add mention of GRIP-UQAM --- footer.fr.mo | Bin 2835 -> 3016 bytes footer.fr.po | 16 ++++++++++++---- footer.html | 3 +++ footer.pot | 12 +++++++++--- index.fr.mo | Bin 3499 -> 3724 bytes index.fr.po | 52 +++++++++++++-------------------------------------- index.mdwn | 2 +- index.pot | 8 +++++--- 8 files changed, 43 insertions(+), 50 deletions(-) diff --git a/footer.fr.mo b/footer.fr.mo index b2c045df9bccf1b9c68c8a157b705f8f52820cc9..e93d1dbe3580cc84cbf630a559d9528af428d4af 100644 GIT binary patch delta 712 zcmbW!&r1|x9LMqRuD1TjEKS|QjE6mh3Oe~Sm07_q=0R3vy%{=N+c>zpv(7$)2!i0B zP;}{-bTGONbnPHwhb|qumG>Y>!8~{n-_L^m0e;!<^Llm|_PfStGJy{$oA+m(+6WNw` zY`S?6VK4r~$5?kmWC+J_3=4Q4Ki~*{!EyYDCa{$dImKBtfuAyE7Z30`dZf(ZA+}&| zgGd|m#b#p?&tnFcke_^Fna0m(5?^2v6TIAm577jDh8Aw33A~5qq`%Mv?z}1T1V_-u zBAUP-F~|cGPN+f0a(HYF(~OSe6@j<#638_WOaGQrZdJ zyiTWScKCvC&z5SNsyU$8b;p delta 523 zcmX}pyGz4R6vy$C>$S1*+4`tL1;;8BThn3{1)ao2aTSFUMG&02I96O;gdlXTYqu=^ z0WFAwAP!ExHW9(4;_CM}J88F9h-P) zME20_5vl4s_F)G{@E$#UMT?)fir?sBp3O-tV@{+lTP)_-IK=`s(Z@%upxY}lg=<*G zU0lLT)JE^Hiyx?sJ|{%3vC3)tXz4D%08`k(F?>Rg^W}?0l8s;7K!+FYbQ3eUgR^*y z+F*$D*hX!%i#lPBv9-}7T*Nb6!5h>@e^4)#&*QQOEC-2RogPXLaq+z{j4+rC5bb`H z=&$N0THI<}!>on~f9St-$}|br-C7iwh7)bu1>=?S1%IYkSuXj}MdHCktz_2x0Rn9@ AumAu6 diff --git a/footer.fr.po b/footer.fr.po index 3151399..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:50-0400\n" -"PO-Revision-Date: 2025-04-03 18:43-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" @@ -81,8 +81,8 @@ msgstr "S'abonner à notre [[liste de diffusion|https://notif.ilot.io/archive]]" msgid "" "document.addEventListener('keydown', function (event) { if (event.keyCode " "=== 13 && event.target.nodeName === 'INPUT') { var form = event.target.form; " -"var index = Array.prototype.indexOf.call(form, event.target); form." -"elements[index + 1].focus(); event.preventDefault(); } });" +"var index = Array.prototype.indexOf.call(form, event.target); " +"form.elements[index + 1].focus(); event.preventDefault(); } });" msgstr "" #. type: Content of:

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

      diff --git a/footer.pot b/footer.pot index 326cd0a..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:50-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/index.fr.mo b/index.fr.mo index 57e09688e1a92a3de18e6a8496522b93670056df..24c5bdcf39d3e0ba2ea102a7dd278ea34b1327f0 100644 GIT binary patch delta 358 zcmZ22-6K08CbWl{zi8(oy3dIHadByofsVNFcl?pbA3K>PIX|_rkB_##L zR{HwsMVSSqg^9U(`98T~QO7TfKiFw&dcJ4u*0lJ}qj=nbfiFSHi3;{*? zS*gh-x}GVzlP%aZ+0AqfjT8*cHfOLovF9teq!yHB7K2<=40TOTDn&Lb#{L0lru0e1hO+Q@B!(QKsp5|egjAw1NpX`3=C30 zx)4YQ0_h$gy^x84;U19I0;+4^VPF7K44e};N;5KSJR8qCc|MydyNRxWv4Ww+=G$ye H?2HTm%6t+? diff --git a/index.fr.po b/index.fr.po index b642ca4..45b3ada 100644 --- a/index.fr.po +++ b/index.fr.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: ilot.io\n" -"POT-Creation-Date: 2024-09-08 12:28-0400\n" -"PO-Revision-Date: 2025-04-03 18:45-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" @@ -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 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." +"[[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 vous joindre à notre " -"projet, compléter 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 ##