From 0a0649a0db6c98de56ed2f2b82a0978784594bb2 Mon Sep 17 00:00:00 2001
From: Olivier Keshavjee <olivier.keshavjee@gmail.com>
Date: Mon, 6 Nov 2017 18:29:18 +0100
Subject: [PATCH] Fixes: Manuskript crashes when a wrong locale is set. See
 #188.

---
 manuskript/models/outlineModel.py      | 7 ++++++-
 manuskript/ui/editors/mainEditor.py    | 6 ++++--
 manuskript/ui/editors/mainEditor_ui.py | 5 ++---
 manuskript/ui/welcome.py               | 6 ++++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/manuskript/models/outlineModel.py b/manuskript/models/outlineModel.py
index 9b4f766..5261778 100644
--- a/manuskript/models/outlineModel.py
+++ b/manuskript/models/outlineModel.py
@@ -17,7 +17,12 @@ from lxml import etree as ET
 from manuskript.enums import Outline
 from manuskript.functions import mainWindow, toInt, wordCount, HTML2PlainText
 
-locale.setlocale(locale.LC_ALL, '')
+try:
+    locale.setlocale(locale.LC_ALL, '')
+except:
+    # Invalid locale, but not really a big deal because it's used only for
+    # number formating
+    pass
 import time, os
 
 
diff --git a/manuskript/ui/editors/mainEditor.py b/manuskript/ui/editors/mainEditor.py
index 16358b0..f4591fa 100644
--- a/manuskript/ui/editors/mainEditor.py
+++ b/manuskript/ui/editors/mainEditor.py
@@ -15,8 +15,10 @@ from manuskript.ui.editors.editorWidget import editorWidget
 from manuskript.ui.editors.fullScreenEditor import fullScreenEditor
 from manuskript.ui.editors.mainEditor_ui import Ui_mainEditor
 
-locale.setlocale(locale.LC_ALL, '')
-
+try:
+    locale.setlocale(locale.LC_ALL, '')
+except:
+    pass
 
 class mainEditor(QWidget, Ui_mainEditor):
     """
diff --git a/manuskript/ui/editors/mainEditor_ui.py b/manuskript/ui/editors/mainEditor_ui.py
index 269f0fc..45c8e6f 100644
--- a/manuskript/ui/editors/mainEditor_ui.py
+++ b/manuskript/ui/editors/mainEditor_ui.py
@@ -2,8 +2,7 @@
 
 # Form implementation generated from reading ui file 'manuskript/ui/editors/mainEditor_ui.ui'
 #
-# Created: Sat Oct 14 21:30:36 2017
-#      by: PyQt5 UI code generator 5.2.1
+# Created by: PyQt5 UI code generator 5.9
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -14,8 +13,8 @@ class Ui_mainEditor(object):
         mainEditor.setObjectName("mainEditor")
         mainEditor.resize(791, 319)
         self.verticalLayout = QtWidgets.QVBoxLayout(mainEditor)
-        self.verticalLayout.setSpacing(0)
         self.verticalLayout.setContentsMargins(0, 0, 0, 0)
+        self.verticalLayout.setSpacing(0)
         self.verticalLayout.setObjectName("verticalLayout")
         self.tabSplitter = tabSplitter(mainEditor)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Expanding)
diff --git a/manuskript/ui/welcome.py b/manuskript/ui/welcome.py
index c6d4c68..4b3286b 100644
--- a/manuskript/ui/welcome.py
+++ b/manuskript/ui/welcome.py
@@ -21,8 +21,10 @@ from manuskript.models.plotModel import plotModel
 from manuskript.models.worldModel import worldModel
 from manuskript.ui.welcome_ui import Ui_welcome
 
-locale.setlocale(locale.LC_ALL, '')
-
+try:
+    locale.setlocale(locale.LC_ALL, '')
+except:
+    pass
 
 class welcome(QWidget, Ui_welcome):
     def __init__(self, parent=None):