Some adjustment to make gettext able to find his translation files under windows.

diff --git a/configure.ac b/configure.ac
index c895c604e55cf7a5ce0dedd304d3f72fad429f9a..1d3ca477c9891bf2b418c0d3f20657e48ac21aba 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -82,29 +82,29 @@ AM_CONDITIONAL(PLATFORM_WIN32, [test $platform_win32 = yes])
 
 # Output files
 AC_CONFIG_FILES([
-  libgtkform.pc
-  libgtkformui.pc
-  Makefile
-  libgtkform/Makefile
-  libgtkformui/Makefile
-  libgtkformui/test/Makefile
-  test/Makefile
-  docs/Makefile
-  docs/reference/Makefile
-  docs/reference/version.xml
-  data/Makefile
-  po/Makefile.in
+       libgtkform.pc
+       libgtkformui.pc
+       Makefile
+       libgtkform/Makefile
+       libgtkformui/Makefile
+       libgtkformui/test/Makefile
+       test/Makefile
+       docs/Makefile
+       docs/reference/Makefile
+       docs/reference/version.xml
+       data/Makefile
+       po/Makefile.in
 ])
 
 if test $GLADEUI_FOUND = yes; then
 AC_CONFIG_FILES([
-  libgtkformui/glade/Makefile
-  libgtkformui/glade/icons/Makefile
-  libgtkformui/glade/icons/hicolor/Makefile
-  libgtkformui/glade/icons/hicolor/16x16/Makefile
-  libgtkformui/glade/icons/hicolor/16x16/actions/Makefile
-  libgtkformui/glade/icons/hicolor/22x22/Makefile
-  libgtkformui/glade/icons/hicolor/22x22/actions/Makefile
+       libgtkformui/glade/Makefile
+       libgtkformui/glade/icons/Makefile
+       libgtkformui/glade/icons/hicolor/Makefile
+       libgtkformui/glade/icons/hicolor/16x16/Makefile
+       libgtkformui/glade/icons/hicolor/16x16/actions/Makefile
+       libgtkformui/glade/icons/hicolor/22x22/Makefile
+       libgtkformui/glade/icons/hicolor/22x22/actions/Makefile
 ])
 fi
 

diff --git a/libgtkform/form.c b/libgtkform/form.c
index 13a6acd16ed86935daf6590cdaeeb09598f05e01..a98a1054ac5589a161ac185a64e964e64f79324d 100644 (file)
--- a/libgtkform/form.c
+++ b/libgtkform/form.c
@@ -182,6 +182,8 @@ GtkForm
 {
        GtkForm *form;
 
+       gchar *localedir;
+
        form = GTK_FORM (g_object_new (gtk_form_get_type (), NULL));
        if (form == NULL)
                {
@@ -190,7 +192,36 @@ GtkForm
 
        setlocale (LC_ALL, "");
        gda_locale_changed ();
-       bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+
+#ifdef G_OS_WIN32
+
+       gchar *moddir;
+       gchar *p;
+
+       moddir = g_win32_get_package_installation_directory_of_module (NULL);
+
+       p = g_strrstr (moddir, g_strdup_printf ("%c", G_DIR_SEPARATOR));
+       if (p != NULL
+           && (g_ascii_strcasecmp (p + 1, "src") == 0
+               || g_ascii_strcasecmp (p + 1, ".libs") == 0))
+               {
+                       localedir = g_strdup (LOCALEDIR);
+               }
+       else
+               {
+                       localedir = g_build_filename (moddir, "share", "locale", NULL);
+               }
+
+       g_free (moddir);
+       g_free (p);
+
+#else
+
+       localedir = g_strdup (LOCALEDIR);
+
+#endif
+
+       bindtextdomain (GETTEXT_PACKAGE, localedir);
        textdomain (GETTEXT_PACKAGE);
        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
@@ -203,6 +234,8 @@ GtkForm
                        g_warning (_("Modules not supported by this operating system."));
                }
 
+       g_free (localedir);
+
        return form;
 }
 

diff --git a/libgtkformui/gtkformdecoder.c b/libgtkformui/gtkformdecoder.c
index 6c99c457ce2687f02e03e8b1fedc7ad70048bf05..b9fbcedfb688cc2f5ad0ecf0b77c09a73158d484 100644 (file)
--- a/libgtkformui/gtkformdecoder.c
+++ b/libgtkformui/gtkformdecoder.c
@@ -246,10 +246,42 @@ GtkWidget
 {
        GtkWidget *w = GTK_WIDGET (g_object_new (gtk_form_decoder_get_type (), NULL));
 
-       bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+       gchar *localedir;
+
+#ifdef G_OS_WIN32
+
+       gchar *moddir;
+       gchar *p;
+
+       moddir = g_win32_get_package_installation_directory_of_module (NULL);
+
+       p = g_strrstr (moddir, g_strdup_printf ("%c", G_DIR_SEPARATOR));
+       if (p != NULL
+           && (g_ascii_strcasecmp (p + 1, "src") == 0
+               || g_ascii_strcasecmp (p + 1, ".libs") == 0))
+               {
+                       localedir = g_strdup (LOCALEDIR);
+               }
+       else
+               {
+                       localedir = g_build_filename (moddir, "share", "locale", NULL);
+               }
+
+       g_free (moddir);
+       g_free (p);
+
+#else
+
+       localedir = g_strdup (LOCALEDIR);
+
+#endif
+
+       bindtextdomain (GETTEXT_PACKAGE, localedir);
        textdomain (GETTEXT_PACKAGE);
        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
+       g_free (localedir);
+
        return w;
 }