X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/ec65b5ae366174912cedf0e263d425378220d70b..20b21d990ddf15995d05c64f6f354db0bad33b88:/pokedex/db/__init__.py

diff --git a/pokedex/db/__init__.py b/pokedex/db/__init__.py
index a6c8f6e..ea103e7 100644
--- a/pokedex/db/__init__.py
+++ b/pokedex/db/__init__.py
@@ -1,8 +1,8 @@
-from sqlalchemy import MetaData, Table, engine_from_config, orm
+from sqlalchemy import engine_from_config, orm
 
 from ..defaults import get_default_db_uri
-from .tables import metadata
-from .multilang import MultilangSession
+from .tables import Language, metadata
+from .multilang import MultilangSession, MultilangScopedSession
 
 
 def connect(uri=None, session_args={}, engine_args={}, engine_prefix=''):
@@ -41,7 +41,13 @@ def connect(uri=None, session_args={}, engine_args={}, engine_prefix=''):
 
     all_session_args = dict(autoflush=True, autocommit=False, bind=engine)
     all_session_args.update(session_args)
-    sm = orm.sessionmaker(class_=MultilangSession, **all_session_args)
-    session = orm.scoped_session(sm)
+    sm = orm.sessionmaker(class_=MultilangSession, language_class=Language,
+        **all_session_args)
+    session = MultilangScopedSession(sm)
+
+    # Default to English
+    session.default_language = session.query(Language) \
+        .filter_by(identifier=u'en') \
+        .one()
 
     return session