[orca/gnome-3-16] Use datadir and localedir and not DATADIRNAME

[Joanmarie Diggs <joanied src gnome org>]

commit 42712ba09dd5878fcb7dea3cd698c2385c0e9d16
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Tue Mar 24 11:48:17 2015 -0400

    Use datadir and localedir and not DATADIRNAME
    
    This is needed to work with intltool 0.51 and still works with 0.50
    https://bazaar.launchpad.net/~intltool/intltool/trunk/revision/742

 src/orca/orca.py             |    3 +--
 src/orca/orca_gui_find.py    |    3 +--
 src/orca/orca_i18n.py.in     |    2 +-
 src/orca/orca_platform.py.in |    4 ++--
 4 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/src/orca/orca.py b/src/orca/orca.py
index f48280e..1df6780 100644
--- a/src/orca/orca.py
+++ b/src/orca/orca.py
@@ -505,8 +505,7 @@ def _showPreferencesUI(script, prefs):
         debug.printException(debug.LEVEL_SEVERE)
         return
 
-    uiFile = os.path.join(orca_platform.prefix,
-                          orca_platform.datadirname,
+    uiFile = os.path.join(orca_platform.datadir,
                           orca_platform.package,
                           "ui",
                           "orca-setup.ui")
diff --git a/src/orca/orca_gui_find.py b/src/orca/orca_gui_find.py
index ffad748..693a2be 100644
--- a/src/orca/orca_gui_find.py
+++ b/src/orca/orca_gui_find.py
@@ -232,8 +232,7 @@ def showFindUI():
     global OS
 
     if not OS:
-        uiFile = os.path.join(orca_platform.prefix,
-                              orca_platform.datadirname,
+        uiFile = os.path.join(orca_platform.datadir,
                               orca_platform.package,
                               "ui",
                               "orca-find.ui")
diff --git a/src/orca/orca_i18n.py.in b/src/orca/orca_i18n.py.in
index 5731603..33872cd 100644
--- a/src/orca/orca_i18n.py.in
+++ b/src/orca/orca_i18n.py.in
@@ -36,7 +36,7 @@ cgettext = gettext.gettext
 
 # Tell gettext where to find localized strings.
 #
-localedir = os.path.join ("@prefix@", "@DATADIRNAME@", "locale")
+localedir = "@localedir@".replace('${prefix}', '@prefix@')
 gettext.bindtextdomain ("@GETTEXT_PACKAGE@", localedir)
 gettext.textdomain("orca")
 
diff --git a/src/orca/orca_platform.py.in b/src/orca/orca_platform.py.in
index 7d23826..d0171eb 100644
--- a/src/orca/orca_platform.py.in
+++ b/src/orca/orca_platform.py.in
@@ -38,9 +38,9 @@ prefix      = "@prefix@"
 #
 package     = "@PACKAGE@"
 
-# The name of the data directory (usually "share").
+# The location of the data directory (usually "share").
 #
-datadirname = "@DATADIRNAME@"
+datadir = "@datadir@".replace('${prefix}', '@prefix@')
 
 # The directory where we could find liblouis translation tables.
 #