Merge remote-tracking branch 'upstream/master'

fake-commit

@@ -1,3 +1,3 @@
 A file to do fake commits to trigger the build after a PR has been merged.
 
-fake8
+fake9

site/build/build.sh

@@ -25,9 +25,9 @@ else
   ## After building the website, we set the AWS credentials and uplodad
   ## everything to our AWS s3 bucket.
   ##
-  if [ -f /srv/cred/aws.sh ]; then
-    . /srv/cred/aws.sh
-    /usr/local/bin/aws configure set default.s3.max_concurrent_requests 2
-    /usr/local/bin/aws s3 cp /usr/share/blog/public/ s3://aws-website-pmpc-soegm/ --recursive
-  fi
+  #if [ -f /srv/cred/aws.sh ]; then
+  #  . /srv/cred/aws.sh
+  #  /usr/local/bin/aws configure set default.s3.max_concurrent_requests 2
+  #  /usr/local/bin/aws s3 cp /usr/share/blog/public/ s3://aws-website-pmpc-soegm/ --recursive
+  #fi
 fi

site/data/organisations/organisations.json

@@ -18,6 +18,11 @@
     "name": "Digitale Gesellschaft",
     "img": "digitalegesellschaft.png",
     "url": "https://digitalegesellschaft.de/"
+  },
+  {
+    "name": "Do-FOSS",
+    "img": "do-foss.png",
+    "url": "http://blog.do-foss.de/"
   },
    {
     "name": "Center for the Cultivation of Technology",
@@ -84,6 +89,11 @@
     "img": "epanstwo.png",
     "url": "https://epf.org.pl"
   },
+  {
+    "name": "Epicenter.works",
+    "img": "epicenterworks.png",
+    "url": "https://epicenter.works"
+  },
   {
     "name":"FIfF",
     "img": "FIfF.png",
@@ -94,6 +104,11 @@
     "img": "ffkp.png",
     "url": "http://ffkp.se/"
   },
+ {
+    "name": "Framasoft",
+    "img": "framasoft.png",
+    "url": "https://framasoft.org/"
+  },
   {
     "name": "Free Knowledge Institute",
     "img": "freeknowledgeinstitute.png",
@@ -104,6 +119,11 @@
     "img": "fsfe.png",
     "url": "https://fsfe.org"
   },
+  {
+    "name": "Gentoo",
+    "img": "gentoo.png",
+    "url": "https://gentoo.org/"
+  },
   {
     "name": "GFOSS",
     "img": "GFOSS.png",
@@ -129,6 +149,11 @@
     "img": "linuxwoche.png",
     "url": "https://www.linuxwochen.at/"
   },
+  {
+    "name": "Mageia",
+    "img": "mageia.png",
+    "url": "https://www.mageia.org/en/"
+  },
   {
     "name": "Modern Poland Foundation",
     "img": "nowoczesnapolska.png",
@@ -198,6 +223,11 @@
     "name": "Software Liberty Association Taiwan",
     "img": "slat.png",
     "url": "https://slat.org/"
+  },
+   {
+    "name": "Softcatalà",
+    "img": "softcatala.png",
+    "url": "https://www.softcatala.org/"
   },
    {
     "name": "Spoločnosť pre otvorené informačné technológie",
@@ -219,6 +249,11 @@
     "img": "wikimedia-de.png",
     "url": "https://wikimedia.de"
   },
+  {
+    "name": "World Privacy and Identity Association",
+    "img": "wpia.png",
+    "url": "https://wpia.club/"
+  },
   {
     "name": "Xnet",
     "img": "xnet.png",

site/layouts/partials/functions/video_fsfe.html

@@ -1,9 +1,13 @@
+{{ $.Scratch.Set "langext" "" }}
+{{ if and (or (eq .Lang "de") ) }}
+  {{ $.Scratch.Add "langext" (printf "_%s" .Lang) }}
+{{ end }}
 <center>
   <video controls="controls" poster="/img/poster.jpg" crossorigin="crossorigin" width="100%">
-    <source src="https://download.fsfe.org/videos/pmpc/pmpc_desktop.mp4" type='video/mp4; codecs="avc1.42E01E, mp4a.40.2"' media="screen and (min-device-width:1000px)" />
-    <source src="https://download.fsfe.org/videos/pmpc/pmpc_desktop.webm" type='video/webm; codecs="vp9, opus"' media="screen and (min-device-width:1000px)" />
-    <source src="https://download.fsfe.org/videos/pmpc/pmpc_mobile.mp4" type='video/mp4; codecs="avc1.42E01E, mp4a.40.2"' media="screen and (max-device-width:999px)" />
-    <source src="https://download.fsfe.org/videos/pmpc/pmpc_mobile.webm" type='video/webm; codecs="vp9, opus"' media="screen and (max-device-width:999px)" />
+    <source src="https://download.fsfe.org/videos/pmpc/pmpc{{$.Scratch.Get "langext"}}_desktop.mp4" type='video/mp4; codecs="avc1.42E01E, mp4a.40.2"' media="screen and (min-device-width:1000px)" />
+    <source src="https://download.fsfe.org/videos/pmpc/pmpc{{$.Scratch.Get "langext"}}_desktop.webm" type='video/webm; codecs="vp9, opus"' media="screen and (min-device-width:1000px)" />
+    <source src="https://download.fsfe.org/videos/pmpc/pmpc{{$.Scratch.Get "langext"}}_mobile.mp4" type='video/mp4; codecs="avc1.42E01E, mp4a.40.2"' media="screen and (max-device-width:999px)" />
+    <source src="https://download.fsfe.org/videos/pmpc/pmpc{{$.Scratch.Get "langext"}}_mobile.webm" type='video/webm; codecs="vp9, opus"' media="screen and (max-device-width:999px)" />
     
     <track src="https://publiccode.eu/video-subs/webvtt/pmpc_en.vtt" kind="subtitle" srclang="en" label="English" default="default">
     <track src="https://publiccode.eu/video-subs/webvtt/pmpc_de.vtt" kind="subtitle" srclang="de" label="Deutsch">