Skip to content
Browse files

Merged upstream

  • Loading branch information...
2 parents 5834fd2 + fb49298 commit f2be304c8614838bb837e9189e9306ac115d79c7 @notanumber committed Apr 20, 2012
Showing with 6 additions and 2 deletions.
  1. +4 −0 AUTHORS
  2. +2 −2 xapian_backend.py
View
4 AUTHORS
@@ -26,5 +26,9 @@ Thanks to:
* glassresistor for assistance troubleshooting an issue with boosting a phrase query & a patch to make weighting schemes overridable.
* James Addison for helping to debug an intermittent issue with `order_by` and `build_schema`.
* Michael Opitz for a patch that enables support for `inmemorydb`.
+<<<<<<< HEAD
* Evgeniy Kirov for a patch that adds `HAYSTACK_XAPIAN_LANGUAGE` used for setting the stemming language.
* domasx2 for a patch that explicitly closes the database when not in use.
+=======
+ * Evgeniy Kirov for a patch that adds `HAYSTACK_XAPIAN_LANGUAGE` used for setting the stemming language.
+>>>>>>> fb4929854070f88e40896799a09c0781a3d3d562
View
4 xapian_backend.py
@@ -128,7 +128,7 @@ class XapianSearchBackend(BaseSearchBackend):
"""
inmemory_db = None
- def __init__(self, connection_alias, language='english', **connection_options):
+ def __init__(self, connection_alias, **connection_options):
"""
Instantiates an instance of `SearchBackend`.
@@ -151,7 +151,7 @@ def __init__(self, connection_alias, language='english', **connection_options):
os.makedirs(self.path)
self.flags = connection_options.get('FLAGS', DEFAULT_XAPIAN_FLAGS)
- self.language = language
+ self.language = getattr(settings, 'HAYSTACK_XAPIAN_LANGUAGE', 'english')
self._schema = None
self._content_field_name = None

0 comments on commit f2be304

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