# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1409187662 -10800
# Node ID bf52d3ac4b95e9cf554ffb2d1a9f8120e5289d26
# Parent  8d9754bad0a10dd8f1b2a7ef8a4a55490b93295c
tramys-client, tramys-server: add i18n and Russian L10n; human readable archive size.

diff -r 8d9754bad0a1 -r bf52d3ac4b95 tramys-client/receipt
--- a/tramys-client/receipt	Thu Aug 28 01:42:21 2014 +0200
+++ b/tramys-client/receipt	Thu Aug 28 04:01:02 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="tramys-client"
-VERSION="140826"
+VERSION="140828"
 CATEGORY="system-tools"
 SHORT_DESC="Tool for managing translation files for SliTaz GNU/Linux, client part"
 MAINTAINER="al.bobylev@gmail.com"
@@ -16,4 +16,10 @@
 	install -Dm755 -o root $stuff/tramys2 $fs/usr/bin/tramys2
 	install -Dm644 -o root $stuff/tramys2.desktop \
 		$fs/usr/share/applications/tramys2.desktop
+
+	cd $stuff
+	make msgfmt
+	mkdir -p $fs/usr/share/locale
+	cp $stuff/po/mo/* $fs/usr/share/locale
+	make clean
 }
diff -r 8d9754bad0a1 -r bf52d3ac4b95 tramys-client/stuff/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tramys-client/stuff/Makefile	Thu Aug 28 04:01:02 2014 +0300
@@ -0,0 +1,32 @@
+# Makefile for tramys-client
+#
+LINGUAS?=ru
+
+pot:
+	xgettext -o po/tramys.pot -L Shell -k_ --package-name=tramys ./tramys2
+
+msgmerge:
+	@for l in $(LINGUAS); do \
+		if [ -f "po/$$l.po" ]; then \
+			echo -n "Updating $$l po file."; \
+			msgmerge -U po/$$l.po po/tramys.pot ; \
+		fi; \
+	done
+
+msgfmt:
+	@for l in $(LINGUAS); do \
+		if [ -f "po/$$l.po" ]; then \
+			echo -n "Compiling tramys $$l mo file... "; \
+			mkdir -p po/mo/$$l/LC_MESSAGES; \
+			msgfmt -o po/mo/$$l/LC_MESSAGES/tramys.mo po/$$l.po ; \
+			echo "done"; \
+		fi; \
+	done;
+
+clean:
+	rm -rf po/mo
+	rm -f po/*~
+	rm -f po/*.mo
+
+help:
+	@echo "make [ pot | msgmerge | msgfmt | clean ]"
diff -r 8d9754bad0a1 -r bf52d3ac4b95 tramys-client/stuff/po/ru.po
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tramys-client/stuff/po/ru.po	Thu Aug 28 04:01:02 2014 +0300
@@ -0,0 +1,52 @@
+# Russian translations for tramys package
+# Copyright (C) 2014 SliTaz GNU/Linux
+# This file is distributed under the same license as the tramys-client package.
+# Aleksej Bobylev <al.bobylev@gmail.com>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tramys\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-08-28 02:14+0300\n"
+"PO-Revision-Date: 2014-08-28 02:21+0300\n"
+"Last-Translator: Aleksej Bobylev <al.bobylev@gmail.com>\n"
+"Language-Team: Russian\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: tramys2:27
+#, sh-format
+msgid ""
+"Now translations for all installed programs will be found and downloaded.\n"
+"You can change locale if you want, or proceed.\n"
+"\n"
+"Your current locale: <b>$LANG</b>"
+msgstr ""
+"Сейчас будут найдены и загружены переводы для всех установленных программ.\n"
+"При необходимости вы можете изменить локаль или продолжить.\n"
+"\n"
+"Текущая локаль: <b>$LANG</b>"
+
+#: tramys2:51
+msgid ""
+"The server processes the request.\n"
+"Please wait."
+msgstr ""
+"Сервер обрабатывает запрос.\n"
+"Пожалуйста, подождите."
+
+#: tramys2:75
+msgid ""
+"Downloading in progress.\n"
+"Please wait."
+msgstr ""
+"Загрузка файла.\n"
+"Пожалуйста, подождите."
+
+#: tramys2:125
+msgid "Translation files have been installed in your system."
+msgstr "Файлы переводов были установлены в вашу систему."
+
diff -r 8d9754bad0a1 -r bf52d3ac4b95 tramys-client/stuff/po/tramys.pot
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tramys-client/stuff/po/tramys.pot	Thu Aug 28 04:01:02 2014 +0300
@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: tramys\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-08-28 02:14+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: tramys2:27
+#, sh-format
+msgid ""
+"Now translations for all installed programs will be found and downloaded.\n"
+"You can change locale if you want, or proceed.\n"
+"\n"
+"Your current locale: <b>$LANG</b>"
+msgstr ""
+
+#: tramys2:51
+msgid ""
+"The server processes the request.\n"
+"Please wait."
+msgstr ""
+
+#: tramys2:75
+msgid ""
+"Downloading in progress.\n"
+"Please wait."
+msgstr ""
+
+#: tramys2:125
+msgid "Translation files have been installed in your system."
+msgstr ""
diff -r 8d9754bad0a1 -r bf52d3ac4b95 tramys-client/stuff/tramys2
--- a/tramys-client/stuff/tramys2	Thu Aug 28 01:42:21 2014 +0200
+++ b/tramys-client/stuff/tramys2	Thu Aug 28 04:01:02 2014 +0300
@@ -5,7 +5,6 @@
 
 . /etc/slitaz/slitaz.conf
 . /lib/libtaz.sh
-. /etc/locale.conf
 
 # Ask for root access in order to install the files in the system.
 if [ $(id -u) != 0 ]; then
@@ -31,7 +30,7 @@
 Your current locale: <b>$LANG</b>')" \
 	--button "gtk-edit:2" --button "gtk-cancel:1" --button "gtk-go-forward:0"
 case $? in
-	2) tazbox locale; tramys2; exit 0 ;;
+	2) tazbox locale; . /etc/locale.conf; tramys2; exit 0 ;;
 	1) exit 0 ;;
 esac
 
diff -r 8d9754bad0a1 -r bf52d3ac4b95 tramys-server/receipt
--- a/tramys-server/receipt	Thu Aug 28 01:42:21 2014 +0200
+++ b/tramys-server/receipt	Thu Aug 28 04:01:02 2014 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="tramys-server"
-VERSION="140826"
+VERSION="140828"
 CATEGORY="system-tools"
 SHORT_DESC="Tool for managing translation files for SliTaz GNU/Linux, server part"
 MAINTAINER="al.bobylev@gmail.com"
diff -r 8d9754bad0a1 -r bf52d3ac4b95 tramys-server/stuff/tramys2.cgi
--- a/tramys-server/stuff/tramys2.cgi	Thu Aug 28 01:42:21 2014 +0200
+++ b/tramys-server/stuff/tramys2.cgi	Thu Aug 28 04:01:02 2014 +0300
@@ -16,6 +16,7 @@
 #    HTTP_COOKIE (dl=DLKEY) -> send /tmp/tmp.DLKEY.tgz file
 
 . /usr/bin/httpd_helper.sh
+. /home/slitaz/www/cook/tramys2.msg # translations
 
 WORKING=$(busybox mktemp -d) # make temp working dir /tmp/tmp.??????
 DATADIR=/usr/share/tramys    # this folder contains lists
@@ -125,23 +126,18 @@
 		NUM=1 # initial value
 
 		echo -e "Content-Type: text/plain\n\n" # to Yad client
-		echo "#Number of packages: $PKGNUM"    # Message to Yad log
-		echo "#Searching in progress..."       # And another one
+		msg 1 # Message to Yad log
 
 		copy_translations
 
-		echo "#"                                  # Message to Yad log
-		echo "#Preparing archive. Please wait..." # And another one
+		msg 2 # Message to Yad log
 
 		# Make the archive from working dir and remove temp working dir.
 		busybox tar -czf $WORKING.tgz -C $WORKING .
 		rm -rf $WORKING
 
-		echo "#" # to Yad client log
-		echo "#Done!"
-		echo "#Now you can proceed to downloading"
-		echo "#and installing your translations."
-		echo "#File size: $(stat -c %s $WORKING.tgz) bytes."
+		SIZE=$(ls -lh $WORKING.tgz | awk '{print $5}')
+		msg 3 # Message to Yad log
 
 		echo "${WORKING#*.}" # give download token to Yad client
 		exit 0 ;;
@@ -151,7 +147,7 @@
 		archive="/tmp/tmp.$(echo $arg | tr -cd 'A-Za-z0-9').tgz"
 		rm -f $archive
 		cat <<EOT
-Content-Type: text/plain
+Content-Type: text/plain; charset=UTF-8
 Content-Length: 0
 
 EOT
diff -r 8d9754bad0a1 -r bf52d3ac4b95 tramys-server/stuff/tramys2.msg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tramys-server/stuff/tramys2.msg	Thu Aug 28 04:01:02 2014 +0300
@@ -0,0 +1,37 @@
+# Sorry, no gettext here. It needs to install locale packages for used locales,
+# and I don't want to install them to our Tank server.
+
+msg() {
+case $lang in
+	pt_BR)
+		case $1 in
+			1)  echo "#Pacotes instalados: $PKGNUM"
+				echo "#Pesquisando em andamento..." ;;
+			2)  echo -e "#\n#Fazendo um arquivo. Por favor, aguarde..." ;;
+			3)  SIZE=$(echo $SIZE | sed -e 's|.*|&B|')
+				echo -e "#\n#Feito!"
+				echo -e "#Agora você pode continuar a fazer\n#download e instalar as suas traduções."
+				echo "#O tamanho do arquivo: $SIZE" ;;
+		esac ;;
+	ru*)
+		case $1 in
+			1)  echo "#Количество пакетов: $PKGNUM"
+				echo "#Поиск переводов…" ;;
+			2)  echo -e "#\n#Создание архива. Подождите…" ;;
+			3)  SIZE=$(echo $SIZE | sed -e 's|\.|,|;s|[0-9,]*|& |;s|.*|&Б|')
+				echo -e "#\n#Готово!"
+				echo -e "#Теперь вы можете загрузить\n#и установить найденные переводы."
+				echo "#Размер файла: $SIZE" ;;
+		esac ;;
+	*)
+		case $1 in
+			1)  echo "#Number of packages: $PKGNUM"
+				echo "#Searching in progress..." ;;
+			2)  echo -e "#\n#Preparing archive. Please wait..." ;;
+			3)  SIZE=$(echo $SIZE | sed -e 's|.*|&B|')
+				echo -e "#\n#Done!"
+				echo -e "#Now you can proceed to downloading\n#and installing your translations."
+				echo "#File size: $SIZE" ;;
+		esac ;;
+esac
+}