resolve merge

Author: jxmorris12

language_tool_python/server.py

@@ -66,7 +66,8 @@ def __init__(self, language=None, motherTongue=None, remote_server=None, newSpel
         self.disabled_categories = set()
         self.enabled_categories = set()
         self.enabled_rules_only = False
-    
+        self.preferred_variants = set()
+
     def __enter__(self):
         return self
 
@@ -134,7 +135,8 @@ def _create_params(self, text: str) -> Dict[str, str]:
             params['disabledCategories'] = ','.join(self.disabled_categories)
         if self.enabled_categories:
             params['enabledCategories'] = ','.join(self.enabled_categories)
-        # return urllib.parse.urlencode(params).encode()
+        if self.preferred_variants:
+            params['preferredVariants'] = ','.join(self.preferred_variants)
         return params
 
     def correct(self, text: str) -> str:
@@ -187,6 +189,7 @@ def _get_languages(self) -> set:
         for e in self._query_server(url, num_tries=1):
             languages.add(e.get('code'))
             languages.add(e.get('longCode'))
+        languages.add("auto")
         return languages
 
     def _start_server_if_needed(self):

tests/test_major_functionality.py

@@ -36,7 +36,7 @@ def test_process_starts_and_closes():
 def test_langtool_languages():
 	import language_tool_python
 	lang_tool = language_tool_python.LanguageTool("en-US")
-	assert lang_tool._get_languages() == {'es-AR', 'ta-IN', 'en-CA', 'da', 'eo', 'pt-AO', 'de', 'gl', 'ru-RU', 'de-DE', 'en', 'br', 'en-ZA', 'pt-MZ', 'ast-ES', 'sk-SK', 'en-AU', 'ta', 'ga', 'be', 'pl', 'tl-PH', 'sl', 'ar', 'es', 'sl-SI', 'en-NZ', 'el', 'el-GR', 'ru', 'zh-CN', 'en-GB', 'be-BY', 'pl-PL', 'km-KH', 'pt', 'uk-UA', 'ca', 'de-DE-x-simple-language', 'ro', 'ca-ES', 'de-CH', 'ja-JP', 'tl', 'pt-PT', 'gl-ES', 'pt-BR', 'km', 'ga-IE', 'ja', 'sv', 'sk', 'en-US', 'de-AT', 'ca-ES-valencia', 'uk', 'it', 'zh', 'br-FR', 'da-DK', 'ast', 'fr', 'fa', 'nl', 'ro-RO', 'nl-BE'}
+	assert lang_tool._get_languages() == {'es-AR', 'ta-IN', 'en-CA', 'da', 'eo', 'pt-AO', 'de', 'gl', 'ru-RU', 'de-DE', 'en', 'br', 'en-ZA', 'pt-MZ', 'ast-ES', 'sk-SK', 'en-AU', 'ta', 'ga', 'be', 'pl', 'tl-PH', 'sl', 'ar', 'es', 'sl-SI', 'en-NZ', 'el', 'el-GR', 'ru', 'zh-CN', 'en-GB', 'be-BY', 'pl-PL', 'km-KH', 'pt', 'uk-UA', 'ca', 'de-DE-x-simple-language', 'ro', 'ca-ES', 'de-CH', 'ja-JP', 'tl', 'pt-PT', 'gl-ES', 'pt-BR', 'km', 'ga-IE', 'ja', 'sv', 'sk', 'en-US', 'de-AT', 'ca-ES-valencia', 'uk', 'it', 'zh', 'br-FR', 'da-DK', 'ast', 'fr', 'fa', 'nl', 'ro-RO', 'nl-BE', 'auto'}
 
 def test_match():
 	import language_tool_python