Make session.default_language set/get work

[zzz-pokedex.git] / pokedex / db / multilang.py

diff --git a/pokedex/db/multilang.py b/pokedex/db/multilang.py
index 8e067c6..b5f87e4 100644 (file)
--- a/pokedex/db/multilang.py
+++ b/pokedex/db/multilang.py
@@ -77,9 +77,11 @@ def create_translation_table(_table_name, foreign_class, relation_name,
     # Create the table object
     table = Table(_table_name, foreign_class.__table__.metadata,
         Column(foreign_key_name, Integer, ForeignKey(foreign_class.id),
     # Create the table object
     table = Table(_table_name, foreign_class.__table__.metadata,
         Column(foreign_key_name, Integer, ForeignKey(foreign_class.id),

-            primary_key=True, nullable=False),
+            primary_key=True, nullable=False,
+            info=dict(description="ID of the %s these texts relate to" % foreign_class.__singlename__)),

         Column('local_language_id', Integer, ForeignKey(language_class.id),
         Column('local_language_id', Integer, ForeignKey(language_class.id),

-            primary_key=True, nullable=False),
+            primary_key=True, nullable=False,
+            info=dict(description="Language these texts are in")),

     )
     Translations.__table__ = table
 
     )
     Translations.__table__ = table
 


@@ -157,12 +159,15 @@ class MultilangSession(Session):
 
     @property
     def default_language(self):
 
     @property
     def default_language(self):

-        # XXX need to get the right mapped class for this to work
-        raise NotImplementedError
+        # Need to import tables here to avoid a circular dependency
+        from pokedex.db import tables
+        query = self.query(tables.Language)
+        query = query.filter_by(id=self._default_language_id)
+        return query.one()

 
     @default_language.setter
     def default_language(self, new):
 
     @default_language.setter
     def default_language(self, new):

-        self._default_language_id = new#.id
+        self._default_language_id = new.id

 
     @default_language.deleter
     def default_language(self):
 
     @default_language.deleter
     def default_language(self):