Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

s/dong/song/

  • Loading branch information...
commit ed008ec0a323b42ac53418581dd648139762897d 1 parent 71a9b68
authored June 08, 2011
10  playlist/models.py
@@ -108,7 +108,7 @@ class UserProfile(models.Model):
108 108
   tokens = models.IntegerField(default=0)
109 109
   
110 110
   #settings
111  
-  s_playlistHistory = models.IntegerField(default=10, help_text="Number of previously played dongs shown") 
  111
+  s_playlistHistory = models.IntegerField(default=10, help_text="Number of previously played songs shown") 
112 112
   
113 113
   def __unicode__(self): return self.name
114 114
 
@@ -121,18 +121,18 @@ def uploadSong(self, upload):
121 121
       Song.objects.get(sha_hash=upload.info['sha_hash'])
122 122
     except Song.DoesNotExist: pass
123 123
     else:
124  
-      self.user.message_set.create(message="The dong '%s' is already in the database" % upload.info['title'])
  124
+      self.user.message_set.create(message="The song '%s' is already in the database" % upload.info['title'])
125 125
       raise DuplicateError, "song already in database"
126 126
     
127 127
     if os.path.getsize(upload.file) > settings.MAX_UPLOAD_SIZE:
128  
-      self.user.message_set.create(message="The dong %s too big" % upload.info['title'])
  128
+      self.user.message_set.create(message="The song %s too big" % upload.info['title'])
129 129
       raise FileTooBigError
130 130
     
131 131
     upload.info['uploader'] = self.user
132 132
     s = upload.store()
133 133
     
134 134
     if s.length > settings.MAX_SONG_LENGTH: #11 mins
135  
-      s.ban("Autobahned because the dong is too long. Ask a mod to unban it if you want to play it.")
  135
+      s.ban("Autobahned because the song is too long. Ask a mod to unban it if you want to play it.")
136 136
     s.save()
137 137
     
138 138
     self.user.get_profile().uploads += 1
@@ -348,7 +348,7 @@ def approve(self, actioner):
348 348
       return #song has gone!
349 349
       
350 350
     if self.not_music:
351  
-      self.song.ban("This dong is not music.")
  351
+      self.song.ban("This song is not music.")
352 352
       
353 353
   def deny(self, actioner):
354 354
     """Deny the report"""
2  playlist/templates/artists.html
@@ -46,7 +46,7 @@
46 46
   </div>
47 47
     <ul>
48 48
       {% for artist in artists.object_list %}
49  
-        <li><a href="{% url artist artist.id %}"> {{ artist.name }}</a> ({{artist.song_count}} dong{{artist.song_count|pluralize}})</li>
  49
+        <li><a href="{% url artist artist.id %}"> {{ artist.name }}</a> ({{artist.song_count}} song{{artist.song_count|pluralize}})</li>
50 50
       {% endfor %}
51 51
     </ul>
52 52
 
2  playlist/templates/jsplaylist.html
@@ -141,7 +141,7 @@
141 141
     <tbody id='playlist'> 
142 142
       {% if user.get_profile.tokens %}
143 143
         <tr><th colspan="7" class="plinfo">
144  
-          You have {{user.get_profile.tokens}} token{{user.get_profile.tokens|pluralize}}, so you can add extra dongs to the playlist!
  144
+          You have {{user.get_profile.tokens}} token{{user.get_profile.tokens|pluralize}}, so you can add extra songs to the playlist!
145 145
         </th></tr>
146 146
       {% endif %}
147 147
       <tr><th colspan="7" id="length">{% include "pl_length.html" %}</th></tr>
2  playlist/templates/pl_length.html
... ...
@@ -1,2 +1,2 @@
1 1
 {% load filters %}
2  
-Playlist is {{length.seconds|stom}} long with {{length.song_count}} dong{{length.song_count|pluralize}}
  2
+Playlist is {{length.seconds|stom}} long with {{length.song_count}} song{{length.song_count|pluralize}}
6  playlist/templates/playlist_table.html
@@ -46,14 +46,14 @@
46 46
         <td class="actions"> 
47 47
           {% if entry.favourite %}
48 48
             <a href='{% url playlist.views.unfavourite entry.object.song.id %}'> 
49  
-              <img src="images/heart_delete.png" title="Remove this dong from your favourites" alt="unfavourite" /> 
  49
+              <img src="images/heart_delete.png" title="Remove this song from your favourites" alt="unfavourite" /> 
50 50
             </a> 
51 51
           {% else %}
52 52
             <a href='{% url playlist.views.favourite entry.object.song.id %}'> 
53 53
               {% if request.user.username != "Beelzebozo" %}
54  
-              <img src="images/heart_add.png" title="Add this dong to your favourites" alt="favourite" /> 
  54
+              <img src="images/heart_add.png" title="Add this song to your favourites" alt="favourite" /> 
55 55
               {% else %}
56  
-              <img src="images/heart_add_beelz.png" title="Add this dong to your favourites" alt="favourite" /> 
  56
+              <img src="images/heart_add_beelz.png" title="Add this song to your favourites" alt="favourite" /> 
57 57
               {% endif %}
58 58
             </a> 
59 59
           {% endif %}
4  playlist/templates/reports.html
@@ -32,13 +32,13 @@
32 32
   {% endif %}
33 33
   </ul>
34 34
   
35  
-  <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>
  35
+  <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>
36 36
   <p><a href="{% url playlist.views.reports approve=report.id %}">(approve)</a> <a href="{% url playlist.views.reports deny=report.id %}">(deny)</a></p>
37 37
   
38 38
   
39 39
   </div>
40 40
 {% empty %}
41  
-No reports at the moment. Our dongs are being very obedient. 
  41
+No reports at the moment. Our songs are being very obedient. 
42 42
 {% endfor %}
43 43
 
44 44
 </div>
6  playlist/templates/scuttle.html
... ...
@@ -1,6 +1,6 @@
1 1
 {% extends "master.html" %}
2 2
 
3  
-{% block title %}Dong Orphanage{% endblock %}
  3
+{% block title %}Song Orphanage{% endblock %}
4 4
   
5 5
   {% load filters %}
6 6
   
@@ -39,11 +39,11 @@
39 39
     {% if songs.has_previous %}
40 40
       <a href="{% url playlist.views.orphans songs.previous_page_number %}">previous</a>
41 41
     {% endif %}
42  
-    Orphaned dongs: page {{ songs.number }} of {{ songs.paginator.num_pages }}
  42
+    Orphaned songs: page {{ songs.number }} of {{ songs.paginator.num_pages }}
43 43
     {% if songs.has_next %}
44 44
       <a href="{% url orphans songs.next_page_number %}">next</a>
45 45
     {% endif %}
46  
-    <p>Click on a dong to become the uploader of it. Please only click on dongs you did actually upload for now.</p>
  46
+    <p>Click on a song to become the uploader of it. Please only click on songs you did actually upload for now.</p>
47 47
   </div>
48 48
     <ul>
49 49
       {% for song in songs.object_list %}
2  playlist/templates/search.html
@@ -70,7 +70,7 @@
70 70
   {% endif %}
71 71
   {% else %}
72 72
   {% if query %}
73  
-  <p>No exact dong/artist matches for search "{{query}}", sorry.</p>
  73
+  <p>No exact song/artist matches for search "{{query}}", sorry.</p>
74 74
   {% endif %}
75 75
   {% endif %}
76 76
   </div>
14  playlist/templates/song.html
@@ -15,35 +15,35 @@
15 15
 <div style="float: right; font-size: 24px; font-weight: bold; color: grey;">{{song.id}}</div>
16 16
 <table>
17 17
 <tr> 
18  
-  <th class="song" colspan="2">Dong 
  18
+  <th class="song" colspan="2">Song 
19 19
   </th>
20 20
 </tr>
21 21
 <tr>
22 22
     <td colspan="2">
23 23
       <a href='{% url playlist.views.song song.id,"/edit" %}'>
24  
-        <img src="/images/page_edit.png" title="Edit dong info" alt="edit" />
  24
+        <img src="/images/page_edit.png" title="Edit song info" alt="edit" />
25 25
       </a>
26 26
 
27 27
       {% if can_delete %}
28 28
         <a href='{% url playlist.views.deletesong song.id %}'>
29  
-          <img src="/images/cross.png" title="Delete dong" alt="delete" />
  29
+          <img src="/images/cross.png" title="Delete song" alt="delete" />
30 30
         </a>
31 31
       {% endif %}
32 32
       {% if favourite %}
33 33
         <a href='{% url playlist.views.unfavourite song.id %}'>
34  
-          <img src="/images/heart_delete.png" title="Unfavourite this dong" alt="unfavourite" />
  34
+          <img src="/images/heart_delete.png" title="Unfavourite this song" alt="unfavourite" />
35 35
         </a>
36 36
       {% else %}
37 37
         <a href='{% url playlist.views.favourite song.id %}'>
38 38
           {% if request.user.username != "Beelzebozo" %}
39  
-            <img src="images/heart_add.png" title="Add this dong to your favourites" alt="favourite" />
  39
+            <img src="images/heart_add.png" title="Add this song to your favourites" alt="favourite" />
40 40
           {% else %}
41  
-            <img src="images/heart_add_beelz.png" title="Add this dong to your favourites" alt="favourite" />
  41
+            <img src="images/heart_add_beelz.png" title="Add this song to your favourites" alt="favourite" />
42 42
           {% endif %}
43 43
         </a>
44 44
       {% endif %}
45 45
       <a href='{% url playlist.views.song_report song.id %}'>
46  
-        <img src="images/exclamation.png" title="Report this dong" alt="report" />
  46
+        <img src="images/exclamation.png" title="Report this song" alt="report" />
47 47
       </a>
48 48
     </td>
49 49
 {% if edit %}
8  playlist/templates/song_report.html
@@ -16,13 +16,13 @@
16 16
 <h1>Reporting {{song.artist.name}} - {{song.title}}</h1>
17 17
 <form action="{% url playlist.views.song_report songid=song.id %}" method="post">
18 18
         {% csrf_token %}
19  
-    <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>
  19
+    <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>
20 20
     {{form.corrupt.errors}}
21  
-    <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>
  21
+    <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>
22 22
     {{form.duplicate.errors}}
23  
-    <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>
  23
+    <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>
24 24
     {{form.not_music.errors}}
25  
-    <p>{{form.other}} <span style="font-weight: bold;">Other:</span> use for any other reasonable issue with this dong.</p>
  25
+    <p>{{form.other}} <span style="font-weight: bold;">Other:</span> use for any other reasonable issue with this song.</p>
26 26
     <p>Any further comments or explanation? {{form.user_note}}</p>
27 27
     {{form.user_note.errors}}
28 28
     <input type="submit" value="Submit" />
10  playlist/templates/stats.html
@@ -5,14 +5,14 @@
5 5
 {% block main %}
6 6
   <div class="playlist">
7 7
 
8  
-  <p><span class="bold">Dongs in database:</span> {{totaldongs}} </p>
  8
+  <p><span class="bold">Songs in database:</span> {{totaldongs}} </p>
9 9
   <p><span class="bold">Additions to the playlist:</span> {{totaladds}} </p>
10  
-  <p><span class="bold">Unplayed dongs:</span> {{unplayeddongs}} </p>
  10
+  <p><span class="bold">Unplayed songs:</span> {{unplayeddongs}} </p>
11 11
   <p><span class="bold">Registered users:</span> {{totalusers}} </p>
12 12
 
13 13
 
14 14
   {% if populardongs %}
15  
-  <p>Most added dongs:</p>
  15
+  <p>Most added songs:</p>
16 16
   <ul>
17 17
     {% for dong in populardongs %}
18 18
       <li>{{dong}} - {{dong.totaladds}}</li>
@@ -22,7 +22,7 @@
22 22
   {% endif %}
23 23
 
24 24
   {% if votedhidongs %}
25  
-  <p>Highest-rated dongs:</p>
  25
+  <p>Highest-rated songs:</p>
26 26
   <ul>
27 27
     {% for dong in votedhidongs %}
28 28
       <li>{{dong}} - {{dong.avgscore}}</li>
@@ -32,7 +32,7 @@
32 32
   {% endif %}
33 33
 
34 34
   {% if votedlodongs %}
35  
-  <p>Lowest-rated dongs:</p>
  35
+  <p>Lowest-rated songs:</p>
36 36
   <ul>
37 37
     {% for dong in votedlodongs %}
38 38
       <li>{{dong}} - {{dong.avgscore}}</li>
4  playlist/templates/user.html
@@ -8,14 +8,14 @@
8 8
   <p><span class="bold">User status:</span> {{owner.groups.all.0.name}}</p>
9 9
   <p><span class="bold">Comments written:</span> {{numcomments}}</p>
10 10
   <p><span class="bold">Number of uploads:</span> {{owner.uploads.count}}</p>
11  
-  <p><span class="bold">Number of dongs added to the playlist:</span> {{useradds}}</p>
  11
+  <p><span class="bold">Number of songs added to the playlist:</span> {{useradds}}</p>
12 12
   {% if owner.id == viewer %}
13 13
     <p><span class="bold">Number of times your uploads have been added by others:</span> {{otheradds}}</p>
14 14
   {% else %}
15 15
     <p><span class="bold">Number of times user's uploads have been added by others:</span> {{otheradds}}</p>
16 16
   {% endif %}
17 17
   <p><span class="bold">Number of tokens:</span> {{owner.get_profile.tokens}}</p>
18  
-  <p><span class="bold">Average score for uploaded dongs:</span> {{uploadavg}}</p>  
  18
+  <p><span class="bold">Average score for uploaded songs:</span> {{uploadavg}}</p>  
19 19
 
20 20
   <p>
21 21
     <a id="menuitem" href="{% url playlist.views.search %}?query=favourites%3D{{owner.username}}">
8  playlist/views.py
@@ -679,7 +679,7 @@ def song_report(request, songid):
679 679
       report.song = song
680 680
       report.reporter = request.user
681 681
       report.save()
682  
-      request.user.message_set.create(message="Dong successfully reported.")
  682
+      request.user.message_set.create(message="Song successfully reported.")
683 683
       return HttpResponseRedirect(reverse('song', kwargs={'songid': songid}))
684 684
     else:
685 685
       for field in report_form:
@@ -1079,9 +1079,9 @@ def add(request, songid=0):
1079 1079
     
1080 1080
   if oldtokens != profile.tokens:
1081 1081
       if profile.tokens:
1082  
-        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)
  1082
+        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)
1083 1083
       else:
1084  
-        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!"
  1084
+        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!"
1085 1085
       if not isajax:
1086 1086
         request.user.message_set.create(message=msg)
1087 1087
       else:
@@ -1092,7 +1092,7 @@ def add(request, songid=0):
1092 1092
   if song.isOrphan(): 
1093 1093
     song.uploader = request.user
1094 1094
     song.save()
1095  
-    msg = "This dong was an orphan, so you have automatically adopted it. Take good care of it!"
  1095
+    msg = "This song was an orphan, so you have automatically adopted it. Take good care of it!"
1096 1096
     if isajax:
1097 1097
       toret.append(msg)
1098 1098
     else:

0 notes on commit ed008ec

Bjorn Tipling

80 columns! Pull request rejected!

Please sign in to comment.
Something went wrong with that request. Please try again.