Make MultilangSession's language class configurable

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

diff --git a/pokedex/db/multilang.py b/pokedex/db/multilang.py
index f3438dd..6690b8a 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),
-            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),
-            primary_key=True, nullable=False),
+            primary_key=True, nullable=False,
+            info=dict(description="Language these texts are in")),
     )
     Translations.__table__ = table
 
@@ -145,6 +147,9 @@ def create_translation_table(_table_name, foreign_class, relation_name,
         setattr(foreign_class, name + '_map',
             association_proxy(relation_name, name, creator=creator))
 
+    # Add to the list of translation classes
+    foreign_class.translation_classes.append(Translations)
+
     # Done
     return Translations
 
@@ -152,14 +157,27 @@ class MultilangSession(Session):
     """A tiny Session subclass that adds support for a default language."""
     _default_language_id = 9  # English.  XXX magic constant
 
+    def __init__(self, *args, **kwargs):
+        try:
+            self.language_class = kwargs.pop('language_class')
+        except KeyError:
+            # Set the default language_class
+            # We need to import here, to prevent a circular depencency
+            from pokedex.db.tables import Language
+            self.language_class = Language
+        super(MultilangSession, self).__init__(*args, **kwargs)
+
     @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(self.language_class)
+        query = query.filter_by(id=self._default_language_id)
+        return query.one()
 
     @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):