diff options
| -rw-r--r-- | build/Makefile | 3 | ||||
| -rwxr-xr-x | build/buildone.sh | 2 | ||||
| -rw-r--r-- | build/templates/install.xml.template | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/build/Makefile b/build/Makefile index 998fe8e5e..c9933924e 100644 --- a/build/Makefile +++ b/build/Makefile @@ -7,6 +7,7 @@ all: $(TARGETS) $(TARGETS): %: target=$@ ; \ lang=$${target%.*} ; \ + lang_id="$$(echo $$lang | tr A-Z a-z | sed "s/_/-/")" ; \ arch=$${target#*.} ; \ echo "Architecture: $$arch" ; \ if [ -n "$$noarchdir" ]; then \ @@ -28,7 +29,7 @@ $(TARGETS): %: else \ # Do not fail because of missing PDF support for some languages \ if [ -n "$$web" ] ; then \ - mv ./$$destdir/install.$$lang.$$format "$$destination/$$destsuffix/install.$$format.$$lang" 2>/dev/null || true ; \ + mv ./$$destdir/install.$$lang.$$format "$$destination/$$destsuffix/install.$$format.$$lang_id" 2>/dev/null || true ; \ else \ mv ./$$destdir/install.$$lang.$$format "$$destination/$$destsuffix" 2>/dev/null || true ; \ fi ; \ diff --git a/build/buildone.sh b/build/buildone.sh index f0437c08b..fdfe6dcae 100755 --- a/build/buildone.sh +++ b/build/buildone.sh @@ -11,6 +11,7 @@ fi arch=${1:-i386} language=${2:-en} formats=${3:-html} +lang_id="$(echo $language | tr A-Z a-z | sed "s/_/-/")" ## Configuration basedir="$(cd "$(dirname $0)"; pwd)" @@ -100,6 +101,7 @@ create_profiled () { sed "s:##SRCPATH##:$source_path:" templates/docstruct.ent >> $dynamic sed "s:##LANG##:$language:g" templates/install.xml.template | \ + sed "s:##LANG_ID##:$lang_id:g" | \ sed "s:##TEMPDIR##:$tempdir:g" | \ sed "s:##ENTPATH##:$entities_path:g" | \ sed "s:##SRCPATH##:$source_path:" > $tempdir/install.${language}.xml diff --git a/build/templates/install.xml.template b/build/templates/install.xml.template index d45be151f..f572171b6 100644 --- a/build/templates/install.xml.template +++ b/build/templates/install.xml.template @@ -21,7 +21,7 @@ <!-- retain these comments for translator revision tracking --> <!-- $Id: install.en.xml 21636 2004-09-14 22:43:53Z fjpop-guest $ --> -<book lang="##LANG##"> +<book lang="##LANG_ID##"> &bookinfo.xml; &preface.xml; diff --git a/debian/changelog b/debian/changelog index bbef9928f..2fbbf3d1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ installation-guide (2013XXXX) UNRELEASED; urgency=low * Disable outdated Catalan and Finnish translations. * Update installation sizes. * Document that the mirror host name actually has to be a URL base for now. + * Suffix web documents with http lang ids rather than locale lang ids, for + working content-language negociation. [ Milan Kupcevic ] * Debian-installer partition table editing tool not compatible with |