Merge lp:~unit193/xubuntu-docs/linguas into lp:xubuntu-docs/trusty

[Unit 193]

* Updated the debian/ dir to remove cdbs and switch to dh.
* Intruduced the po/LINGUAS file to specify what translations to ship, and updated the Makefiles accordingly.
* Did an overhaul on the scripts/translate.sh script.
* Removed unused additional scripts.

[lp:~unit193/xubuntu-docs/linguas]

134. By Unit 193 <unit193@Sigma> on 2014-02-07

Remove additional scripts.

[Jack Fromm (jjfrv8)]

Unit193, thanks. Of course I have no idea what I'm looking at ;)

review: Abstain

[Pasi Lallinaho (knome)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2012-09-18 00:31:15 +0000
+++ Makefile	2014-02-07 01:59:54 +0000
@@ -1,11 +1,14 @@
 # Makefile for the Xubuntu Documentation
 # Ubuntu Documentation Project <[e-mail]>
 
-all: clean desktop-guide startpage
+all: clean desktop-guide startpage translate
 
 desktop-guide:
 	make -C desktop-guide html
 
+translate:
+	make -C desktop-guide translate
+
 startpage:
 	cp -r startpage/ build/about
 
@@ -14,10 +17,11 @@
 	tar cvfz xubuntu-doc.tar.gz  --exclude="*.tar.gz" --exclude="*~" --exclude "*.bzr*" *
 
 clean:
+	make -C desktop-guide clean
 	rm -rf build
 
 commit-clean:
 	find . -name "*.po" -exec rm \{\} \+
 	find . -name "*.pot" -exec rm \{\} \+
 
-.PHONY: desktop-guide startpage
+.PHONY: desktop-guide startpage translate

=== modified file 'debian/compat'
--- debian/compat	2012-09-19 20:32:28 +0000
+++ debian/compat	2014-02-07 01:59:54 +0000
@@ -1,1 +1,1 @@
-8
+9

=== modified file 'debian/control'
--- debian/control	2012-09-19 20:32:28 +0000
+++ debian/control	2014-02-07 01:59:54 +0000
@@ -2,13 +2,12 @@
 Section: doc
 Priority: optional
 Maintainer: Ubuntu Documentation Team <[e-mail]>
-Build-Depends: cdbs,
-               debhelper (>= 8),
+Build-Depends: debhelper (>= 9),
                docbook-xml,
                docbook-xsl,
                xsltproc,
                gnome-doc-utils
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 
 Package: xubuntu-docs
 Architecture: all

=== modified file 'debian/rules'
--- debian/rules	2012-09-18 00:31:15 +0000
+++ debian/rules	2014-02-07 01:59:54 +0000
@@ -4,5 +4,5 @@
 DEB_MAKE_INSTALL_TARGET := 
 DEB_MAKE_BUILD_TARGET := all 
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
+%:
+	dh $@

=== modified file 'desktop-guide/Makefile'
--- desktop-guide/Makefile	2014-01-07 00:17:08 +0000
+++ desktop-guide/Makefile	2014-02-07 01:59:54 +0000
@@ -5,6 +5,15 @@
 # Xubuntu Docbook Customization Layer
 XUBUNTUXSL=libs/xubuntu-html-chunk-cust.xsl
 
+ifneq ($(wildcard po/LINGUAS),)
+   $(shell ../scripts/translate.sh -u >/dev/null)
+   OPTS=-g
+   TRANSLATIONS=$(shell cat po/LINGUAS)
+else
+   OPTS=
+   TRANSLATIONS=$(shell basename -s .po -a po/*po)
+endif
+
 html: style
 	xsltproc --xinclude -o ../build/desktop-guide/index.html $(XUBUNTUXSL) C/index.xml
 
@@ -15,4 +24,13 @@
 	cp -r libs/admon ../build/libs
 	cp -r libs/navig ../build/libs
 
-.PHONY: html
+translate:
+	../scripts/translate.sh $(OPTS); \
+	for dir in $(TRANSLATIONS); do \
+		xsltproc --xinclude -o ../build/$$dir/index.html $(XUBUNTUXSL) $$dir/index.xml && \
+		rm -rf $$dir/; \
+	done
+
+clean:
+	${RM} -r $(TRANSLATIONS)
+.PHONY: html translate

=== added file 'desktop-guide/po/LINGUAS'
--- desktop-guide/po/LINGUAS	1970-01-01 00:00:00 +0000
+++ desktop-guide/po/LINGUAS	2014-02-07 01:59:54 +0000
@@ -0,0 +1,3 @@
+fi
+pt
+ru

=== removed file 'scripts/rename-rosetta-po-files.sh'
--- scripts/rename-rosetta-po-files.sh	2013-05-17 11:53:41 +0000
+++ scripts/rename-rosetta-po-files.sh	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-# This script renames po files downloaded from Launchpad into a standard format filename. It works around this bug in Launchpad: https://bugs.launchpad.net/bugs/353981
-
-for i in `cat libs/shipped-docs` serverguide ; do cd $i/po ; mv ../*.po . ; for x in ubuntu-docs-$i-*.po ; do echo $x ; mv $x ${x#ubuntu-docs-$i-} ; done ; cd ../../ ; done

=== modified file 'scripts/translate.sh'
--- scripts/translate.sh	2012-09-18 00:31:15 +0000
+++ scripts/translate.sh	2014-02-07 01:59:54 +0000
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-####################################################################################           
+####################################################################################
 # Copyright (C) 2005-2006 Ubuntu Documentation Project ([e-mail])
 #    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 2 of the License, or
-#    (at your option) any later version. 
+#    (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
@@ -15,7 +15,7 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#    On Debian based systems a copy of the GPL can be found 
+#    On Debian based systems a copy of the GPL can be found
 #    at /usr/share/common-licenses/GPL
 ####################################################################################
 
@@ -25,55 +25,64 @@
 # $ translate.sh
 #
 # Optional parameters:
-#	-d<documentname>
+#	-g Translate for every language listed in po/LINGUAS
 #	-l<language>
+#	-u Update the list of translations in po/LINGUAS
 #
 
-translate () {
-	y=$(basename ${1} .po)
-	echo " --Translating ${y}"
-	mkdir -p ${y}
+translate() {
+	lang=$(basename ${1} .po)
+	echo " --Translating ${lang}"
+	mkdir -p ${lang}
 	for i in C/*xml; do
-		j=$(basename ${i} C/)
-		k=$(basename ${j} .xml)
-		xml2po -e -p po/${y}.po C/${j} >${y}/${j}
+		xml=$(basename ${i} C/)
+		xml2po -e -p po/${lang}.po C/${xml} >${lang}/${xml}
 	done
 	if [ -e C/${document}-C.omf ]; then
-	    xml2po -e -p ${1} C/${document}-C.omf >${y}/${document}-${y}.omf
-	    sed -i -e s@\"C\"@\"${y}\"@g -e s@C/@${y}/@g ${y}/${document}-${y}.omf
+	    xml2po -e -p ${1} C/${document}-C.omf >${lang}/${document}-${lang}.omf
+	    sed -i -e s@\"C\"@\"${lang}\"@g -e s@C/@${lang}/@g ${lang}/${document}-${lang}.omf
 	fi
-	../scripts/validate.sh ${y}/${document}.xml
+	../scripts/validate.sh ${lang}/index.xml
 }
 
-choose_language () {
-	echo "Entering ${1}"
-	cd ${1}
-	if [ ${2} ]; then
-		translate "po/${2}.po"
+choose_language() {
+	if [ ${1} ]; then
+		translate "po/${1}.po"
 	else
 		for x in po/*.po; do
 			translate ${x}
 		done
 	fi
-	rm .xml2po.mo
-	cd ..
-}
-
-while getopts "d:l:" Option
+}
+
+shipped_languages() {
+percent=80
+for po in `ls po/*.po`
+do
+   if [ `msgfmt -o /dev/null --statistics $po 2>&1|awk '{printf("%.0f\n",$1 / ($1 + $4 + $7) * 100)}'` -ge "${percent}" ];then
+      basename -s.po $po
+   fi
+done | tee po/LINGUAS
+exit
+}
+
+while getopts ":gl:u" Option
 do
 	case ${Option} in
-		d) document=${OPTARG};;
-		l) lang=${OPTARG};;
+		g) generated=yes;;
+		l) language=${OPTARG};;
+		u) shipped_languages;;
 		*) echo "Please specify an argument.";;
 	esac
 done
 
-if [ ${document} ]; then
-	choose_language ${document} ${lang}
+if [ ${language} ]; then
+	choose_language ${language}
+elif [ ${generated} ] && [ -f po/LINGUAS ];then
+	for language in `cat po/LINGUAS`
+	do
+		choose_language ${language}
+	done
 else
-	for doc in `cat libs/shipped-docs`
-	do
-		choose_language ${doc} ${lang}
-	done
+		choose_language
 fi
-

=== removed file 'scripts/yelptest'
--- scripts/yelptest	2012-09-18 00:31:15 +0000
+++ scripts/yelptest	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-####################################################################################           
-# Yelp test script for Ubuntu Topic-based help
-# Copyright (C) 2006 Ubuntu Documentation Project ([e-mail])
-#    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 2 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, write to the Free Software
-#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#    On Debian based systems a copy of the GPL can be found 
-#    at /usr/share/common-licenses/GPL
-#
-####################################################################################
-
-document=ubuntu/C/$1/$1.xml
-if [ -e $document ]
-then
-  yelp $document
-elif [ -e $1 ]
-then
-  yelp $1
-else
-  echo "Sorry! Document '$document' or file '$1' does not exist."
-fi