Merge branch 'master' into expiring_cc

pull/1/head
Raymond Yee 2013-04-26 08:58:47 -07:00
commit 7265488484
6 changed files with 40 additions and 4 deletions

View File

@ -83,7 +83,7 @@ registration.signals.user_activated.connect(handle_same_email_account)
def create_notice_types(app, created_models, verbosity, **kwargs):
notification.create_notice_type("comment_on_commented", _("Comment on Commented Work"), _("A comment has been received on a book that you've commented on."))
notification.create_notice_type("wishlist_comment", _("Wishlist Comment"), _("A comment has been received on one of your wishlist books."), default = 1)
notification.create_notice_type("wishlist_official_comment", _("Wishlist Comment"), _("An official comment has been received on one of your wishlist books."))
notification.create_notice_type("wishlist_official_comment", _("Wishlist Comment"), _("The author or publisher, or and Unglue.it staffer, has commented on one of your wishlist books."))
notification.create_notice_type("wishlist_work_claimed", _("Rights Holder is Active"), _("A rights holder has shown up for a book that you want unglued."), default = 1)
notification.create_notice_type("wishlist_active", _("New Campaign"), _("A book you've wishlisted has a newly launched campaign."))
notification.create_notice_type("wishlist_near_target", _("Campaign Near Target"), _("A book you want is near its ungluing target."))

View File

@ -1,4 +1,8 @@
{{ comment.user.username }} has official news about a book on your wishlist, {{ comment.content_object.title }}.
{% if comment.user.is_staff %}
Unglue.it staffer {{ comment.user.username }} has made a comment on {{ comment.content_object.title }} (a book on your Unglue.it wishlist):
{% else %}
{{ comment.user.username }}, the author or publisher of {{ comment.content_object.title }} (a book on your Unglue.it wishlist), has made a comment:
{% endif %}
{{ comment.comment }}

View File

@ -5,7 +5,11 @@
{% endblock %}
{% block comments_graphical %}
<a href="{% url supporter comment.user.username %}">{{ comment.user.username }}</a> has made an official comment on <a href="{% url work comment.content_object.id %}?tab=2">{{ comment.content_object.title }}</a>
{% if comment.user.is_staff %}
Unglue.it staffer <a href="{% url supporter comment.user.username %}">{{ comment.user.username }}</a> has commented on <a href="{% url work comment.content_object.id %}?tab=2">{{ comment.content_object.title }}</a>.
{% else %}
<a href="{% url supporter comment.user.username %}">{{ comment.user.username }}</a>, the author or publisher of <a href="{% url work comment.content_object.id %}?tab=2">{{ comment.content_object.title }}</a>, has commented on the campaign.
{% endif %}
{% endblock %}
{% block comments_textual %}

View File

@ -1 +1 @@
{{ comment.user.username }} has made an official comment on {{ comment.content_object.title }} at Unglue.it
News from {{ comment.user.username }} about {{ comment.content_object.title }}

View File

@ -0,0 +1,23 @@
=LDR 01021cam 2200301 a 4500
=006 m\\\\\\\\u\\\\\\\\
=007 cr mnu---
=008 \\\\\\s2012\\\\enkb\\\\\b\\\\000\0\eng\\
=020 \\$a9781906924720$a9781906924737$a9781906924744
=043 \\$af------
=082 00$a398.2/096$220
=090 00$aPL8010$b.F5 2012
=100 1\$aFinnegan, Ruth H.
=245 10$aOral literature in Africa $h[electronic resource] /$cRuth Finnegan.
=260 \\$aCambridge :$bOpenBook Publishers, $cc2012.
=300 \\$a1 online resource (xliii, 570 p.) :$bill. (some col.), col. map
=490 0\$aWorld Oral Literature Series, $x2050-7933 ;$vv.1
=500 \\$a "This unglued edition is freely available to download from our website and distributed under the terms of the Creative Commons CC-BY license"--p. [572]
=588 \\$aDescription based on online resource; title from ePub ed. t.p. (viewed Sept. 9, 2012)
=504 \\$aIncludes index and bibliographical references (p.511-546).
=650 \0$aFolk literature, African$xHistory and criticism.
=650 \0$aOral tradition$zAfrica.
=776 08$IPrint version: $aFinnegan, Ruth H.$tOral literature in Africa$z9781906924713$z9781906924706

View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?><marc:collection xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.loc.gov/MARC21/slim http://www.loc.gov/standards/marcxml/schema/MARC21slim.xsd">
<marc:record><marc:leader>01161cam a2200241 a 4500</marc:leader>
<marc:controlfield tag="006">m u </marc:controlfield>
<marc:controlfield tag="007">cr mnu---</marc:controlfield><marc:controlfield tag="008"> s2012 enkb b 000 0 eng </marc:controlfield><marc:datafield tag="020" ind1=" " ind2=" "><marc:subfield code="a">9781906924720</marc:subfield><marc:subfield code="a">9781906924737</marc:subfield><marc:subfield code="a">9781906924744</marc:subfield></marc:datafield><marc:datafield tag="043" ind1=" " ind2=" "><marc:subfield code="a">f------</marc:subfield></marc:datafield><marc:datafield tag="082" ind1="0" ind2="0"><marc:subfield code="a">398.2/096</marc:subfield><marc:subfield code="2">20</marc:subfield></marc:datafield><marc:datafield tag="090" ind1="0" ind2="0"><marc:subfield code="a">PL8010</marc:subfield><marc:subfield code="b">.F5 2012</marc:subfield></marc:datafield><marc:datafield tag="100" ind1="1" ind2=" "><marc:subfield code="a">Finnegan, Ruth H.</marc:subfield></marc:datafield><marc:datafield tag="245" ind1="1" ind2="0"><marc:subfield code="a">Oral literature in Africa </marc:subfield><marc:subfield code="h">[electronic resource] /</marc:subfield><marc:subfield code="c">Ruth Finnegan.</marc:subfield></marc:datafield><marc:datafield tag="260" ind1=" " ind2=" "><marc:subfield code="a">Cambridge :</marc:subfield><marc:subfield code="b">OpenBook Publishers, </marc:subfield><marc:subfield code="c">c2012.</marc:subfield></marc:datafield><marc:datafield tag="300" ind1=" " ind2=" "><marc:subfield code="a">1 online resource (xliii, 570 p.) :</marc:subfield><marc:subfield code="b">ill. (some col.), col. map</marc:subfield></marc:datafield><marc:datafield tag="490" ind1="0" ind2=" "><marc:subfield code="a">World Oral Literature Series, </marc:subfield><marc:subfield code="x">2050-7933 ;</marc:subfield><marc:subfield code="v">v.1</marc:subfield></marc:datafield><marc:datafield tag="500" ind1=" " ind2=" "><marc:subfield code="a"> &quot;This unglued edition is freely available to download from our website and distributed under the terms of the Creative Commons CC-BY license&quot;--p. [572]</marc:subfield></marc:datafield><marc:datafield tag="588" ind1=" " ind2=" "><marc:subfield code="a">Description based on online resource; title from ePub ed. t.p. (viewed Sept. 9, 2012)</marc:subfield></marc:datafield><marc:datafield tag="504" ind1=" " ind2=" "><marc:subfield code="a">Includes index and bibliographical references (p.511-546).</marc:subfield></marc:datafield><marc:datafield tag="650" ind1=" " ind2="0"><marc:subfield code="a">Folk literature, African</marc:subfield><marc:subfield code="x">History and criticism.</marc:subfield></marc:datafield><marc:datafield tag="650" ind1=" " ind2="0"><marc:subfield code="a">Oral tradition</marc:subfield><marc:subfield code="z">Africa.</marc:subfield></marc:datafield><marc:datafield tag="776" ind1="0" ind2="8"><marc:subfield code="I">Print version: </marc:subfield><marc:subfield code="a">Finnegan, Ruth H.</marc:subfield><marc:subfield code="t">Oral literature in Africa</marc:subfield><marc:subfield code="z">9781906924713</marc:subfield><marc:subfield code="z">9781906924706</marc:subfield></marc:datafield></marc:record>
</marc:collection>