Changeset 875f8496f34c03c50ebd077fe94b3f4187dda497

Timestamp:

12/19/10 13:25:20 (2 years ago)

Author:

Nikita Zlobin <cook60020tmp@…>

Children:

7cf5b21d13c51379f83c4657e38c20e0127efb48

Parents:

b733d298146dd1255c9ba062fe985defec61dd7e

git-author:

Nikita Zlobin <cook60020tmp@mail.ru> / 2010-12-19T16:24:55Z+0500

git-committer:

Nikita Zlobin <cook60020tmp@mail.ru> / 2010-12-19T16:25:20Z+0500

Message:

i18n: Configurable locale dir

Files:

• gui/main.c (modified) (2 diffs)
• wscript (modified) (2 diffs)

gui/main.c

@@ -46 +46 @@
 
 #define GETTEXT_PACKAGE "gladish"
-#define PACKAGE_LOCALE_DIR "/usr/share/locale"
 
 #define ENABLE_NLS 1
@@ -85 +84 @@
 int main(int argc, char** argv)
 {
-  #ifdef ENABLE_NLS
-    bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
+  #if ENABLE_NLS
+    bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
     bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
     textdomain (GETTEXT_PACKAGE);

wscript

@@ -221 +221 @@
 
     conf.env['DATA_DIR'] = os.path.normpath(os.path.join(conf.env['PREFIX'], 'share', APPNAME))
+    conf.env['LOCALE_DIR'] = os.path.normpath(os.path.join(conf.env['PREFIX'], 'share', 'locale'))
 
     # write some parts of the configure environment to the config.h file
     conf.define('DATA_DIR', conf.env['DATA_DIR'])
+    conf.define('LOCALE_DIR', conf.env['LOCALE_DIR'])
     conf.define('PACKAGE_VERSION', VERSION)
     conf.define('DBUS_NAME_BASE', DBUS_NAME_BASE)
@@ -598 +600 @@
           pprint('CYAN', "Preparing translation '"+item[0]+"'")
           os.system("msgfmt ./po/"+po_list_item+" -o ./po/"+item[0]+".mo")
-          bld.install_as(('${PREFIX}/share/locale/'+item[0]+'/LC_MESSAGES/gladish.mo'), ('./po/'+item[0]+".mo"))
+          bld.install_as(('${LOCALE_DIR}/'+item[0]+'/LC_MESSAGES/gladish.mo'), ('./po/'+item[0]+".mo"))
 
 def get_tags_dirs():