[brubru] Load LOCALEDIR from configure (with defs.py). see #4770
This commit is contained in:
parent
ef25dd10d7
commit
ba9836af65
|
@ -176,6 +176,7 @@ AC_SUBST([PYTHON_INCLUDES])
|
||||||
AS_AC_EXPAND(DATADIR, "${datadir}")
|
AS_AC_EXPAND(DATADIR, "${datadir}")
|
||||||
AS_AC_EXPAND(LIBDIR, "${libdir}")
|
AS_AC_EXPAND(LIBDIR, "${libdir}")
|
||||||
AS_AC_EXPAND(DOCDIR, "${docdir}")
|
AS_AC_EXPAND(DOCDIR, "${docdir}")
|
||||||
|
AS_AC_EXPAND(LOCALEDIR, "${localedir}")
|
||||||
|
|
||||||
AC_SUBST(VERSION)
|
AC_SUBST(VERSION)
|
||||||
AC_SUBST(PACKAGE)
|
AC_SUBST(PACKAGE)
|
||||||
|
|
|
@ -5,3 +5,5 @@ docdir = "@DOCDIR@"
|
||||||
datadir = "@DATADIR@"
|
datadir = "@DATADIR@"
|
||||||
|
|
||||||
version = "@VERSION@"
|
version = "@VERSION@"
|
||||||
|
|
||||||
|
localedir = "@LOCALEDIR@"
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
|
|
||||||
docdir = '../'
|
docdir = '../'
|
||||||
datadir = '../'
|
datadir = '../'
|
||||||
|
localedir = '../po'
|
||||||
|
|
||||||
version = '0.12.1.2-svn'
|
version = '0.12.1.2-svn'
|
||||||
|
|
||||||
|
|
|
@ -24,12 +24,10 @@
|
||||||
import locale
|
import locale
|
||||||
import gettext
|
import gettext
|
||||||
import os
|
import os
|
||||||
|
import defs
|
||||||
|
|
||||||
APP = 'gajim'
|
APP = 'gajim'
|
||||||
if os.path.isdir('../po'):
|
DIR = defs.localedir
|
||||||
DIR = '../po'
|
|
||||||
else:
|
|
||||||
DIR = '../../locale'
|
|
||||||
|
|
||||||
# set '' so each part of the locale that should be modified is set
|
# set '' so each part of the locale that should be modified is set
|
||||||
# according to the environment variables
|
# according to the environment variables
|
||||||
|
|
Loading…
Reference in New Issue