fix multiple language in English page

This commit is contained in:
prx 2022-06-07 14:26:33 +02:00
parent cd904b351f
commit 7c0482685c
2 changed files with 23 additions and 17 deletions

View File

@ -1,14 +1,14 @@
TEMPDIR=/tmp/openbsd-webzine
generate-site: clean
ls | grep issue- | sort -n | xargs -n 1 tools/make_issue.sh
-ls | grep issue- | sort -n | xargs -n 1 env LN=cs tools/make_issue.sh
-ls | grep issue- | sort -n | xargs -n 1 env LN=de tools/make_issue.sh
-ls | grep issue- | sort -n | xargs -n 1 env LN=es tools/make_issue.sh
-ls | grep issue- | sort -n | xargs -n 1 env LN=fr tools/make_issue.sh
-ls | grep issue- | sort -n | xargs -n 1 env LN=it tools/make_issue.sh
-ls | grep issue- | sort -n | xargs -n 1 env LN=se tools/make_issue.sh
-ls | grep issue- | sort -n | xargs -n 1 env LN=ru tools/make_issue.sh
ls | grep issue- | sort -V | xargs -n 1 tools/make_issue.sh
-ls | grep issue- | sort -V | xargs -n 1 env LN=cs tools/make_issue.sh
-ls | grep issue- | sort -V | xargs -n 1 env LN=de tools/make_issue.sh
-ls | grep issue- | sort -V | xargs -n 1 env LN=es tools/make_issue.sh
-ls | grep issue- | sort -V | xargs -n 1 env LN=fr tools/make_issue.sh
-ls | grep issue- | sort -V | xargs -n 1 env LN=it tools/make_issue.sh
-ls | grep issue- | sort -V | xargs -n 1 env LN=se tools/make_issue.sh
-ls | grep issue- | sort -V | xargs -n 1 env LN=ru tools/make_issue.sh
tools/make_issue.sh _index ../public/index.html
cp -fr _static/* ../public/
tools/sitemap.sh webzine.puffy.cafe ../public/ > ../public/sitemap.xml
@ -33,14 +33,14 @@ test:
# only difference with generate-site is make_issue.sh -t
testsite: clean
ls | grep issue- | sort -n | xargs -n 1 tools/make_issue.sh -t
-ls | grep issue- | sort -n | xargs -n 1 env LN=cs tools/make_issue.sh -t
-ls | grep issue- | sort -n | xargs -n 1 env LN=de tools/make_issue.sh -t
-ls | grep issue- | sort -n | xargs -n 1 env LN=es tools/make_issue.sh -t
-ls | grep issue- | sort -n | xargs -n 1 env LN=fr tools/make_issue.sh -t
-ls | grep issue- | sort -n | xargs -n 1 env LN=it tools/make_issue.sh -t
-ls | grep issue- | sort -n | xargs -n 1 env LN=se tools/make_issue.sh -t
-ls | grep issue- | sort -n | xargs -n 1 env LN=ru tools/make_issue.sh -t
ls | grep issue- | sort -V | xargs -n 1 tools/make_issue.sh -t
-ls | grep issue- | sort -V | xargs -n 1 env LN=cs tools/make_issue.sh -t
-ls | grep issue- | sort -V | xargs -n 1 env LN=de tools/make_issue.sh -t
-ls | grep issue- | sort -V | xargs -n 1 env LN=es tools/make_issue.sh -t
-ls | grep issue- | sort -V | xargs -n 1 env LN=fr tools/make_issue.sh -t
-ls | grep issue- | sort -V | xargs -n 1 env LN=it tools/make_issue.sh -t
-ls | grep issue- | sort -V | xargs -n 1 env LN=se tools/make_issue.sh -t
-ls | grep issue- | sort -V | xargs -n 1 env LN=ru tools/make_issue.sh -t
tools/make_issue.sh _index ../public/index.html
cp -fr _static/* ../public/
tools/sitemap.sh webzine.puffy.cafe ../public/ > ../public/sitemap.xml

View File

@ -45,7 +45,13 @@ then
DESTFILENAME="../${DEST}/${LNSFX}${DIR}.html"
fi
cat _common/header $DIR/${LNSFX}*html _common/footer > $DESTFILENAME
if [ -n "${LNSFX}" ]; then
cat _common/header $DIR/${LNSFX}*html _common/footer > $DESTFILENAME
else
cat _common/header \
$(ls $DIR/*html | grep "/.*[0-9]_") \
_common/footer > $DESTFILENAME
fi
if echo $DIR | grep issue
then