Merge lp:~unity-api-team/unity-scope-snappy/add_gettext_to_vendors into lp:~unity-api-team/unity-scope-snappy/trunk

[Antti Kaijanmäki]

Add github.com/gosexy/gettext to vendors.

-

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:34
http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-ci/143/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-amd64-ci/100/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/97/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-i386-ci/97/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-snappy-ci/143/rebuild

review: Needs Fixing (continuous-integration)

[Kyle Fazzari (kyrofa)]

Add this to debian/copyright, as well. Another comment is in the diff.

review: Needs Fixing

[lp:~unity-api-team/unity-scope-snappy/add_gettext_to_vendors]

35. By Antti Kaijanmäki on 2015-08-27

merge trunk, resolve conflict in internal/vendor.json

[Antti Kaijanmäki (kaijanmaki)]

OK, will modify debian/copyright.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:35
http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-ci/147/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-amd64-ci/104
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/101
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/101/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-i386-ci/101

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-snappy-ci/147/rebuild

review: Approve (continuous-integration)

[lp:~unity-api-team/unity-scope-snappy/add_gettext_to_vendors]

36. By Antti Kaijanmäki on 2015-08-27

update debian/copyright

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:36
http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-ci/151/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-amd64-ci/108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/105
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/105/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-i386-ci/105

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-snappy-ci/151/rebuild

review: Approve (continuous-integration)

[Kyle Fazzari (kyrofa)]

A few more things that might need fixing here.

review: Needs Fixing

Unmerged revisions

36. By Antti Kaijanmäki on 2015-08-27

update debian/copyright

35. By Antti Kaijanmäki on 2015-08-27

merge trunk, resolve conflict in internal/vendor.json

34. By Antti Kaijanmäki on 2015-08-26

Add github.com/gosexy/gettext to vendors.

=== modified file 'debian/copyright'
--- debian/copyright	2015-07-21 17:39:16 +0000
+++ debian/copyright	2015-08-27 16:20:17 +0000
@@ -54,6 +54,10 @@
  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+Files: internal/gihub.com/gosexy/gettext/*
+Copyright: 2012-2013 José Carlos Nieto, http://xiam.menteslibres.org/
+License: MIT
+
 Files: internal/golang.org/*
 Copyright: 2012 The Go Authors
 License: BSD-3-clause
 
=== added directory 'internal/github.com/gosexy'
=== added directory 'internal/github.com/gosexy/gettext'
=== added file 'internal/github.com/gosexy/gettext/LICENSE'
--- internal/github.com/gosexy/gettext/LICENSE	1970-01-01 00:00:00 +0000
+++ internal/github.com/gosexy/gettext/LICENSE	2015-08-27 16:20:17 +0000
@@ -0,0 +1,20 @@
+Copyright (c) 2012-2013 José Carlos Nieto, http://xiam.menteslibres.org/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
=== added file 'internal/github.com/gosexy/gettext/README.md'
--- internal/github.com/gosexy/gettext/README.md	1970-01-01 00:00:00 +0000
+++ internal/github.com/gosexy/gettext/README.md	2015-08-27 16:20:17 +0000
@@ -0,0 +1,94 @@
+# gosexy/gettext
+
+Go bindings for [GNU gettext][1], an internationalization and localization
+library for writing multilingual systems.
+
+## Requeriments
+
+The GNU C library. If you're using GNU/Linux, FreeBSD or OSX you should already
+have it.
+
+## Installation
+
+Use `go get` to download and install the binding:
+
+```sh
+go get github.com/gosexy/gettext
+```
+
+## Usage
+
+```go
+package main
+
+import (
+	"github.com/gosexy/gettext"
+	"fmt"
+	"os"
+)
+
+func main() {
+	gettext.BindTextdomain("example", ".")
+	gettext.Textdomain("example")
+
+	os.Setenv("LANGUAGE", "es_MX.utf8")
+
+	gettext.SetLocale(gettext.LC_ALL, "")
+
+	fmt.Println(gettext.Gettext("Hello, world!"))
+}
+```
+
+You can use `os.Setenv` to set the `LANGUAGE` environment variable or set it
+on a terminal:
+
+```sh
+export LANGUAGE="es_MX.utf8"
+./gettext-program
+```
+
+Note that `xgettext` does not officially support Go syntax yet, however, you
+can generate a valid `.pot` file by forcing `xgettest` to use the C++
+syntax:
+
+```sh
+xgettext -d example -s gettext_test.go -o example.pot -L c++ -i \
+--keyword=NGettext:1,2 --keyword=Gettext
+```
+
+This will generate a `example.pot` file.
+
+After translating the `.pot` file, you must generate `.po` and `.mo` files and
+remember to set the UTF-8 charset.
+
+```sh
+msginit -l es_MX -o example.po -i example.pot
+msgfmt -c -v -o example.mo example.po
+```
+
+Finally, move the `.mo` file to an appropriate location.
+
+```sh
+mv example.mo examples/es_MX.utf8/LC_MESSAGES/example.mo
+```
+
+## Documentation
+
+You can read `gosexy/gettext` documentation from a terminal
+
+```sh
+go doc github.com/gosexy/gettext
+```
+
+Or you can [browse it](http://godoc.org/github.com/gosexy/gettext) online.
+
+The original gettext documentation could be very useful as well:
+
+```sh
+man 3 gettext
+```
+
+Here's another [good tutorial][2] on using gettext.
+
+[1]: http://www.gnu.org/software/gettext/
+[2]: http://oriya.sarovar.org/docs/gettext_single.html
 
=== added file 'internal/github.com/gosexy/gettext/gettext.go'
--- internal/github.com/gosexy/gettext/gettext.go	1970-01-01 00:00:00 +0000
+++ internal/github.com/gosexy/gettext/gettext.go	2015-08-27 16:20:17 +0000
@@ -0,0 +1,207 @@
+/*
+  Copyright (c) 2012 José Carlos Nieto, http://xiam.menteslibres.org/
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+package gettext
+
+/*
+
+#include <libintl.h>
+#include <locale.h>
+#include <stdlib.h>
+*/
+import "C"
+
+import (
+	"fmt"
+	"strings"
+	"unsafe"
+)
+
+var (
+	// For all of the locale.
+	LC_ALL = uint(C.LC_ALL)
+
+	// For regular expression matching (it determines the meaning of range
+	// expressions and equivalence classes) and string collation.
+	LC_COLATE = uint(C.LC_ALL)
+
+	// For regular expression matching, character classification, conversion,
+	// case-sensitive comparison, and wide character functions.
+	LC_CTYPE = uint(C.LC_CTYPE)
+
+	// For localizable natural-language messages.
+	LC_MESSAGES = uint(C.LC_MESSAGES)
+
+	// For monetary formatting.
+	LC_MONETARY = uint(C.LC_MONETARY)
+
+	// For number formatting (such as the decimal point and the thousands
+	// separator).
+	LC_NUMERIC = uint(C.LC_NUMERIC)
+
+	// For time and date formatting.
+	LC_TIME = uint(C.LC_TIME)
+)
+
+// Sets or queries the program's current locale.
+func SetLocale(category uint, locale string) string {
+	clocale := C.CString(locale)
+
+	res := C.GoString(C.setlocale(C.int(category), clocale))
+
+	C.free(unsafe.Pointer(clocale))
+	return res
+}
+
+// Sets directory containing message catalogs.
+func BindTextdomain(domainname string, dirname string) string {
+	cdirname := C.CString(dirname)
+	cdomainname := C.CString(domainname)
+
+	res := C.GoString(C.bindtextdomain(cdomainname, cdirname))
+
+	C.free(unsafe.Pointer(cdirname))
+	C.free(unsafe.Pointer(cdomainname))
+	return res
+}
+
+// Sets the output codeset for message catalogs for domain domainname.
+func BindTextdomainCodeset(domainname string, codeset string) string {
+	cdomainname := C.CString(domainname)
+	ccodeset := C.CString(codeset)
+
+	res := C.GoString(C.bind_textdomain_codeset(cdomainname, ccodeset))
+
+	C.free(unsafe.Pointer(cdomainname))
+	C.free(unsafe.Pointer(ccodeset))
+	return res
+}
+
+// Sets or retrieves the current message domain.
+func Textdomain(domainname string) string {
+	cdomainname := C.CString(domainname)
+
+	res := C.GoString(C.textdomain(cdomainname))
+
+	C.free(unsafe.Pointer(cdomainname))
+	return res
+}
+
+// Attempt to translate a text string into the user's native language, by
+// looking up the translation in a message catalog.
+func Gettext(msgid string) string {
+	cmsgid := C.CString(msgid)
+
+	res := C.GoString(C.gettext(cmsgid))
+
+	C.free(unsafe.Pointer(cmsgid))
+	return res
+}
+
+// Like Gettext(), but looking up the message in the specified domain.
+func DGettext(domain string, msgid string) string {
+	cdomain := C.CString(domain)
+	cmsgid := C.CString(msgid)
+
+	res := C.GoString(C.dgettext(cdomain, cmsgid))
+
+	C.free(unsafe.Pointer(cdomain))
+	C.free(unsafe.Pointer(cmsgid))
+	return res
+}
+
+// Like Gettext(), but looking up the message in the specified domain and
+// category.
+func DCGettext(domain string, msgid string, category uint) string {
+	cdomain := C.CString(domain)
+	cmsgid := C.CString(msgid)
+
+	res := C.GoString(C.dcgettext(cdomain, cmsgid, C.int(category)))
+
+	C.free(unsafe.Pointer(cdomain))
+	C.free(unsafe.Pointer(cmsgid))
+	return res
+}
+
+// Attempt to translate a text string into the user's native language, by
+// looking up the appropriate plural form of the translation in a message
+// catalog.
+func NGettext(msgid string, msgid_plural string, n uint64) string {
+	cmsgid := C.CString(msgid)
+	cmsgid_plural := C.CString(msgid_plural)
+
+	res := C.GoString(C.ngettext(cmsgid, cmsgid_plural, C.ulong(n)))
+
+	C.free(unsafe.Pointer(cmsgid))
+	C.free(unsafe.Pointer(cmsgid_plural))
+
+	return res
+}
+
+// Like fmt.Sprintf() but without %!(EXTRA) errors.
+func Sprintf(format string, a ...interface{}) string {
+	expects := strings.Count(format, "%") - strings.Count(format, "%%")
+
+	if expects > 0 {
+		arguments := make([]interface{}, expects)
+		for i := 0; i < expects; i++ {
+			if len(a) > i {
+				arguments[i] = a[i]
+			}
+		}
+		return fmt.Sprintf(format, arguments...)
+	}
+
+	return format
+}
+
+// Like NGettext(), but looking up the message in the specified domain.
+func DNGettext(domainname string, msgid string, msgid_plural string, n uint64) string {
+	cdomainname := C.CString(domainname)
+	cmsgid := C.CString(msgid)
+	cmsgid_plural := C.CString(msgid_plural)
+
+	res := C.GoString(C.dngettext(cdomainname, cmsgid, cmsgid_plural, C.ulong(n)))
+
+	C.free(unsafe.Pointer(cdomainname))
+	C.free(unsafe.Pointer(cmsgid))
+	C.free(unsafe.Pointer(cmsgid_plural))
+
+	return res
+}
+
+// Like NGettext(), but looking up the message in the specified domain and
+// category.
+func DCNGettext(domainname string, msgid string, msgid_plural string, n uint64, category uint) string {
+	cdomainname := C.CString(domainname)
+	cmsgid := C.CString(msgid)
+	cmsgid_plural := C.CString(msgid_plural)
+
+	res := C.GoString(C.dcngettext(cdomainname, cmsgid, cmsgid_plural, C.ulong(n), C.int(category)))
+
+	C.free(unsafe.Pointer(cdomainname))
+	C.free(unsafe.Pointer(cmsgid))
+	C.free(unsafe.Pointer(cmsgid_plural))
+
+	return res
+}
 
=== added file 'internal/github.com/gosexy/gettext/gettext_test.go'
--- internal/github.com/gosexy/gettext/gettext_test.go	1970-01-01 00:00:00 +0000
+++ internal/github.com/gosexy/gettext/gettext_test.go	2015-08-27 16:20:17 +0000
@@ -0,0 +1,130 @@
+package gettext
+
+import (
+	"fmt"
+	"os"
+	"testing"
+)
+
+/*
+	NOTE:
+
+	xgettext does not officially support Go syntax, however, you can generate a valid .pot file by forcing
+	xgettest to use the C++ syntax:
+
+	% xgettext -d example -s gettext_test.go -o example.pot -L c++ -i --keyword=NGettext:1,2 --keyword=Gettext
+
+	This will generate a example.pot file.
+
+	After translating the .pot file, you must generate .po and .mo files.
+
+	Remember to set the UTF-8 charset.
+
+	% msginit -l es_MX -o example.po -i example.pot
+	% msgfmt -c -v -o example.mo example.po
+
+	And finally, move the .mo file to an appropriate location.
+
+	% mv example.mo examples/es_MX.utf8/LC_MESSAGES/example.mo
+
+*/
+
+func TestSpanishMexico(t *testing.T) {
+
+	os.Setenv("LANGUAGE", "es_MX.utf8")
+
+	SetLocale(LC_ALL, "")
+	BindTextdomain("example", "./examples/")
+	Textdomain("example")
+
+	t1 := Gettext("Hello, world!")
+
+	fmt.Println(t1)
+
+	if t1 != "¡Hola mundo!" {
+		t.Errorf("Failed translation.")
+	}
+
+	t2 := Sprintf(NGettext("An apple", "%d apples", 1), 1, "garbage")
+
+	fmt.Println(t2)
+
+	if t2 != "Una manzana" {
+		t.Errorf("Failed translation.")
+	}
+
+	t3 := Sprintf(NGettext("An apple", "%d apples", 3), 3)
+
+	fmt.Println(t3)
+
+	if t3 != "3 manzanas" {
+		t.Errorf("Failed translation.")
+	}
+
+	t4 := Gettext("Good morning")
+
+	fmt.Println(t4)
+
+	if t4 != "Buenos días" {
+		t.Errorf("Failed translation.")
+	}
+
+	t5 := Gettext("Good bye!")
+
+	fmt.Println(t5)
+
+	if t5 != "¡Hasta luego!" {
+		t.Errorf("Failed translation.")
+	}
+
+}
+
+func TestGermanDeutschland(t *testing.T) {
+
+	os.Setenv("LANGUAGE", "de_DE.utf8")
+
+	SetLocale(LC_ALL, "")
+	BindTextdomain("example", "./examples/")
+	Textdomain("example")
+
+	t1 := Gettext("Hello, world!")
+
+	fmt.Println(t1)
+
+	if t1 != "Hallo, Welt!" {
+		t.Errorf("Failed translation.")
+	}
+
+	t2 := Sprintf(NGettext("An apple", "%d apples", 1), 1, "garbage")
+
+	fmt.Println(t2)
+
+	if t2 != "Ein Apfel" {
+		t.Errorf("Failed translation.")
+	}
+
+	t3 := Sprintf(NGettext("An apple", "%d apples", 3), 3)
+
+	fmt.Println(t3)
+
+	if t3 != "3 Äpfel" {
+		t.Errorf("Failed translation.")
+	}
+
+	t4 := Gettext("Good morning")
+
+	fmt.Println(t4)
+
+	if t4 != "Guten morgen" {
+		t.Errorf("Failed translation.")
+	}
+
+	t5 := Gettext("Good bye!")
+
+	fmt.Println(t5)
+
+	if t5 != "Aufwiedersehen!" {
+		t.Errorf("Failed translation.")
+	}
+
+}
 
=== modified file 'internal/vendor.json'
--- internal/vendor.json	2015-07-30 14:22:57 +0000
+++ internal/vendor.json	2015-08-27 16:20:17 +0000
@@ -1,68 +1,76 @@
 {
 	"comment": "",
+	"ignore": "",
 	"package": [
 		{
 			"canonical": "github.com/AlekSi/gocov-xml",
 			"comment": "",
-			"local": "launchpad.net/unity-scope-snappy/internal/github.com/AlekSi/gocov-xml",
+			"local": "github.com/AlekSi/gocov-xml",
 			"revision": "d2f6da892a0d5e0b587526abf51349ad654ade51",
 			"revisionTime": "2013-09-03T17:40:06+04:00"
 		},
 		{
 			"canonical": "github.com/axw/gocov",
 			"comment": "",
-			"local": "launchpad.net/unity-scope-snappy/internal/github.com/axw/gocov",
+			"local": "github.com/axw/gocov",
 			"revision": "3b045e0eb61013ff134e6752184febc47d119f3a",
 			"revisionTime": "2014-11-11T18:30:33+08:00"
 		},
 		{
 			"canonical": "github.com/axw/gocov/gocov",
 			"comment": "",
-			"local": "launchpad.net/unity-scope-snappy/internal/github.com/axw/gocov/gocov",
+			"local": "github.com/axw/gocov/gocov",
 			"revision": "3b045e0eb61013ff134e6752184febc47d119f3a",
 			"revisionTime": "2014-11-11T18:30:33+08:00"
 		},
 		{
 			"canonical": "github.com/axw/gocov/gocovutil",
 			"comment": "",
-			"local": "launchpad.net/unity-scope-snappy/internal/github.com/axw/gocov/gocovutil",
+			"local": "github.com/axw/gocov/gocovutil",
 			"revision": "3b045e0eb61013ff134e6752184febc47d119f3a",
 			"revisionTime": "2014-11-11T18:30:33+08:00"
 		},
 		{
 			"canonical": "github.com/dustin/go-humanize",
 			"comment": "",
-			"local": "launchpad.net/unity-scope-snappy/internal/github.com/dustin/go-humanize",
+			"local": "github.com/dustin/go-humanize",
 			"revision": "c128122e0b9b93799aef8181a537e5d8fd7081d6",
 			"revisionTime": "2015-06-22T22:54:03-07:00"
 		},
 		{
 			"canonical": "github.com/godbus/dbus",
 			"comment": "",
-			"local": "launchpad.net/unity-scope-snappy/internal/github.com/godbus/dbus",
+			"local": "github.com/godbus/dbus",
 			"revision": "25c3068a42a0b50b877953fb249dbcffc6bd1bca",
 			"revisionTime": "2015-07-29T16:15:27-07:00"
 		},
 		{
 			"canonical": "github.com/godbus/dbus/introspect",
 			"comment": "",
-			"local": "launchpad.net/unity-scope-snappy/internal/github.com/godbus/dbus/introspect",
+			"local": "github.com/godbus/dbus/introspect",
 			"revision": "25c3068a42a0b50b877953fb249dbcffc6bd1bca",
 			"revisionTime": "2015-07-29T16:15:27-07:00"
 		},
 		{
+			"canonical": "github.com/gosexy/gettext",
+			"comment": "",
+			"local": "github.com/gosexy/gettext",
+			"revision": "98b7b91596d20b96909e6b60d57411547dd9959c",
+			"revisionTime": "2013-02-21T06:21:43-05:00"
+		},
+		{
 			"canonical": "golang.org/x/tools/cover",
 			"comment": "",
-			"local": "launchpad.net/unity-scope-snappy/internal/golang.org/x/tools/cover",
+			"local": "golang.org/x/tools/cover",
 			"revision": "af817890aa7b628234075a6cb01a3a435fb8317d",
 			"revisionTime": "2015-06-17T17:25:35-07:00"
 		},
 		{
 			"canonical": "launchpad.net/go-unityscopes/v2",
 			"comment": "",
-			"local": "launchpad.net/unity-scope-snappy/internal/launchpad.net/go-unityscopes/v2",
+			"local": "launchpad.net/go-unityscopes/v2",
 			"revision": "69",
 			"revisionTime": "2015-06-02T10:39:20+02:00"
 		}
 	]
-}
 \ No newline at end of file
+}