Fixed the gettext & locale initialization

freefoote · Nov 28, 2012 · c1ebee5 · c1ebee5
1 parent e9f8f11
commit c1ebee5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/i18n.h b/i18n.h
@@ -38,6 +38,9 @@
 # define dgettext(Domain,Message) (Message)
 # define dcgettext(Domain,Message,Type) (Message)
 # define bindtextdomain(Domain,Directory) (Domain)
+# define bind_textdomain_codeset(Domain,Codeset) (Domain)
 # define _(String) (String)
 # define N_(String) (String)
 #endif
+
+#define TEXTDOMAIN "gpscorrelate"
diff --git a/main-command.c b/main-command.c
@@ -207,9 +207,9 @@ static void FixDatestamp(const char* File, int AdjustmentHours, int AdjustmentMi
 
 int main(int argc, char** argv)
 {
-	/* Initialize gettext */
+	/* Initialize locale & gettext */
-	setlocale (LC_MESSAGES, "");
+	setlocale (LC_ALL, "");
-	textdomain("gpscorrelate");
+	textdomain(TEXTDOMAIN);
 
 	/* If you didn't pass any arguments... */
 	if (argc == 1)

diff --git a/main-gui.c b/main-gui.c
@@ -32,7 +32,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <locale.h>
 
 #include <gtk/gtk.h>
 
@@ -41,9 +40,9 @@
 
 int main(int argc, char* argv[])
 {
-	/* Initialize gettext */
+	/* Initialize gettext (gtk_init initializes the locale) */
-	setlocale (LC_MESSAGES, "");
+	textdomain(TEXTDOMAIN);
-	textdomain("gpscorrelate");
+	bind_textdomain_codeset(TEXTDOMAIN, "UTF-8");
 
 	/* Get GTK ready, as appropriate.
 	 * (We ignore passed parameters) */