s/dong/song/

playlist/models.py

@@ -108,7 +108,7 @@ class UserProfile(models.Model):
   tokens = models.IntegerField(default=0)
 
   #settings
-  s_playlistHistory = models.IntegerField(default=10, help_text="Number of previously played dongs shown") 
+  s_playlistHistory = models.IntegerField(default=10, help_text="Number of previously played songs shown") 
 
   def __unicode__(self): return self.name
 
@@ -121,18 +121,18 @@ def uploadSong(self, upload):
       Song.objects.get(sha_hash=upload.info['sha_hash'])
     except Song.DoesNotExist: pass
     else:
-      self.user.message_set.create(message="The dong '%s' is already in the database" % upload.info['title'])
+      self.user.message_set.create(message="The song '%s' is already in the database" % upload.info['title'])
       raise DuplicateError, "song already in database"
 
     if os.path.getsize(upload.file) > settings.MAX_UPLOAD_SIZE:
-      self.user.message_set.create(message="The dong %s too big" % upload.info['title'])
+      self.user.message_set.create(message="The song %s too big" % upload.info['title'])
       raise FileTooBigError
 
     upload.info['uploader'] = self.user
     s = upload.store()
 
     if s.length > settings.MAX_SONG_LENGTH: #11 mins
-      s.ban("Autobahned because the dong is too long. Ask a mod to unban it if you want to play it.")
+      s.ban("Autobahned because the song is too long. Ask a mod to unban it if you want to play it.")
     s.save()
 
     self.user.get_profile().uploads += 1
@@ -348,7 +348,7 @@ def approve(self, actioner):
       return #song has gone!
 
     if self.not_music:
-      self.song.ban("This dong is not music.")
+      self.song.ban("This song is not music.")
 
   def deny(self, actioner):
     """Deny the report"""

playlist/templates/artists.html

@@ -46,7 +46,7 @@
   </div>
     <ul>
       {% for artist in artists.object_list %}
-        <li><a href="{% url artist artist.id %}"> {{ artist.name }}</a> ({{artist.song_count}} dong{{artist.song_count|pluralize}})</li>
+        <li><a href="{% url artist artist.id %}"> {{ artist.name }}</a> ({{artist.song_count}} song{{artist.song_count|pluralize}})</li>
       {% endfor %}
     </ul>
 

playlist/templates/jsplaylist.html

@@ -141,7 +141,7 @@
     <tbody id='playlist'> 
       {% if user.get_profile.tokens %}
         <tr><th colspan="7" class="plinfo">
-          You have {{user.get_profile.tokens}} token{{user.get_profile.tokens|pluralize}}, so you can add extra dongs to the playlist!
+          You have {{user.get_profile.tokens}} token{{user.get_profile.tokens|pluralize}}, so you can add extra songs to the playlist!
         </th></tr>
       {% endif %}
       <tr><th colspan="7" id="length">{% include "pl_length.html" %}</th></tr>

playlist/templates/pl_length.html

@@ -1,2 +1,2 @@
 {% load filters %}
-Playlist is {{length.seconds|stom}} long with {{length.song_count}} dong{{length.song_count|pluralize}}
+Playlist is {{length.seconds|stom}} long with {{length.song_count}} song{{length.song_count|pluralize}}

playlist/templates/playlist_table.html

@@ -46,14 +46,14 @@
         <td class="actions"> 
           {% if entry.favourite %}
             <a href='{% url playlist.views.unfavourite entry.object.song.id %}'> 
-              <img src="images/heart_delete.png" title="Remove this dong from your favourites" alt="unfavourite" /> 
+              <img src="images/heart_delete.png" title="Remove this song from your favourites" alt="unfavourite" /> 
             </a> 
           {% else %}
             <a href='{% url playlist.views.favourite entry.object.song.id %}'> 
               {% if request.user.username != "Beelzebozo" %}
-              <img src="images/heart_add.png" title="Add this dong to your favourites" alt="favourite" /> 
+              <img src="images/heart_add.png" title="Add this song to your favourites" alt="favourite" /> 
               {% else %}
-              <img src="images/heart_add_beelz.png" title="Add this dong to your favourites" alt="favourite" /> 
+              <img src="images/heart_add_beelz.png" title="Add this song to your favourites" alt="favourite" /> 
               {% endif %}
             </a> 
           {% endif %}

playlist/templates/reports.html

@@ -32,13 +32,13 @@
   {% endif %}
   </ul>
 
-  <p> Approving this will <em>{% if report.duplicate %}merge{% else %}{% if report.corrupt %}delete{% else %}{% if report.not_music %}ban{% else %}do nothing to{% endif %}{% endif %}{% endif %}</em> this dong.</p>
+  <p> Approving this will <em>{% if report.duplicate %}merge{% else %}{% if report.corrupt %}delete{% else %}{% if report.not_music %}ban{% else %}do nothing to{% endif %}{% endif %}{% endif %}</em> this song.</p>
   <p><a href="{% url playlist.views.reports approve=report.id %}">(approve)</a> <a href="{% url playlist.views.reports deny=report.id %}">(deny)</a></p>
 
 
   </div>
 {% empty %}
-No reports at the moment. Our dongs are being very obedient. 
+No reports at the moment. Our songs are being very obedient. 
 {% endfor %}
 
 </div>

playlist/templates/scuttle.html

@@ -1,6 +1,6 @@
 {% extends "master.html" %}
 
-{% block title %}Dong Orphanage{% endblock %}
+{% block title %}Song Orphanage{% endblock %}
 
   {% load filters %}
 
@@ -39,11 +39,11 @@
     {% if songs.has_previous %}
       <a href="{% url playlist.views.orphans songs.previous_page_number %}">previous</a>
     {% endif %}
-    Orphaned dongs: page {{ songs.number }} of {{ songs.paginator.num_pages }}
+    Orphaned songs: page {{ songs.number }} of {{ songs.paginator.num_pages }}
     {% if songs.has_next %}
       <a href="{% url orphans songs.next_page_number %}">next</a>
     {% endif %}
-    <p>Click on a dong to become the uploader of it. Please only click on dongs you did actually upload for now.</p>
+    <p>Click on a song to become the uploader of it. Please only click on songs you did actually upload for now.</p>
   </div>
     <ul>
       {% for song in songs.object_list %}

playlist/templates/search.html

@@ -70,7 +70,7 @@
   {% endif %}
   {% else %}
   {% if query %}
-  <p>No exact dong/artist matches for search "{{query}}", sorry.</p>
+  <p>No exact song/artist matches for search "{{query}}", sorry.</p>
   {% endif %}
   {% endif %}
   </div>

playlist/templates/song.html

@@ -15,35 +15,35 @@
 <div style="float: right; font-size: 24px; font-weight: bold; color: grey;">{{song.id}}</div>
 <table>
 <tr> 
-  <th class="song" colspan="2">Dong 
+  <th class="song" colspan="2">Song 
   </th>
 </tr>
 <tr>
     <td colspan="2">
       <a href='{% url playlist.views.song song.id,"/edit" %}'>
-        <img src="/images/page_edit.png" title="Edit dong info" alt="edit" />
+        <img src="/images/page_edit.png" title="Edit song info" alt="edit" />
       </a>
 
       {% if can_delete %}
         <a href='{% url playlist.views.deletesong song.id %}'>
-          <img src="/images/cross.png" title="Delete dong" alt="delete" />
+          <img src="/images/cross.png" title="Delete song" alt="delete" />
         </a>
       {% endif %}
       {% if favourite %}
         <a href='{% url playlist.views.unfavourite song.id %}'>
-          <img src="/images/heart_delete.png" title="Unfavourite this dong" alt="unfavourite" />
+          <img src="/images/heart_delete.png" title="Unfavourite this song" alt="unfavourite" />
         </a>
       {% else %}
         <a href='{% url playlist.views.favourite song.id %}'>
           {% if request.user.username != "Beelzebozo" %}
-            <img src="images/heart_add.png" title="Add this dong to your favourites" alt="favourite" />
+            <img src="images/heart_add.png" title="Add this song to your favourites" alt="favourite" />
           {% else %}
-            <img src="images/heart_add_beelz.png" title="Add this dong to your favourites" alt="favourite" />
+            <img src="images/heart_add_beelz.png" title="Add this song to your favourites" alt="favourite" />
           {% endif %}
         </a>
       {% endif %}
       <a href='{% url playlist.views.song_report song.id %}'>
-        <img src="images/exclamation.png" title="Report this dong" alt="report" />
+        <img src="images/exclamation.png" title="Report this song" alt="report" />
       </a>
     </td>
 {% if edit %}

playlist/templates/song_report.html

@@ -16,13 +16,13 @@
 <h1>Reporting {{song.artist.name}} - {{song.title}}</h1>
 <form action="{% url playlist.views.song_report songid=song.id %}" method="post">
         {% csrf_token %}
-    <p>{{form.corrupt}}  <span style="font-weight: bold;">Corrupt:</span> use if this dong cuts off or has other major problems. If you can, please upload or find a better version and report this as a duplicate instead so we don't lose any juicy statistics.</p>
+    <p>{{form.corrupt}}  <span style="font-weight: bold;">Corrupt:</span> use if this song cuts off or has other major problems. If you can, please upload or find a better version and report this as a duplicate instead so we don't lose any juicy statistics.</p>
     {{form.corrupt.errors}}
-    <p><span style="font-weight: bold;">Duplicate:</span> use if this dong is a duplicate of another dong (different versions of the same dong don't count). Ideally, you should report the lower-quality dong and leave the better one alone. Enter the duplicate dong's id here: {{form.duplicate}} </p>
+    <p><span style="font-weight: bold;">Duplicate:</span> use if this song is a duplicate of another song (different versions of the same song don't count). Ideally, you should report the lower-quality song and leave the better one alone. Enter the duplicate song's id here: {{form.duplicate}} </p>
     {{form.duplicate.errors}}
-    <p>{{form.not_music}} <span style="font-weight: bold;">Not music:</span> use if this dong is obviously not music - essentially the only thing that qualifies for this is spoken word unless you enjoy big annoying arguments that don't achieve anything.</p>
+    <p>{{form.not_music}} <span style="font-weight: bold;">Not music:</span> use if this song is obviously not music - essentially the only thing that qualifies for this is spoken word unless you enjoy big annoying arguments that don't achieve anything.</p>
     {{form.not_music.errors}}
-    <p>{{form.other}} <span style="font-weight: bold;">Other:</span> use for any other reasonable issue with this dong.</p>
+    <p>{{form.other}} <span style="font-weight: bold;">Other:</span> use for any other reasonable issue with this song.</p>
     <p>Any further comments or explanation? {{form.user_note}}</p>
     {{form.user_note.errors}}
     <input type="submit" value="Submit" />

playlist/templates/stats.html

@@ -5,14 +5,14 @@
 {% block main %}
   <div class="playlist">
 
-  <p><span class="bold">Dongs in database:</span> {{totaldongs}} </p>
+  <p><span class="bold">Songs in database:</span> {{totaldongs}} </p>
   <p><span class="bold">Additions to the playlist:</span> {{totaladds}} </p>
-  <p><span class="bold">Unplayed dongs:</span> {{unplayeddongs}} </p>
+  <p><span class="bold">Unplayed songs:</span> {{unplayeddongs}} </p>
   <p><span class="bold">Registered users:</span> {{totalusers}} </p>
 
 
   {% if populardongs %}
-  <p>Most added dongs:</p>
+  <p>Most added songs:</p>
   <ul>
     {% for dong in populardongs %}
       <li>{{dong}} - {{dong.totaladds}}</li>
@@ -22,7 +22,7 @@
   {% endif %}
 
   {% if votedhidongs %}
-  <p>Highest-rated dongs:</p>
+  <p>Highest-rated songs:</p>
   <ul>
     {% for dong in votedhidongs %}
       <li>{{dong}} - {{dong.avgscore}}</li>
@@ -32,7 +32,7 @@
   {% endif %}
 
   {% if votedlodongs %}
-  <p>Lowest-rated dongs:</p>
+  <p>Lowest-rated songs:</p>
   <ul>
     {% for dong in votedlodongs %}
       <li>{{dong}} - {{dong.avgscore}}</li>

playlist/templates/user.html

@@ -8,14 +8,14 @@
   <p><span class="bold">User status:</span> {{owner.groups.all.0.name}}</p>
   <p><span class="bold">Comments written:</span> {{numcomments}}</p>
   <p><span class="bold">Number of uploads:</span> {{owner.uploads.count}}</p>
-  <p><span class="bold">Number of dongs added to the playlist:</span> {{useradds}}</p>
+  <p><span class="bold">Number of songs added to the playlist:</span> {{useradds}}</p>
   {% if owner.id == viewer %}
     <p><span class="bold">Number of times your uploads have been added by others:</span> {{otheradds}}</p>
   {% else %}
     <p><span class="bold">Number of times user's uploads have been added by others:</span> {{otheradds}}</p>
   {% endif %}
   <p><span class="bold">Number of tokens:</span> {{owner.get_profile.tokens}}</p>
-  <p><span class="bold">Average score for uploaded dongs:</span> {{uploadavg}}</p>  
+  <p><span class="bold">Average score for uploaded songs:</span> {{uploadavg}}</p>  
 
   <p>
     <a id="menuitem" href="{% url playlist.views.search %}?query=favourites%3D{{owner.username}}">

playlist/views.py

@@ -679,7 +679,7 @@ def song_report(request, songid):
       report.song = song
       report.reporter = request.user
       report.save()
-      request.user.message_set.create(message="Dong successfully reported.")
+      request.user.message_set.create(message="Song successfully reported.")
       return HttpResponseRedirect(reverse('song', kwargs={'songid': songid}))
     else:
       for field in report_form:
@@ -1079,9 +1079,9 @@ def add(request, songid=0):
 
   if oldtokens != profile.tokens:
       if profile.tokens:
-        msg = "You already had a dong on the playlist, so you've used up a token to add this one. You have %d left" % (profile.tokens)
+        msg = "You already had a song on the playlist, so you've used up a token to add this one. You have %d left" % (profile.tokens)
       else:
-        msg = "You already had a dong on the playlist, so you've used up a token to add this one. That was your last one!"
+        msg = "You already had a song on the playlist, so you've used up a token to add this one. That was your last one!"
       if not isajax:
         request.user.message_set.create(message=msg)
       else:
@@ -1092,7 +1092,7 @@ def add(request, songid=0):
   if song.isOrphan(): 
     song.uploader = request.user
     song.save()
-    msg = "This dong was an orphan, so you have automatically adopted it. Take good care of it!"
+    msg = "This song was an orphan, so you have automatically adopted it. Take good care of it!"
     if isajax:
       toret.append(msg)
     else: