From 365485541ea83c2c256582212d3125768637bc82 Mon Sep 17 00:00:00 2001 From: Remi Rampin Date: Mon, 3 Jul 2017 13:06:30 -0400 Subject: Use additional code from format-de* for all langs --- manual/Makefile | 35 ++++++++++++++++++++++------------- manual/format-de-html | 39 --------------------------------------- manual/format-de-pdf | 38 -------------------------------------- manual/format-html | 7 +++++-- manual/format-pdf | 8 ++++++-- 5 files changed, 33 insertions(+), 94 deletions(-) delete mode 100755 manual/format-de-html delete mode 100755 manual/format-de-pdf diff --git a/manual/Makefile b/manual/Makefile index ac291953..b8c22cf5 100644 --- a/manual/Makefile +++ b/manual/Makefile @@ -18,8 +18,9 @@ TITLE_EN = Backups with Obnam TITLE_DE = Backups mit Obnam -TITLE_FR = Sauvegardes avec Obnam TRANS_DE = Übersetzung: Jan Niggemann (jn@hz6.de) +TITLE_FR = Sauvegardes avec Obnam +TRANS_FR = Traduction : Pierrick Martinez, Remi Rampin AUTHOR = Lars Wirzenius (liw@liw.fi) VERSION = Version $(shell git describe || python ../setup.py --version) @@ -27,13 +28,13 @@ en_sources = $(shell ls en/*.mdwn) fr_sources = $(shell ls fr/*.mdwn) de_sources = $(shell ls de/*.mdwn) pdfs = \ - obnam-manual.en.pdf \ + obnam-manual.en.pdf \ obnam-manual.fr.pdf \ - obnam-manual.de.pdf + obnam-manual.de.pdf htmls = \ - obnam-manual.en.html \ + obnam-manual.en.html \ obnam-manual.fr.html \ - obnam-manual.de.html + obnam-manual.de.html all: html pdf @@ -42,25 +43,33 @@ html: $(htmls) pdf: $(pdfs) obnam-manual.en.pdf: Makefile $(en_sources) - ./format-pdf $@ "$(TITLE_EN)" "$(AUTHOR)" "$(VERSION)" $(en_sources) + ./format-pdf $@ \ + "$(TITLE_DE)" "$(AUTHOR)" "$(VERSION)" "english" "" \ + $(en_sources) obnam-manual.en.html: Makefile $(en_sources) ../obnam.css - ./format-html $@ "$(TITLE_EN)" "$(AUTHOR)" "$(VERSION)" $(en_sources) + ./format-html $@ \ + "$(TITLE_DE)" "$(AUTHOR)" "$(VERSION)" "english" "" \ + $(en_sources) obnam-manual.fr.pdf: Makefile $(fr_sources) - ./format-pdf $@ "$(TITLE_FR)" "$(AUTHOR)" "$(VERSION)" $(fr_sources) + ./format-pdf $@ \ + "$(TITLE_DE)" "$(AUTHOR)" "$(VERSION)" "french" "$(TRANS_FR)" \ + $(fr_sources) obnam-manual.fr.html: Makefile $(fr_sources) ../obnam.css - ./format-html $@ "$(TITLE_FR)" "$(AUTHOR)" "$(VERSION)" $(fr_sources) + ./format-html $@ \ + "$(TITLE_FR)" "$(AUTHOR)" "$(VERSION)" "french" "$(TRANS_FR)" \ + $(fr_sources) obnam-manual.de.pdf: Makefile $(de_sources) - ./format-de-pdf $@ \ - "$(TITLE_DE)" "$(AUTHOR)" "$(VERSION)" "$(TRANS_DE)" \ + ./format-pdf $@ \ + "$(TITLE_DE)" "$(AUTHOR)" "$(VERSION)" "german" "$(TRANS_DE)" \ $(de_sources) obnam-manual.de.html: Makefile $(de_sources) ../obnam.css - ./format-de-html $@ \ - "$(TITLE_DE)" "$(AUTHOR)" "$(VERSION)" "$(TRANS_DE)" \ + ./format-html $@ \ + "$(TITLE_DE)" "$(AUTHOR)" "$(VERSION)" "german" "$(TRANS_DE)" \ $(de_sources) clean: diff --git a/manual/format-de-html b/manual/format-de-html deleted file mode 100755 index 5411942c..00000000 --- a/manual/format-de-html +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# Copyright 2014 Lars Wirzenius -# Copyright 2014 Jan Niggemann -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# =*= License: GPL-3+ =*= - -set -eu - -OUTPUT="$1" -TITLE="$2" -AUTHOR="$3" -VERSION="$4" -TRANS_DE="$5" -shift 5 - -cat > 000.mdwn <. -# -# =*= License: GPL-3+ =*= - -set -eu - -OUTPUT="$1" -TITLE="$2" -AUTHOR="$3" -VERSION="$4" -TRANS_DE="$5" -shift 5 - -cat > 000.mdwn < 000.mdwn < 000.mdwn <