Merge pull request #459 from pehas/master

Update languages.py

lettuce/django/server.py

@@ -35,11 +35,15 @@ try:
     from django.core.servers.basehttp import AdminMediaHandler
 except ImportError:
     AdminMediaHandler = None
-try:
-    from django.contrib.staticfiles.handlers import StaticFilesHandler
-except ImportError:
+    
+if 'django.contrib.staticfiles' in settings.INSTALLED_APPS:
+    try:
+        from django.contrib.staticfiles.handlers import StaticFilesHandler
+    except ImportError:
+        StaticFilesHandler = None
+else:
     StaticFilesHandler = None
-
+    
 try:
     from django.utils.six.moves import socketserver
 except ImportError:

lettuce/languages.py

@@ -145,7 +145,7 @@ LANGUAGES = {
         'scenario': u'Сценарий',
         'scenario_outline': u'Структура сценария',
         'scenario_separator': u'(Структура сценария|Сценарий)',
-        'background': u'(?:Background)',
+        'background': u'(?:Background|Предыстория)',
     },
     'uk': {
         'examples': u'Приклади|Сценарії',