Moved get_license_data to mixin.py, added license to sql media model, added translati...

diff --git a/mediagoblin/db/mixin.py b/mediagoblin/db/mixin.py
index 5145289efbe56530ed59a2de5b360613289bb5cc..b0fecad3f31a41009df13f50778e19e1d6059932 100644 (file)
--- a/mediagoblin/db/mixin.py
+++ b/mediagoblin/db/mixin.py
@@ -28,7 +28,7 @@ real objects.
 """
 
 from mediagoblin.auth import lib as auth_lib
-from mediagoblin.tools import common
+from mediagoblin.tools import common, licenses
 
 
 class UserMixin(object):
@@ -90,3 +90,7 @@ class MediaEntryMixin(object):
         """
         if self['fail_error']:
             return common.import_component(self['fail_error'])
+
+    def get_license_data(self):
+        """Return license dict for requested license"""
+        return licenses.SUPPORTED_LICENSES[self.license]

diff --git a/mediagoblin/db/mongo/models.py b/mediagoblin/db/mongo/models.py
index a95cde7dbd8c6c1c85f6ab854e7aab431adde402..56ed7dcf34dc54bde94374babb53929e36a35af4 100644 (file)
--- a/mediagoblin/db/mongo/models.py
+++ b/mediagoblin/db/mongo/models.py
@@ -22,7 +22,7 @@ from mediagoblin import mg_globals
 from mediagoblin.db.mongo import migrations
 from mediagoblin.db.mongo.util import ASCENDING, DESCENDING, ObjectId
 from mediagoblin.tools.pagination import Pagination
-from mediagoblin.tools import url, licenses
+from mediagoblin.tools import url
 from mediagoblin.db.mixin import UserMixin, MediaEntryMixin
 
 ###################
@@ -252,10 +252,6 @@ class MediaEntry(Document, MediaEntryMixin):
         for media in cursor:
             return media.url_for_self(urlgen)
 
-    def get_license_data(self):
-        """Return license dict for requested license"""
-        return licenses.SUPPORTED_LICENSES[self['license']]
-
     @property
     def get_uploader(self):
         return self.db.User.find_one({'_id': self.uploader})

diff --git a/mediagoblin/db/sql/models.py b/mediagoblin/db/sql/models.py
index 91092f332fd68ec99e3c5d101ceaf03133e4975b..e07963ca3552edfaaf553c64a3c8e07c6bd17e54 100644 (file)
--- a/mediagoblin/db/sql/models.py
+++ b/mediagoblin/db/sql/models.py
@@ -64,6 +64,7 @@ class MediaEntry(Base, MediaEntryMixin):
     description_html = Column(UnicodeText) # ??
     media_type = Column(Unicode, nullable=False)
     state = Column(Unicode, nullable=False) # or use sqlalchemy.types.Enum?
+    license = Column(Unicode, nullable=False)
     
     fail_error = Column(Unicode)
     fail_metadata = Column(UnicodeText)

diff --git a/mediagoblin/templates/mediagoblin/utils/license.html b/mediagoblin/templates/mediagoblin/utils/license.html
index 314810181e92163fd1ab6682322cec6a43418db7..056c356ee24dc04847cbd54a991f49d55fc3db20 100644 (file)
--- a/mediagoblin/templates/mediagoblin/utils/license.html
+++ b/mediagoblin/templates/mediagoblin/utils/license.html
@@ -17,10 +17,10 @@
 #}
 
 {% block license_content -%}
-  License: 
-  {% if media['license'] %}
-  <a href="{{ media['license'] }}">{{ media.get_license_data()['abbreviation'] }}</a>
+  {% trans %}License:{% endtrans %}
+  {% if media.license %}
+  <a href="{{ media.license }}">{{ media.get_license_data().abbreviation }}</a>
   {% else %}
-  All rights reserved
+  {% trans %}All rights reserved{% endtrans %}
   {% endif %}
 {% endblock %}