Merge branch 'master' of github.com:jxmorris12/language-tool-python

Author: jxmorris12

language_tool_python/match.py

@@ -1,3 +1,4 @@
+import unicodedata
 from collections import OrderedDict
 from functools import total_ordering
 
@@ -56,6 +57,8 @@ def __init__(self, attrib):
         attrib['replacements'] = [r['value'] for r in attrib['replacements']]
         # Rename error length.
         attrib['errorLength'] = attrib['length']
+        # Normalize unicode
+        attrib['message'] = unicodedata.normalize("NFKC", attrib['message'])
         # Store objects on self.
         for k, v in attrib.items():
             setattr(self, k, v)

language_tool_python/server.py

@@ -36,9 +36,6 @@ class LanguageTool:
     def __init__(self, language=None, motherTongue=None, remote_server=None, newSpellings=None, new_spellings_persist=True):
         self._new_spellings = None
         self._new_spellings_persist = new_spellings_persist
-        if newSpellings:
-            self._new_spellings = newSpellings
-            self._register_spellings(self._new_spellings)
         if remote_server is not None:
             self._remote = True
             self._url = parse_url(remote_server)
@@ -51,6 +48,9 @@ def __init__(self, language=None, motherTongue=None, remote_server=None, newSpel
                 language = get_locale_language()
             except ValueError:
                 language = FAILSAFE_LANGUAGE
+        if newSpellings:
+            self._new_spellings = newSpellings
+            self._register_spellings(self._new_spellings)
         self._language = LanguageTag(language, self._get_languages())
         self.motherTongue = motherTongue
         self.disabled_rules = set()