Allow locale dir not to be harcoded into binary. Fixes bug #128906.

2004-05-18  Padraig O'Briain  <padraig.obriain@sun.com>

	* atk/atkobject.c: Allow locale dir not to be harcoded into binary.
	Fixes bug #128906.

diff --git a/ChangeLog b/ChangeLog
index 9346e31..ad6d5d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-18  Padraig O'Briain  <padraig.obriain@sun.com>
+
+       * atk/atkobject.c: Allow locale dir not to be harcoded into binary.
+       Fixes bug #128906.
+
 2004-05-11  Padraig O'Briain  <padraig.obriain@sun.com>
 
        * atk/atkobject.c: Make extra_roles static.

diff --git a/atk/atkobject.c b/atk/atkobject.c
index 1643125..65d1901 100755 (executable)
--- a/atk/atkobject.c
+++ b/atk/atkobject.c
@@ -1318,9 +1318,13 @@ atk_role_get_localized_name (AtkRole role)
 #ifdef ENABLE_NLS
   if (!gettext_initialized)
     {
+      const char *dir = g_getenv ("ATK_ALT_LOCALEDIR");
+
       gettext_initialized = TRUE;
+      if (dir == NULL)
+        dir = ATK_LOCALEDIR;
 
-      bindtextdomain (GETTEXT_PACKAGE, ATK_LOCALEDIR);
+      bindtextdomain (GETTEXT_PACKAGE, dir);
 #ifdef HAVE_BIND_TEXTDOMAIN_CODESET
       bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 #endif