[gimp/gimp-2-8] Bug 721482 - Make language codes relocatable

[Sven Claussner <sclaussner src gnome org>]

commit ef0ef921b8dcb49ee82acba6540b69e6617c65d9
Author: Sven Claussner <sclaussner src gnome org>
Date:   Sun Sep 14 14:43:58 2014 +0200

    Bug 721482 - Make language codes relocatable
    
    Although all translation files are in the OS X bundle GIMP didn't
    recognize other languages than the system's language and English (en_US)
    on OS X on other machines. It searched the language code file from the
    iso-codes package (iso_639.xml) in the build prefix which is usually not
    existing on other machines.
    This commit puts that file into the OS X bundle and makes GIMP search
    for it there.

 app/widgets/gimplanguagestore-parser.c |    2 +-
 build/osx/gimp-2.8-python.bundle       |    2 ++
 build/osx/gimp-master-python.bundle    |    2 ++
 3 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/app/widgets/gimplanguagestore-parser.c b/app/widgets/gimplanguagestore-parser.c
old mode 100644
new mode 100755
index 59c31ea..544cb9f
--- a/app/widgets/gimplanguagestore-parser.c
+++ b/app/widgets/gimplanguagestore-parser.c
@@ -116,7 +116,7 @@ gimp_language_store_parse_iso_codes (GimpLanguageStore  *store,
 
   xml_parser = gimp_xml_parser_new (&markup_parser, &parser);
 
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) || defined (PLATFORM_OSX)
   filename = g_build_filename (gimp_data_directory (),
                                "..", "..", "xml", "iso-codes", "iso_639.xml",
                                NULL);
diff --git a/build/osx/gimp-2.8-python.bundle b/build/osx/gimp-2.8-python.bundle
old mode 100644
new mode 100755
index 475853c..d4a2069
--- a/build/osx/gimp-2.8-python.bundle
+++ b/build/osx/gimp-2.8-python.bundle
@@ -125,6 +125,8 @@
        </binary>
 
        <!-- Translations -->
+       <data>${prefix}/share/xml/iso-codes/iso_639.xml</data>
+
        <!-- - GIMP and GEGL translations - -->
        <translations name="gegl-0.2">${prefix}/share/locale</translations>
        <translations name="gimp20-libgimp">${prefix}/share/locale</translations>
diff --git a/build/osx/gimp-master-python.bundle b/build/osx/gimp-master-python.bundle
index 509f33d..ad89d00 100644
--- a/build/osx/gimp-master-python.bundle
+++ b/build/osx/gimp-master-python.bundle
@@ -126,6 +126,8 @@
        </binary>
 
        <!-- Translations -->
+       <data>${prefix}/share/xml/iso-codes/iso_639.xml</data>
+
        <!-- - GIMP and GEGL translations - -->
        <translations name="gegl-0.3">${prefix}/share/locale</translations>
        <translations name="gimp20-libgimp">${prefix}/share/locale</translations>