From 9abe0194a62121674b4249d5cd4701adf79ed026 Mon Sep 17 00:00:00 2001 From: tkashkin Date: Mon, 16 Jul 2018 06:38:24 +0300 Subject: [PATCH] [ci skip] Yet anothed locale fix Former-commit-id: e26aef47b2ca2408db601ffcdaa70377db98f93c --- src/ProjectConfig.vala.in | 4 +++- src/app.vala | 2 +- src/meson.build | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ProjectConfig.vala.in b/src/ProjectConfig.vala.in index 8bd226c6..b115950a 100644 --- a/src/ProjectConfig.vala.in +++ b/src/ProjectConfig.vala.in @@ -5,7 +5,9 @@ namespace GameHub.ProjectConfig public const string GETTEXT_PACKAGE = @GETTEXT_PACKAGE@; public const string PROJECT_NAME = @PROJECT_NAME@; public const string VERSION = @VERSION@; - public const string INSTALL_PREFIX = @PREFIX@; + + public const string PREFIX = @PREFIX@; + public const string DATADIR = @DATADIR@; public const string RUNTIME = @RUNTIME@; } diff --git a/src/app.vala b/src/app.vala index a9d1996b..9251b2f1 100644 --- a/src/app.vala +++ b/src/app.vala @@ -39,7 +39,7 @@ namespace GameHub #endif Intl.setlocale(LocaleCategory.ALL, ""); - Intl.bindtextdomain(ProjectConfig.GETTEXT_PACKAGE, ProjectConfig.INSTALL_PREFIX + "/locale"); + Intl.bindtextdomain(ProjectConfig.GETTEXT_PACKAGE, ProjectConfig.DATADIR + "/locale"); Intl.bind_textdomain_codeset(ProjectConfig.GETTEXT_PACKAGE, "UTF-8"); Intl.textdomain(ProjectConfig.GETTEXT_PACKAGE); diff --git a/src/meson.build b/src/meson.build index 75f09a0a..1a956069 100644 --- a/src/meson.build +++ b/src/meson.build @@ -3,6 +3,7 @@ conf_data.set_quoted('PROJECT_NAME', meson.project_name()) conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name()) conf_data.set_quoted('VERSION', meson.project_version()) conf_data.set_quoted('PREFIX', get_option('prefix')) +conf_data.set_quoted('DATADIR', get_option('datadir')) conf_data.set_quoted('RUNTIME', get_option('runtime')) project_config = configure_file( input: 'ProjectConfig.vala.in',