Skip to content

Commit 64cadec

Browse files
committed
Fix regressions introduced from merge with 0.14 master
1 parent b813124 commit 64cadec

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

kalite/settings/base.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -466,9 +466,6 @@
466466
SESSION_COOKIE_AGE = 60 * 30 # 30 minutes
467467
SESSION_SAVE_EVERY_REQUEST = True
468468

469-
# Expire session cookies whenever we close the browser.
470-
SESSION_EXPIRE_AT_BROWSER_CLOSE = True
471-
472469
# Use our custom message storage to avoid adding duplicate messages
473470
MESSAGE_STORAGE = 'fle_utils.django_utils.classes.NoDuplicateMessagesSessionStorage'
474471

kalite/updates/management/commands/languagepackdownload.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ def handle(self, *args, **options):
101101
self.next_stage(_("Invalidate caches"))
102102
caching.invalidate_all_caches()
103103

104-
self.complete((_("Finished processing language pack %(lang_name)s.") % {"lang_name": get_language_name(lang_code)}) +
105-
" Please restart the server to complete installation of the language pack.")
104+
self.complete(_("Finished processing language pack %(lang_name)s.") % {"lang_name": get_language_name(lang_code)})
106105
except Exception as e:
107106
self.cancel(stage_status="error", notes=_("Error: %(error_msg)s") % {"error_msg": unicode(e)})
108107
raise

0 commit comments

Comments
 (0)