[mb-commits] r9754 - in mb_server/branches/terminology: admin/cleanup cgi-bin cgi-bin/MusicBrainz/Server/Moderation htdocs/comp/layout htdocs/comp/moderation htdocs/comp/release_editor htdocs/edit/album

root at musicbrainz.org root at musicbrainz.org
Mon Mar 10 17:18:58 UTC 2008


Author: luks
Date: 2008-03-10 17:18:58 +0000 (Mon, 10 Mar 2008)
New Revision: 9754

Added:
   mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_NAME.pm
   mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_RELEASE_NAME
Removed:
   mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ALBUMNAME.pm
   mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_ALBUMNAME
Modified:
   mb_server/branches/terminology/admin/cleanup/SmartQuotes
   mb_server/branches/terminology/cgi-bin/ModDefs.pm
   mb_server/branches/terminology/cgi-bin/Moderation.pm
   mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_ARTIST_QUALITY.pm
   mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_SET_RELEASE_DURATIONS.pm
   mb_server/branches/terminology/htdocs/comp/layout/editformbegin
   mb_server/branches/terminology/htdocs/comp/moderation/MOD_CHANGE_ARTIST_QUALITY
   mb_server/branches/terminology/htdocs/comp/moderation/MOD_CHANGE_RELEASE_QUALITY
   mb_server/branches/terminology/htdocs/comp/moderation/MOD_SET_RELEASE_DURATIONS
   mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit
   mb_server/branches/terminology/htdocs/comp/release_editor/review
   mb_server/branches/terminology/htdocs/edit/album/edit.html
Log:
s/MOD_EDIT_ALBUMNAME/MOD_EDIT_RELEASE_NAME/

Modified: mb_server/branches/terminology/admin/cleanup/SmartQuotes
===================================================================
--- mb_server/branches/terminology/admin/cleanup/SmartQuotes	2008-03-10 16:24:30 UTC (rev 9753)
+++ mb_server/branches/terminology/admin/cleanup/SmartQuotes	2008-03-10 17:18:58 UTC (rev 9754)
@@ -130,7 +130,7 @@
 	[ &ModDefs::MOD_EDIT_ARTISTNAME, "artist.name.id" ],
 	[ &ModDefs::MOD_EDIT_ARTISTSORTNAME, "artist.sortname.id" ],
 	[ &ModDefs::MOD_EDIT_ARTISTALIAS, "artistalias.name.ref" ],
-	[ &ModDefs::MOD_EDIT_ALBUMNAME, "album.name.artist" ],
+	[ &ModDefs::MOD_EDIT_RELEASE_NAME, "album.name.artist" ],
 	[ &ModDefs::MOD_EDIT_TRACKNAME, "track.name.artist" ],
 ) {
 	my $modtype = $_->[0];

Modified: mb_server/branches/terminology/cgi-bin/ModDefs.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/ModDefs.pm	2008-03-10 16:24:30 UTC (rev 9753)
+++ mb_server/branches/terminology/cgi-bin/ModDefs.pm	2008-03-10 17:18:58 UTC (rev 9754)
@@ -75,7 +75,7 @@
 # The various moderations, enumerated
 use constant MOD_EDIT_ARTISTNAME		 => 1;
 use constant MOD_EDIT_ARTISTSORTNAME	 => 2;
-use constant MOD_EDIT_ALBUMNAME			 => 3;
+use constant MOD_EDIT_RELEASE_NAME			 => 3;
 use constant MOD_EDIT_TRACKNAME			 => 4;
 use constant MOD_EDIT_TRACKNUM			 => 5;
 use constant MOD_MERGE_ARTIST			 => 6;
@@ -294,7 +294,7 @@
 	MOD_CHANGE_WIKIDOC			. "" => {'category' => CAT_NONE, 'criteria' => ""},
 	MOD_EDIT_RELEASE_LANGUAGE		. "" => {'category' => CAT_RELEASE, 'criteria' => "Auto-edit if no language was set"},
 	MOD_EDIT_RELEASE_ATTRS			. "" => {'category' => CAT_RELEASE, 'criteria' => "Auto-edit if no attributes where set"},
-	MOD_EDIT_ALBUMNAME			. "" => {'category' => CAT_RELEASE, 'criteria' => "Auto-edit when changing capitalisation or accents"},
+	MOD_EDIT_RELEASE_NAME			. "" => {'category' => CAT_RELEASE, 'criteria' => "Auto-edit when changing capitalisation or accents"},
 	MOD_EDIT_ARTIST				. "" => {'category' => CAT_ARTIST, 'criteria' => "Auto-edit when providing new properties (Begin Date, End Date or Type) or changing capitalisation or accents"},
 	MOD_EDIT_ARTISTALIAS			. "" => {'category' => CAT_ARTIST, 'criteria' => "Auto-edit when changing capitalisation or accents"},
 	MOD_EDIT_ARTISTNAME			. "" => {'category' => CAT_ARTIST, 'criteria' => ""},

Modified: mb_server/branches/terminology/cgi-bin/Moderation.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/Moderation.pm	2008-03-10 16:24:30 UTC (rev 9753)
+++ mb_server/branches/terminology/cgi-bin/Moderation.pm	2008-03-10 17:18:58 UTC (rev 9754)
@@ -59,7 +59,7 @@
 require MusicBrainz::Server::Moderation::MOD_CHANGE_WIKIDOC;
 require MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_LANGUAGE;
 require MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_ATTRS;
-require MusicBrainz::Server::Moderation::MOD_EDIT_ALBUMNAME;
+require MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_NAME;
 require MusicBrainz::Server::Moderation::MOD_EDIT_ARTIST;
 require MusicBrainz::Server::Moderation::MOD_EDIT_ARTISTALIAS;
 require MusicBrainz::Server::Moderation::MOD_EDIT_ARTISTNAME;
@@ -108,8 +108,8 @@
 		                                      name => &MusicBrainz::Server::Moderation::MOD_EDIT_ARTISTNAME::Name() },  
 		MOD_EDIT_ARTISTSORTNAME  	 ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,  
 		                                      name => &MusicBrainz::Server::Moderation::MOD_EDIT_ARTISTSORTNAME::Name() },  
-		MOD_EDIT_ALBUMNAME			 ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,  
-		                                      name => &MusicBrainz::Server::Moderation::MOD_EDIT_ALBUMNAME::Name() },  
+		MOD_EDIT_RELEASE_NAME			 ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,  
+		                                      name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_NAME::Name() },  
 		MOD_EDIT_TRACKNAME			 ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,  
 		                                      name => &MusicBrainz::Server::Moderation::MOD_EDIT_TRACKNAME::Name() },  
 		MOD_EDIT_TRACKNUM			 ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,  
@@ -232,8 +232,8 @@
 		                                      name => &MusicBrainz::Server::Moderation::MOD_EDIT_ARTISTNAME::Name() },  
 		MOD_EDIT_ARTISTSORTNAME  	 ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,  
 		                                      name => &MusicBrainz::Server::Moderation::MOD_EDIT_ARTISTSORTNAME::Name() },  
-		MOD_EDIT_ALBUMNAME			 ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,  
-		                                      name => &MusicBrainz::Server::Moderation::MOD_EDIT_ALBUMNAME::Name() },  
+		MOD_EDIT_RELEASE_NAME			 ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,  
+		                                      name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_NAME::Name() },  
 		MOD_EDIT_TRACKNAME			 ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,  
 		                                      name => &MusicBrainz::Server::Moderation::MOD_EDIT_TRACKNAME::Name() },  
 		MOD_EDIT_TRACKNUM			 ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,  
@@ -356,8 +356,8 @@
 		                                      name => &MusicBrainz::Server::Moderation::MOD_EDIT_ARTISTNAME::Name() },  
 		MOD_EDIT_ARTISTSORTNAME  	 ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,  
 		                                      name => &MusicBrainz::Server::Moderation::MOD_EDIT_ARTISTSORTNAME::Name() },  
-		MOD_EDIT_ALBUMNAME			 ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,  
-		                                      name => &MusicBrainz::Server::Moderation::MOD_EDIT_ALBUMNAME::Name() },  
+		MOD_EDIT_RELEASE_NAME			 ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,  
+		                                      name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_NAME::Name() },  
 		MOD_EDIT_TRACKNAME			 ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,  
 		                                      name => &MusicBrainz::Server::Moderation::MOD_EDIT_TRACKNAME::Name() },  
 		MOD_EDIT_TRACKNUM			 ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,  

Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_ARTIST_QUALITY.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_ARTIST_QUALITY.pm	2008-03-10 16:24:30 UTC (rev 9753)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_CHANGE_ARTIST_QUALITY.pm	2008-03-10 17:18:58 UTC (rev 9754)
@@ -20,7 +20,7 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
-#   $Id: MOD_EDIT_ALBUMNAME.pm 8492 2006-09-26 22:44:39Z robert $
+#   $Id: MOD_EDIT_RELEASE_NAME.pm 8492 2006-09-26 22:44:39Z robert $
 #____________________________________________________________________________
 
 use strict;

Deleted: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ALBUMNAME.pm

Copied: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_NAME.pm (from rev 9732, mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ALBUMNAME.pm)

Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_SET_RELEASE_DURATIONS.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_SET_RELEASE_DURATIONS.pm	2008-03-10 16:24:30 UTC (rev 9753)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_SET_RELEASE_DURATIONS.pm	2008-03-10 17:18:58 UTC (rev 9754)
@@ -20,7 +20,7 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
-#   $Id: MOD_EDIT_ALBUMNAME.pm 8492 2006-09-26 22:44:39Z robert $
+#   $Id: MOD_EDIT_RELEASE_NAME.pm 8492 2006-09-26 22:44:39Z robert $
 #____________________________________________________________________________
 
 use strict;

Modified: mb_server/branches/terminology/htdocs/comp/layout/editformbegin
===================================================================
--- mb_server/branches/terminology/htdocs/comp/layout/editformbegin	2008-03-10 16:24:30 UTC (rev 9753)
+++ mb_server/branches/terminology/htdocs/comp/layout/editformbegin	2008-03-10 17:18:58 UTC (rev 9754)
@@ -204,7 +204,7 @@
 		}
 
 		# edit release title
-		elsif ($mp_type == &ModDefs::MOD_EDIT_ALBUMNAME)
+		elsif ($mp_type == &ModDefs::MOD_EDIT_RELEASE_NAME)
 		{
 			$mp_type_message = $m->scomp("/comp/linkdoc", "EditReleaseNameEdit", "Edit Release Title edits");
 		}

Modified: mb_server/branches/terminology/htdocs/comp/moderation/MOD_CHANGE_ARTIST_QUALITY
===================================================================
--- mb_server/branches/terminology/htdocs/comp/moderation/MOD_CHANGE_ARTIST_QUALITY	2008-03-10 16:24:30 UTC (rev 9753)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_CHANGE_ARTIST_QUALITY	2008-03-10 17:18:58 UTC (rev 9754)
@@ -24,7 +24,7 @@
 	# This component provides the display facilities for
 	# the MOD_CHANGE_ARTIST_QUALITY edit type.
 	#
-	# $Id: MOD_EDIT_ALBUMNAME 8022 2006-07-02 21:17:05Z keschte $
+	# $Id: MOD_EDIT_RELEASE_NAME 8022 2006-07-02 21:17:05Z keschte $
 	#
 </%perl>
 <%method ShowPreviousValue>

Modified: mb_server/branches/terminology/htdocs/comp/moderation/MOD_CHANGE_RELEASE_QUALITY
===================================================================
--- mb_server/branches/terminology/htdocs/comp/moderation/MOD_CHANGE_RELEASE_QUALITY	2008-03-10 16:24:30 UTC (rev 9753)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_CHANGE_RELEASE_QUALITY	2008-03-10 17:18:58 UTC (rev 9754)
@@ -24,7 +24,7 @@
 	# This component provides the display facilities for
 	# the MOD_CHANGE_RELEASE_QUALITY edit type.
 	#
-	# $Id: MOD_EDIT_ALBUMNAME 8022 2006-07-02 21:17:05Z keschte $
+	# $Id: MOD_EDIT_RELEASE_NAME 8022 2006-07-02 21:17:05Z keschte $
 	#
 </%perl>
 <%method ShowPreviousValue>

Deleted: mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_ALBUMNAME

Copied: mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_RELEASE_NAME (from rev 9732, mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_ALBUMNAME)

Modified: mb_server/branches/terminology/htdocs/comp/moderation/MOD_SET_RELEASE_DURATIONS
===================================================================
--- mb_server/branches/terminology/htdocs/comp/moderation/MOD_SET_RELEASE_DURATIONS	2008-03-10 16:24:30 UTC (rev 9753)
+++ mb_server/branches/terminology/htdocs/comp/moderation/MOD_SET_RELEASE_DURATIONS	2008-03-10 17:18:58 UTC (rev 9754)
@@ -24,7 +24,7 @@
 	# This component provides the display facilities for
 	# the MOD_SET_RELEASE_DURATIONS edit type.
 	#
-	# $Id: MOD_EDIT_ALBUMNAME 8022 2006-07-02 21:17:05Z keschte $
+	# $Id: MOD_EDIT_RELEASE_NAME 8022 2006-07-02 21:17:05Z keschte $
 	#
 </%perl>
 <%method ShowPreviousValue>

Modified: mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit	2008-03-10 16:24:30 UTC (rev 9753)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit	2008-03-10 17:18:58 UTC (rev 9754)
@@ -126,7 +126,7 @@
 				);
 			}
 
-			# MOD_EDIT_ALBUMNAME
+			# MOD_EDIT_RELEASE_NAME
 			# Enter an edit if the releasename was edited
 			$ov = $orig{"releasename"};
 			$nv = $ARGS{"releasename"};
@@ -136,7 +136,7 @@
 					DBH	=> $mb->{DBH},
 					uid	=> $session{uid},
 					privs => $session{privs},
-					type => &ModDefs::MOD_EDIT_ALBUMNAME,
+					type => &ModDefs::MOD_EDIT_RELEASE_NAME,
 					# --
 					album => $release,
 					newname => $nv,

Modified: mb_server/branches/terminology/htdocs/comp/release_editor/review
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/review	2008-03-10 16:24:30 UTC (rev 9753)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/review	2008-03-10 17:18:58 UTC (rev 9754)
@@ -391,7 +391,7 @@
 
 				oldvalue => $orig_releasename,
 				newvalue => $new_releasename,
-				modtype => &ModDefs::MOD_EDIT_ALBUMNAME,
+				modtype => &ModDefs::MOD_EDIT_RELEASE_NAME,
 				cnt => ++$releasechanges
 			);
 		}

Modified: mb_server/branches/terminology/htdocs/edit/album/edit.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/album/edit.html	2008-03-10 16:24:30 UTC (rev 9753)
+++ mb_server/branches/terminology/htdocs/edit/album/edit.html	2008-03-10 17:18:58 UTC (rev 9754)
@@ -94,7 +94,7 @@
 						DBH	=> $mb->{DBH},
 						uid	=> $session{uid},
 						privs => $session{privs},
-						type => &ModDefs::MOD_EDIT_ALBUMNAME,
+						type => &ModDefs::MOD_EDIT_RELEASE_NAME,
 						# --
 						album => $release,
 						newname => $newreleasename,




More information about the MusicBrainz-commits mailing list