diff options
| author | tilly-Q <nattilypigeonfowl@gmail.com> | 2014-05-12 17:14:55 -0400 |
|---|---|---|
| committer | tilly-Q <nattilypigeonfowl@gmail.com> | 2014-05-12 17:14:55 -0400 |
| commit | f14519c398c6c725ee4a1057f52c1404e7d1dd84 (patch) | |
| tree | e7e8872badb91a6d74745887bbcb1d9392b9dc73 /mediagoblin/user_pages | |
| parent | 8524a6bdc575312b35df6e6aa3118ed139303d72 (diff) | |
| parent | acfcaf6366bd4695c1c37c7aa8ff5a176b412e2a (diff) | |
| download | mediagoblin-f14519c398c6c725ee4a1057f52c1404e7d1dd84.tar.lz mediagoblin-f14519c398c6c725ee4a1057f52c1404e7d1dd84.tar.xz mediagoblin-f14519c398c6c725ee4a1057f52c1404e7d1dd84.zip | |
Merge branch 'metadata' of gitorious.org:mediagoblin/cwebbers-mediagoblin into metadata
Conflicts:
mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html
Diffstat (limited to 'mediagoblin/user_pages')
| -rw-r--r-- | mediagoblin/user_pages/lib.py | 3 | ||||
| -rw-r--r-- | mediagoblin/user_pages/views.py | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/mediagoblin/user_pages/lib.py b/mediagoblin/user_pages/lib.py index 83a99cee..e5c8defc 100644 --- a/mediagoblin/user_pages/lib.py +++ b/mediagoblin/user_pages/lib.py @@ -116,6 +116,3 @@ def build_report_object(report_form, media_entry=None, comment=None): report_object.reporter_id = report_form.reporter_id.data return report_object -def rdfa_to_readable(rdfa_predicate): - readable = rdfa_predicate.split(u":")[1].capitalize() - return readable diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index f42eae1f..78751a28 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -28,7 +28,7 @@ from mediagoblin.tools.translate import pass_to_ugettext as _ from mediagoblin.tools.pagination import Pagination from mediagoblin.user_pages import forms as user_forms from mediagoblin.user_pages.lib import (send_comment_email, - add_media_to_collection, build_report_object, rdfa_to_readable) + add_media_to_collection, build_report_object) from mediagoblin.notifications import trigger_notification, \ add_comment_subscription, mark_comment_notification_seen from mediagoblin.tools.pluginapi import hook_transform @@ -152,8 +152,7 @@ def media_home(request, media, page, **kwargs): 'comments': comments, 'pagination': pagination, 'comment_form': comment_form, - 'app_config': mg_globals.app_config, - 'rdfa_to_readable':rdfa_to_readable} + 'app_config': mg_globals.app_config} # Since the media template name gets swapped out for each media # type, normal context hooks don't work if you want to affect all |