Merge branch 'master' of git.fsfe.org:pmpc/website

merge from upstream
lektura
Jonke Suhr 2017-09-20 17:51:38 +02:00
commit d0029c8e32
4 changed files with 38 additions and 22 deletions

View File

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

View File

@ -19,10 +19,25 @@ if [ "$mode" == "server" ]; then
elif [ "$mode" == "syntax" ]; then
hugo
else
hugo
status=1
tries=0
while [[ $status -ne 0 ]]; do
##
## After building the website, we set the AWS credentials and uplodad
hugo
status=$?
(( tries++ ))
if [[ $status != 0 && $tries -le 2 ]]; then
echo "Build error with exit status $status on try $tries. Try again now"
elif [[ $status != 0 && $tries -gt 2 ]]; then
echo "Build failed 3 times in a row. Don't try again."
exit 1
fi
done
## After successfully building the website, we set the AWS credentials and uplodad
## everything to our AWS s3 bucket.
##
#if [ -f /srv/cred/aws.sh ]; then

View File

@ -9,25 +9,25 @@
<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">
<track src="https://publiccode.eu/video-subs/webvtt/pmpc_es.vtt" kind="subtitle" srclang="es" label="Español">
<track src="https://publiccode.eu/video-subs/webvtt/pmpc_fr.vtt" kind="subtitle" srclang="fr" label="Français">
<track src="https://publiccode.eu/video-subs/webvtt/pmpc_it.vtt" kind="subtitle" srclang="it" label="Italian">
<track src="https://publiccode.eu/video-subs/webvtt/pmpc_nl.vtt" kind="subtitle" srclang="nl" label="Nederlands">
<track src="https://publiccode.eu/video-subs/webvtt/pmpc_pt.vtt" kind="subtitle" srclang="pt" label="Português">
<track src="https://publiccode.eu/video-subs/webvtt/pmpc_sk.vtt" kind="subtitle" srclang="sk" label="Slovenský">
<track src="https://publiccode.eu/video-subs/webvtt/pmpc_zh.vtt" kind="subtitle" srclang="zh" label="正體中文(臺灣)">
<track src="https://publiccode.eu/video-subs/webvtt/pmpc_en.vtt" kind="subtitles" srclang="en" label="English" default="default">
<track src="https://publiccode.eu/video-subs/webvtt/pmpc_de.vtt" kind="subtitles" srclang="de" label="Deutsch">
<track src="https://publiccode.eu/video-subs/webvtt/pmpc_es.vtt" kind="subtitles" srclang="es" label="Español">
<track src="https://publiccode.eu/video-subs/webvtt/pmpc_fr.vtt" kind="subtitles" srclang="fr" label="Français">
<track src="https://publiccode.eu/video-subs/webvtt/pmpc_it.vtt" kind="subtitles" srclang="it" label="Italian">
<track src="https://publiccode.eu/video-subs/webvtt/pmpc_nl.vtt" kind="subtitles" srclang="nl" label="Nederlands">
<track src="https://publiccode.eu/video-subs/webvtt/pmpc_pt.vtt" kind="subtitles" srclang="pt" label="Português">
<track src="https://publiccode.eu/video-subs/webvtt/pmpc_sk.vtt" kind="subtitles" srclang="sk" label="Slovenský">
<track src="https://publiccode.eu/video-subs/webvtt/pmpc_zh.vtt" kind="subtitles" srclang="zh" label="正體中文(臺灣)">
<track src="https://publiccode.eu/video-subs/srt/pmpc_en.srt" kind="subtitle" srclang="en" label="English">
<track src="https://publiccode.eu/video-subs/srt/pmpc_de.srt" kind="subtitle" srclang="de" label="Deutsch">
<track src="https://publiccode.eu/video-subs/srt/pmpc_es.srt" kind="subtitle" srclang="es" label="Español">
<track src="https://publiccode.eu/video-subs/srt/pmpc_fr.srt" kind="subtitle" srclang="fr" label="Français">
<track src="https://publiccode.eu/video-subs/srt/pmpc_it.srt" kind="subtitle" srclang="it" label="Italian">
<track src="https://publiccode.eu/video-subs/srt/pmpc_nl.srt" kind="subtitle" srclang="nl" label="Nederlands">
<track src="https://publiccode.eu/video-subs/srt/pmpc_pt.srt" kind="subtitle" srclang="pt" label="Português">
<track src="https://publiccode.eu/video-subs/srt/pmpc_sk.srt" kind="subtitle" srclang="sk" label="Slovenský">
<track src="https://publiccode.eu/video-subs/srt/pmpc_zh.srt" kind="subtitle" srclang="zh" label="正體中文(臺灣)">
<track src="https://publiccode.eu/video-subs/srt/pmpc_en.srt" kind="subtitles" srclang="en" label="English">
<track src="https://publiccode.eu/video-subs/srt/pmpc_de.srt" kind="subtitles" srclang="de" label="Deutsch">
<track src="https://publiccode.eu/video-subs/srt/pmpc_es.srt" kind="subtitles" srclang="es" label="Español">
<track src="https://publiccode.eu/video-subs/srt/pmpc_fr.srt" kind="subtitles" srclang="fr" label="Français">
<track src="https://publiccode.eu/video-subs/srt/pmpc_it.srt" kind="subtitles" srclang="it" label="Italian">
<track src="https://publiccode.eu/video-subs/srt/pmpc_nl.srt" kind="subtitles" srclang="nl" label="Nederlands">
<track src="https://publiccode.eu/video-subs/srt/pmpc_pt.srt" kind="subtitles" srclang="pt" label="Português">
<track src="https://publiccode.eu/video-subs/srt/pmpc_sk.srt" kind="subtitles" srclang="sk" label="Slovenský">
<track src="https://publiccode.eu/video-subs/srt/pmpc_zh.srt" kind="subtitles" srclang="zh" label="正體中文(臺灣)">
</video>
</center>

View File

@ -4,6 +4,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
{{ with .Site.Params.static.meta.author }}<meta name="author" content="{{ . }}">{{ end }}
{{ with .Site.Params.description }}<meta name="description" content="{{ . }}">{{ end }}
<meta name="keywords" content="Public Money, Public Code, #publiccode, campaign, Free Software, Open Source, FOSS, FLOSS, public administration, FOI, open letter, petition, PMPC">
{{ .Hugo.Generator }}
<title>{{ with .Params.Title }}{{ . }} - {{ end }}{{ .Site.Title }}</title>
{{ "<!-- Translations -->" | safeHTML }}