From 05c3c3e76cc738c3b7e2b2cac4ce1c709922bf9b Mon Sep 17 00:00:00 2001
From: Torsten Paul <Torsten.Paul@gmx.de>
Date: Sat, 18 Oct 2014 22:25:25 +0200
Subject: [PATCH] Add gettext to new dialogs.

---
 src/FontListDialog.cc   | 1 +
 src/FontListDialog.h    | 1 +
 src/LibraryInfoDialog.h | 2 ++
 src/launchingscreen.h   | 2 ++
 src/openscad.cc         | 9 ++-------
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/FontListDialog.cc b/src/FontListDialog.cc
index bfa3c8e5..0ee7ef59 100644
--- a/src/FontListDialog.cc
+++ b/src/FontListDialog.cc
@@ -27,6 +27,7 @@
 #include <QClipboard>
 #include <QSortFilterProxyModel>
 
+#include "qtgettext.h"
 #include "FontListDialog.h"
 #include "FontCache.h"
 
diff --git a/src/FontListDialog.h b/src/FontListDialog.h
index 10010995..9f9a2532 100644
--- a/src/FontListDialog.h
+++ b/src/FontListDialog.h
@@ -3,6 +3,7 @@
 #include <QStandardItemModel>
 #include <QSortFilterProxyModel>
 
+#include "qtgettext.h"
 #include "ui_FontListDialog.h"
 
 #define STRINGIFY(x) #x
diff --git a/src/LibraryInfoDialog.h b/src/LibraryInfoDialog.h
index b0465ca6..a47e0879 100644
--- a/src/LibraryInfoDialog.h
+++ b/src/LibraryInfoDialog.h
@@ -2,6 +2,8 @@
 
 #include <QDialog>
 #include <QString>
+
+#include "qtgettext.h"
 #include "ui_LibraryInfoDialog.h"
 
 class LibraryInfoDialog : public QDialog, public Ui::LibraryInfoDialog
diff --git a/src/launchingscreen.h b/src/launchingscreen.h
index bbf764bb..d28aae34 100644
--- a/src/launchingscreen.h
+++ b/src/launchingscreen.h
@@ -3,6 +3,8 @@
 #include <QString>
 #include <QDialog>
 #include <QTreeWidgetItem>
+
+#include "qtgettext.h"
 #include "ui_launchingscreen.h"
 
 class LaunchingScreen : public QDialog, public Ui::LaunchingScreen
diff --git a/src/openscad.cc b/src/openscad.cc
index 1fae5439..b65ed057 100644
--- a/src/openscad.cc
+++ b/src/openscad.cc
@@ -168,7 +168,7 @@ void localization_init() {
 	std::string locale_path(po_dir.string());
 #endif
 	if (fs::is_directory(locale_path)) {
-		setlocale(LC_ALL,"");
+		setlocale(LC_ALL, "");
 		bindtextdomain("openscad", locale_path.c_str());
 		bind_textdomain_codeset("openscad", "UTF-8");
 		textdomain("openscad");
@@ -581,7 +581,7 @@ int gui(vector<string> &inputFiles, const fs::path &original_path, int argc, cha
 	parser_init(PlatformUtils::applicationPath());
 
 	QSettings settings;
-	if (settings.value("advanced/localization", false).toBool()) {
+	if (settings.value("advanced/localization", true).toBool()) {
 	        localization_init();
 	}
 
@@ -657,11 +657,6 @@ int main(int argc, char **argv)
 	PlatformUtils::ensureStdIO();
 #endif
 
-	setlocale(LC_ALL,"");
-	bindtextdomain("openscad","./po");
-	bind_textdomain_codeset("openscad", "UTF-8");
-	textdomain("openscad");
-
 #ifdef ENABLE_CGAL
 	// Causes CGAL errors to abort directly instead of throwing exceptions
 	// (which we don't catch). This gives us stack traces without rerunning in gdb.