Re: [PATCH] Use system_path to find 'po'-dir to resolve relative paths
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 6, 2012, 18:28 UTC
- Message-ID
- <7v7gvkmh0b.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1338987675-7388-1-git-send-email-vfr@lyx.org>
Vincent van Ravesteijn <vfr@lyx.org> writes:
Show 5 quoted lines
> 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 <vfr@lyx.org> > ---
Hrm, I'd prefer to see anything that involves RUNTIME_PREFIX first tested in msysgit tree and then fed to me through them.
Thanks.
Show 24 quoted lines
> 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");