Merge branch 'master' of gitorious.org:birdfont/birdfont

Changed files (3)

• modified libbirdfont/Argument.vala
• modified libbirdfont/BirdFont.vala
• modified scripts/build.py

Diff

diff --git a/libbirdfont/Argument.vala b/libbirdfont/Argument.valaindex 7ce9b1b..fac2d28 100644--- a/libbirdfont/Argument.vala+++ b/libbirdfont/Argument.vala@@ -63,6 +63,7 @@ public class Argument : GLib.Object { 				a == "--test" ||  				a == "--fatal-warning" ||  				a == "--show-coordinates" || +				a == "--no-translation" || 				a == "--mac" || 				a == "--donated") { 				prev = a;@@ -192,6 +193,8 @@ public class Argument : GLib.Object { 				return "--help"; 			case 'm':  				return "--mac";+			case 'n': +				return "--no-translation"; 			case 's':  				return "--slow"; 			case 't': @@ -237,8 +240,9 @@ public class Argument : GLib.Object { 		print_padded ("-f, --fatal-warning", _("treat warnings as fatal")); 		print_padded ("-h, --help", _("show this message")); 		print_padded ("-m, --mac", _("enable Machintosh customizations"));+		print_padded ("-n, --no-translation", _("don't translate")); 		print_padded ("-s, --slow", _("sleep between each command in test suite"));-		print_padded ("-t, --test [TEST]", _("run test case"));+		print_padded ("-t --test [TEST]", _("run test case")); 		 		stdout.printf ("\n"); 	}diff --git a/libbirdfont/BirdFont.vala b/libbirdfont/BirdFont.valaindex d9abb06..ff12cd5 100644--- a/libbirdfont/BirdFont.vala+++ b/libbirdfont/BirdFont.vala@@ -199,10 +199,12 @@ public class BirdFont { 		stdout.printf ("birdfont version %s\n", VERSION); 		stdout.printf ("built on %s\n", BUILD_TIMESTAMP); -		init_gettext ();		-		 		args = new Argument.command_line (arg); +		if (!args.has_argument ("--no-translation")) {+			init_gettext ();+		}+ 		if (args.has_argument ("--help")) { 			args.print_help (); 			Process.exit (0);diff --git a/scripts/build.py b/scripts/build.pyindex 48b56c1..2283042 100644--- a/scripts/build.py+++ b/scripts/build.py@@ -69,6 +69,9 @@ def libbirdfont(prefix, cc, cflags, ldflags, valac, valaflags, library): 		-o """ + library) 	run("mv " + library + " build/bin/") 	+	if os.path.exists("build/bin/libbirdfont.so"):+		run ("cd build/bin && unlink libbirdfont.so")+ 	run ("""cd build/bin && ln -s """ + library + " libbirdfont.so")  def birdfont_export(prefix, cc, cflags, ldflags, valac, valaflags, library):