[PATCH] Use system_path to find 'po'-dir to resolve relative paths

Subsystems: the rest

DORMANTno replies

2 messages, 1 author, 2016-06-15 · open the first message on its own page

[PATCH] Use system_path to find 'po'-dir to resolve relative paths

From: Vincent van Ravesteijn <hidden>
Date: 2016-06-15 22:53:59

If the specified path for the 'po'-files is a relative path and if
RUNTIME_PREFIX is set, system_path must be used to resolve the directory relative to the executable.

Signed-off-by: Vincent van Ravesteijn <redacted>
---
 gettext.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/gettext.c b/gettext.c
index f75bca7..632ccf8 100644
--- a/gettext.c
+++ b/gettext.c

@@ -4,6 +4,7 @@
 
 #include "git-compat-util.h"
 #include "gettext.h"
+#include "exec_cmd.h"
 
 #ifndef NO_GETTEXT
 #	include <locale.h>

@@ -123,7 +124,7 @@ void git_setup_gettext(void)
 
 	if (!podir)
 		podir = GIT_LOCALE_PATH;
-	bindtextdomain("git", podir);
+	bindtextdomain("git", system_path(podir));
 	setlocale(LC_MESSAGES, "");
 	init_gettext_charset("git");
 	textdomain("git");

-- 
1.7.9.msysgit.0

[PATCH] git-upload-pack: Setup exec_path before gettext

From: Vincent van Ravesteijn <hidden>
Date: 2016-06-15 22:53:59

If RUNTIME_PREFIX is set, git_setup_gettext() uses system_path() to find
the directory with po-files. The function system_path() needs the
exec_path so this needs to be setup first before setting up gettext().

Signed-off-by: Vincent van Ravesteijn <redacted>
---
 upload-pack.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/upload-pack.c b/upload-pack.c
index bb08e2e..f5ba770 100644
--- a/upload-pack.c
+++ b/upload-pack.c

@@ -791,10 +791,11 @@ int main(int argc, char **argv)
 	int i;
 	int strict = 0;
 
-	git_setup_gettext();
-
 	packet_trace_identity("upload-pack");
 	git_extract_argv0_path(argv[0]);
+	
+	git_setup_gettext();
+
 	read_replace_refs = 0;
 
 	for (i = 1; i < argc; i++) {

-- 
1.7.9.msysgit.0

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help