Skip to content
This repository
Browse code

Merged upstream

  • Loading branch information...
commit f2be304c8614838bb837e9189e9306ac115d79c7 2 parents 5834fd2 + fb49298
David Sauve authored

Showing 2 changed files with 6 additions and 2 deletions. Show diff stats Hide diff stats

  1. +4 0 AUTHORS
  2. +2 2 xapian_backend.py
4 AUTHORS
@@ -26,5 +26,9 @@ Thanks to:
26 26 * glassresistor for assistance troubleshooting an issue with boosting a phrase query & a patch to make weighting schemes overridable.
27 27 * James Addison for helping to debug an intermittent issue with `order_by` and `build_schema`.
28 28 * Michael Opitz for a patch that enables support for `inmemorydb`.
  29 +<<<<<<< HEAD
29 30 * Evgeniy Kirov for a patch that adds `HAYSTACK_XAPIAN_LANGUAGE` used for setting the stemming language.
30 31 * domasx2 for a patch that explicitly closes the database when not in use.
  32 +=======
  33 + * Evgeniy Kirov for a patch that adds `HAYSTACK_XAPIAN_LANGUAGE` used for setting the stemming language.
  34 +>>>>>>> fb4929854070f88e40896799a09c0781a3d3d562
4 xapian_backend.py
@@ -128,7 +128,7 @@ class XapianSearchBackend(BaseSearchBackend):
128 128 """
129 129 inmemory_db = None
130 130
131   - def __init__(self, connection_alias, language='english', **connection_options):
  131 + def __init__(self, connection_alias, **connection_options):
132 132 """
133 133 Instantiates an instance of `SearchBackend`.
134 134
@@ -151,7 +151,7 @@ def __init__(self, connection_alias, language='english', **connection_options):
151 151 os.makedirs(self.path)
152 152
153 153 self.flags = connection_options.get('FLAGS', DEFAULT_XAPIAN_FLAGS)
154   - self.language = language
  154 + self.language = getattr(settings, 'HAYSTACK_XAPIAN_LANGUAGE', 'english')
155 155 self._schema = None
156 156 self._content_field_name = None
157 157

0 comments on commit f2be304

Please sign in to comment.
Something went wrong with that request. Please try again.