diff --git a/core/models.py b/core/models.py index 8a12de89..9023b702 100755 --- a/core/models.py +++ b/core/models.py @@ -48,8 +48,8 @@ class CeleryTask(models.Model): class Claim(models.Model): STATUSES = (( - u'active', u'Claim has been registered and approved.'), - (u'pending', u'Claim is pending approval.'), + u'active', u'Claim has been accepted.'), + (u'pending', u'Claim is pending acceptance.'), (u'release', u'Claim has not been accepted.'), ) created = models.DateTimeField(auto_now_add=True) diff --git a/frontend/templates/work.html b/frontend/templates/work.html index ed515978..aa09c064 100644 --- a/frontend/templates/work.html +++ b/frontend/templates/work.html @@ -101,9 +101,9 @@ $j(document).ready(function(){ {% if status == 'ACTIVE' %} {% if pledged %} -
+ {% else %} - + {% endif %} {% endif %} @@ -246,13 +246,13 @@ $j(document).ready(function(){This work has been claimed by {{ rights_holder_name }}. The claim has been registered and approved by Unglue.It staff.
+This work has been claimed by {{ rights_holder_name }}.
{% else %} {% if claimstatus == 'disputed' %}Rights claims are pending.
{% else %} {% if claimstatus == 'one_pending' %} -This work has been claimed by {{ rights_holder_name }}. The claim is being verified by Unglue.It staff.
+A claim for this work by {{ rights_holder_name }} is pending.
{% else %} {% if request.user.rights_holder.all.count %} Is this work yours? Claim it: