Merge lp:~mvo/snappy/snappy-gettext into lp:~snappy-dev/snappy/snappy-moved-to-github

[Michael Vogt]

Add support for gettext.

This branch adds gettext support. Based on the excellent work from Mike Terry, thanks a bunch.

Note that this can only be merged once the build-depdenency get accepted (https://launchpad.net/ubuntu/wily/+queue)

[Sergio Schvezov (sergiusens)]

Looks good, can we add a simple test here or is it better to integration test translations?

[Michael Vogt (mvo)]

Fwiw, I uploaded the packaged golang-gettext package to wily now.

[lp:~mvo/snappy/snappy-gettext]

513. By Michael Vogt on 2015-06-18

cmd/snappy/cmd_config.go: remove spaces at the end

[Michael Vogt (mvo)]

Thanks, I addressed the comments. I also added a lp:~mvo/snappy/snappy-gettext2 with a unittest test. I will file a separate MP for this.

[John Lenton (chipaca)]

review: Approve

=== modified file 'cmd/snappy/cmd_config.go'
--- cmd/snappy/cmd_config.go	2015-05-19 14:09:19 +0000
+++ cmd/snappy/cmd_config.go	2015-06-18 07:23:41 +0000
@@ -38,7 +38,7 @@
 
 const shortConfigHelp = `Set configuration for an installed package.`
 
-const longConfigHelp = `Configures a package. The configuration is a YAML file, provided in the specified file which can be "-" for stdin. Output of the command is the current configuration, so running this command with no input file provides a snapshot of the app's current config.  `
+const longConfigHelp = "Configures a package. The configuration is a YAML file, provided in the specified file which can be \"-\" for stdin. Output of the command is the current configuration, so running this command with no input file provides a snapshot of the app's current config."
 
 func init() {
 	_, err := parser.AddCommand("config",

=== modified file 'cmd/snappy/cmd_install.go'
--- cmd/snappy/cmd_install.go	2015-06-15 07:38:57 +0000
+++ cmd/snappy/cmd_install.go	2015-06-18 07:23:41 +0000
@@ -24,6 +24,7 @@
 	"fmt"
 	"os"
 
+	"launchpad.net/snappy/i18n"
 	"launchpad.net/snappy/logger"
 	"launchpad.net/snappy/progress"
 	"launchpad.net/snappy/snappy"
@@ -40,8 +41,8 @@
 
 func init() {
 	_, err := parser.AddCommand("install",
-		"Install a snap package",
-		"Install a snap package",
+		i18n.G("Install a snap package"),
+		i18n.G("Install a snap package"),
 		&cmdInstall{})
 	if err != nil {
 		logger.Panicf("Unable to install: %v", err)

=== modified file 'debian/control'
--- debian/control	2015-06-02 20:46:07 +0000
+++ debian/control	2015-06-18 07:23:41 +0000
@@ -9,6 +9,7 @@
                fakeroot,
                golang-ar-dev,
                golang-check.v1-dev,
+               golang-gettext-dev,
                golang-go,
                golang-go-flags-dev,
                golang-go.crypto-dev,

=== modified file 'debian/rules'
--- debian/rules	2015-04-14 16:46:57 +0000
+++ debian/rules	2015-06-18 07:23:41 +0000
@@ -50,6 +50,11 @@
 		-pubuntu-snappy \
 		snappy-autopilot.service
 
+override_dh_auto_build:
+	# this will update the i18n stuff
+	go generate ./snappy
+	dh_auto_build
+
 override_dh_auto_install:
 	dh_auto_install -O--buildsystem=golang
 	# Making the packages private

=== modified file 'debian/ubuntu-snappy-cli.install'
--- debian/ubuntu-snappy-cli.install	2015-03-27 08:28:08 +0000
+++ debian/ubuntu-snappy-cli.install	2015-06-18 07:23:41 +0000
@@ -1,2 +1,4 @@
 /usr/bin/snappy
 data/completion/snappy /usr/share/bash-completion/completions/
+# i18n stuff
+share /usr
\ No newline at end of file

=== modified file 'dependencies.tsv'
--- dependencies.tsv	2015-06-02 20:46:07 +0000
+++ dependencies.tsv	2015-06-18 07:23:41 +0000
@@ -1,6 +1,7 @@
 code.google.com/p/go.crypto	hg	69e2a90ed92d03812364aeb947b7068dc42e561e	235
 github.com/blakesmith/ar	git	c9a977dd0cc1392b023382c7bfa5a22af8d3b730	2013-02-19T04:59:55Z
 github.com/cheggaaa/pb	git	e8c7cc515bfde3e267957a3b110080ceed51354e	2014-12-02T07:01:21Z
+github.com/gosexy/gettext	git	98b7b91596d20b96909e6b60d57411547dd9959c	2013-02-21T11:21:43Z
 github.com/jessevdk/go-flags	git	15347ef417a300349807983f15af9e65cd2e1b3a	2015-01-25T08:53:51Z
 github.com/mvo5/goconfigparser	git	26426272dda20cc76aa1fa44286dc743d2972fe8	2015-02-12T09:37:50Z
 gopkg.in/check.v1	git	64131543e7896d5bcc6bd5a76287eb75ea96c673	2014-10-24T13:38:53Z

=== added directory 'i18n'
=== added file 'i18n/i18n.go'
--- i18n/i18n.go	1970-01-01 00:00:00 +0000
+++ i18n/i18n.go	2015-06-18 07:23:41 +0000
@@ -0,0 +1,45 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2014-2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package i18n
+
+//go:generate ../update-pot
+
+import (
+	"github.com/gosexy/gettext"
+)
+
+// Note that we have to use dgettext() here because we are a library
+// and we can not use getext.Textdomain() as this would override the
+// applications default
+const TEXTDOMAIN = "snappy"
+
+// G is the shorthand for Gettext
+var G = func(msgid string) string {
+	return gettext.DGettext(TEXTDOMAIN, msgid)
+}
+
+// NG is the shorthand for NGettext
+var NG = func(msgid string, msgid_plural string, n uint64) string {
+	return gettext.DNGettext(TEXTDOMAIN, msgid, msgid_plural, n)
+}
+
+func init() {
+	gettext.SetLocale(gettext.LC_ALL, "")
+}

=== modified file 'partition/bootloader_uboot_test.go'
--- partition/bootloader_uboot_test.go	2015-06-12 05:23:40 +0000
+++ partition/bootloader_uboot_test.go	2015-06-18 07:23:41 +0000
@@ -56,7 +56,7 @@
 snappy_stamp=snappy-stamp.txt
 # either "regular" (normal boot) or "try" when trying a new version
 snappy_mode=regular
-# if we're trying a new version, check if stamp file is already there to revert
+# if we are trying a new version, check if stamp file is already there to revert
 # to other version
 snappy_boot=if test "${snappy_mode}" = "try"; then if test -e mmc ${bootpart} ${snappy_stamp}; then if test "${snappy_ab}" = "a"; then setenv snappy_ab "b"; else setenv snappy_ab "a"; fi; else fatwrite mmc ${mmcdev}:${mmcpart} 0x0 ${snappy_stamp} 0; fi; fi; run loadfiles; setenv mmcroot /dev/disk/by-label/system-${snappy_ab} ${snappy_cmdline}; run mmcargs; bootz ${loadaddr} ${initrd_addr}:${initrd_size} ${fdtaddr}
 `

=== modified file 'partition/partition.go'
--- partition/partition.go	2015-06-09 17:43:20 +0000
+++ partition/partition.go	2015-06-18 07:23:41 +0000
@@ -386,7 +386,7 @@
 			name := tmp[0]
 
 			// remove quotes
-			value := strings.Trim(tmp[1], `"`)
+			value := strings.Trim(tmp[1], "\"")
 
 			// store
 			fields[name] = value

=== added directory 'po'
=== added file 'po/de.po'
--- po/de.po	1970-01-01 00:00:00 +0000
+++ po/de.po	2015-06-18 07:23:41 +0000
@@ -0,0 +1,21 @@
+# 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: snappy\n"
+        "Report-Msgid-Bugs-To: [e-mail]\n"
+        "POT-Creation-Date: 2015-06-16 09:08+0200\n"
+        "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+        "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+        "Language-Team: LANGUAGE <[e-mail]>\n"
+        "Language: \n"
+        "MIME-Version: 1.0\n"
+        "Content-Type: text/plain; charset=CHARSET\n"
+        "Content-Transfer-Encoding: 8bit\n"
+
+#. TRANSLATORS: the first %q is the file that can not be read and %v is the error message
+msgid   "Can't read hook file %q: %v"
+msgstr  "Kann die Hook Datei %q nicht lesen: %v"

=== added file 'po/snappy.pot'
--- po/snappy.pot	1970-01-01 00:00:00 +0000
+++ po/snappy.pot	2015-06-18 07:23:41 +0000
@@ -0,0 +1,24 @@
+# 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: snappy\n"
+        "Report-Msgid-Bugs-To: [e-mail]\n"
+        "POT-Creation-Date: 2015-06-17 14:01+0200\n"
+        "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+        "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+        "Language-Team: LANGUAGE <[e-mail]>\n"
+        "Language: \n"
+        "MIME-Version: 1.0\n"
+        "Content-Type: text/plain; charset=CHARSET\n"
+        "Content-Transfer-Encoding: 8bit\n"
+
+#. TRANSLATORS: the first %q is the file that can not be read and %v is the error message
+msgid   "Can't read hook file %q: %v"
+msgstr  ""
+
+msgid   "Install a snap package"
+msgstr  ""

=== modified file 'run-checks'
--- run-checks	2015-06-09 15:35:35 +0000
+++ run-checks	2015-06-18 07:23:41 +0000
@@ -55,6 +55,15 @@
     exit 1
 fi
 
+# pot file
+TMPF="$(mktemp)"
+./update-pot "$TMPF"
+trap "rm -f $TMPF" 0
+if ! diff --ignore-matching-lines=.*POT-Creation-Date.* po/snappy.pot $TMPF; then
+    echo "You need to run ./update-pot"
+    exit 1
+fi
+
 # integration tests
 if which adt-run >/dev/null 2>&1; then
     echo "Running integration tests"

=== modified file 'snappy/click.go'
--- snappy/click.go	2015-06-10 09:25:34 +0000
+++ snappy/click.go	2015-06-18 07:23:41 +0000
@@ -43,6 +43,7 @@
 
 	"launchpad.net/snappy/clickdeb"
 	"launchpad.net/snappy/helpers"
+	"launchpad.net/snappy/i18n"
 	"launchpad.net/snappy/logger"
 	"launchpad.net/snappy/pkg"
 	"launchpad.net/snappy/progress"
@@ -158,7 +159,8 @@
 	for _, f := range hookFiles {
 		hook, err := readClickHookFile(f)
 		if err != nil {
-			logger.Noticef("Can't read hook file %q: %v", f, err)
+			//TRANSLATORS: the first %q is the file that can not be read and %v is the error message
+			logger.Noticef(i18n.G("Can't read hook file %q: %v"), f, err)
 			continue
 		}
 		hooks[hook.name] = hook

=== modified file 'snappy/click_test.go'
--- snappy/click_test.go	2015-06-10 09:25:34 +0000
+++ snappy/click_test.go	2015-06-18 07:23:41 +0000
@@ -1311,8 +1311,7 @@
 
 func (s *SnapTestSuite) TestServiceWhitelistError(c *C) {
 	err := verifyServiceYaml(Service{Name: "x\n"})
-	c.Assert(err.Error(), Equals, `services description field 'Name' contains illegal 'x
-' (legal: '^[A-Za-z0-9/. _#:-]*$')`)
+	c.Assert(err.Error(), Equals, "services description field 'Name' contains illegal 'x\n' (legal: '^[A-Za-z0-9/. _#:-]*$')")
 }
 
 func (s *SnapTestSuite) TestBinariesWhitelistSimple(c *C) {

=== modified file 'snappy/dirs.go'
--- snappy/dirs.go	2015-05-15 13:33:27 +0000
+++ snappy/dirs.go	2015-06-18 07:23:41 +0000
@@ -32,6 +32,7 @@
 	snapAppArmorDir  string
 	snapSeccompDir   string
 	snapUdevRulesDir string
+	localeDir        string
 
 	snapBinariesDir  string
 	snapServicesDir  string
@@ -62,4 +63,6 @@
 	cloudMetaDataFile = filepath.Join(rootdir, "/var/lib/cloud/seed/nocloud-net/meta-data")
 
 	snapUdevRulesDir = filepath.Join(rootdir, "/etc/udev/rules.d")
+
+	localeDir = filepath.Join(rootdir, "/usr/share/locale")
 }

=== modified file 'snappy/errors.go'
--- snappy/errors.go	2015-06-04 22:21:51 +0000
+++ snappy/errors.go	2015-06-18 07:23:41 +0000
@@ -90,7 +90,7 @@
 
 	// ErrInvalidFrameworkSpecInYaml is returned if a package.yaml
 	// has both frameworks and framework entries.
-	ErrInvalidFrameworkSpecInYaml = errors.New(`yaml can't have both "frameworks" and (deprecated) "framework" keys`)
+	ErrInvalidFrameworkSpecInYaml = errors.New("yaml can't have both \"frameworks\" and (deprecated) \"framework\" keys")
 
 	// ErrSnapNotActive is returned if you try to unset a snap from
 	// active to inactive

=== added file 'update-pot'
--- update-pot	1970-01-01 00:00:00 +0000
+++ update-pot	2015-06-18 07:23:41 +0000
@@ -0,0 +1,25 @@
+#!/bin/sh
+# -*- Mode: sh; indent-tabs-mode: t -*-
+
+set -e
+
+HERE="$(dirname $0)"
+
+OUTPUT="$HERE/po/snappy.pot"
+if [ -n "$1" ]; then
+	OUTPUT="$1"
+fi
+
+xgettext -d snappy -o "$OUTPUT" --c++ --from-code=UTF-8 \
+	--indent --add-comments --no-location --sort-output \
+	--package-name=snappy \
+	--msgid-bugs-address=[e-mail] \
+	--keyword=NG:1,2 --keyword=G \
+	$HERE/*/*.go $HERE/cmd/*/*.go
+
+# language packs
+for p in po/*.po; do
+	lang=$(basename $p .po)
+	mkdir -p $HERE/share/locale/$lang/LC_MESSAGES
+	msgfmt -v -o $HERE/share/locale/$lang/LC_MESSAGES/snappy.mo $p 2>/dev/null
+done