[mb-commits] r9752 - in mb_server/branches/terminology: cgi-bin cgi-bin/MusicBrainz/Server/Moderation htdocs/comp/form htdocs/comp/layout htdocs/comp/moderation htdocs/comp/release_editor htdocs/edit/albumlanguage htdocs/edit/albumquality
root at musicbrainz.org
root at musicbrainz.org
Mon Mar 10 16:21:27 UTC 2008
Author: luks
Date: 2008-03-10 16:21:27 +0000 (Mon, 10 Mar 2008)
New Revision: 9752
Added:
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_LANGUAGE.pm
mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_RELEASE_LANGUAGE
Removed:
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ALBUM_LANGUAGE.pm
mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_ALBUM_LANGUAGE
Modified:
mb_server/branches/terminology/cgi-bin/ModDefs.pm
mb_server/branches/terminology/cgi-bin/Moderation.pm
mb_server/branches/terminology/htdocs/comp/form/currentvalue
mb_server/branches/terminology/htdocs/comp/layout/editformbegin
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/albumlanguage/edit.html
mb_server/branches/terminology/htdocs/edit/albumquality/edit.html
Log:
s/MOD_EDIT_ALBUM_LANGUAGE/MOD_EDIT_RELEASE_LANGUAGE/
Modified: mb_server/branches/terminology/cgi-bin/ModDefs.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/ModDefs.pm 2008-03-10 16:18:42 UTC (rev 9751)
+++ mb_server/branches/terminology/cgi-bin/ModDefs.pm 2008-03-10 16:21:27 UTC (rev 9752)
@@ -116,7 +116,7 @@
use constant MOD_ADD_LINK_ATTR => 41;
use constant MOD_EDIT_LINK_ATTR => 42;
use constant MOD_REMOVE_LINK_ATTR => 43;
-use constant MOD_EDIT_ALBUM_LANGUAGE => 44;
+use constant MOD_EDIT_RELEASE_LANGUAGE => 44;
use constant MOD_EDIT_TRACKTIME => 45;
use constant MOD_REMOVE_PUID => 46;
use constant MOD_ADD_PUIDS => 47;
@@ -292,7 +292,7 @@
MOD_CHANGE_RELEASE_QUALITY . "" => {'category' => CAT_RELEASE, 'criteria' => ""},
MOD_CHANGE_TRACK_ARTIST . "" => {'category' => CAT_DEPENDS, 'criteria' => "Highest level of release, current artist or new artist"},
MOD_CHANGE_WIKIDOC . "" => {'category' => CAT_NONE, 'criteria' => ""},
- MOD_EDIT_ALBUM_LANGUAGE . "" => {'category' => CAT_RELEASE, 'criteria' => "Auto-edit if no language was set"},
+ MOD_EDIT_RELEASE_LANGUAGE . "" => {'category' => CAT_RELEASE, 'criteria' => "Auto-edit if no language was set"},
MOD_EDIT_ALBUMATTRS . "" => {'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_ARTIST . "" => {'category' => CAT_ARTIST, 'criteria' => "Auto-edit when providing new properties (Begin Date, End Date or Type) or changing capitalisation or accents"},
Modified: mb_server/branches/terminology/cgi-bin/Moderation.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/Moderation.pm 2008-03-10 16:18:42 UTC (rev 9751)
+++ mb_server/branches/terminology/cgi-bin/Moderation.pm 2008-03-10 16:21:27 UTC (rev 9752)
@@ -57,7 +57,7 @@
require MusicBrainz::Server::Moderation::MOD_CHANGE_RELEASE_QUALITY;
require MusicBrainz::Server::Moderation::MOD_CHANGE_TRACK_ARTIST;
require MusicBrainz::Server::Moderation::MOD_CHANGE_WIKIDOC;
-require MusicBrainz::Server::Moderation::MOD_EDIT_ALBUM_LANGUAGE;
+require MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_LANGUAGE;
require MusicBrainz::Server::Moderation::MOD_EDIT_ALBUMATTRS;
require MusicBrainz::Server::Moderation::MOD_EDIT_ALBUMNAME;
require MusicBrainz::Server::Moderation::MOD_EDIT_ARTIST;
@@ -190,8 +190,8 @@
name => &MusicBrainz::Server::Moderation::MOD_EDIT_LINK_ATTR::Name() },
MOD_REMOVE_LINK_ATTR ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_REMOVE_LINK_ATTR::Name() },
- MOD_EDIT_ALBUM_LANGUAGE ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_EDIT_ALBUM_LANGUAGE::Name() },
+ MOD_EDIT_RELEASE_LANGUAGE ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_LANGUAGE::Name() },
MOD_EDIT_TRACKTIME ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_EDIT_TRACKTIME::Name() },
MOD_REMOVE_PUID ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
@@ -314,8 +314,8 @@
name => &MusicBrainz::Server::Moderation::MOD_EDIT_LINK_ATTR::Name() },
MOD_REMOVE_LINK_ATTR ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_REMOVE_LINK_ATTR::Name() },
- MOD_EDIT_ALBUM_LANGUAGE ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_EDIT_ALBUM_LANGUAGE::Name() },
+ MOD_EDIT_RELEASE_LANGUAGE ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_LANGUAGE::Name() },
MOD_EDIT_TRACKTIME ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_EDIT_TRACKTIME::Name() },
MOD_REMOVE_PUID ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
@@ -438,8 +438,8 @@
name => &MusicBrainz::Server::Moderation::MOD_EDIT_LINK_ATTR::Name() },
MOD_REMOVE_LINK_ATTR ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_REMOVE_LINK_ATTR::Name() },
- MOD_EDIT_ALBUM_LANGUAGE ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_EDIT_ALBUM_LANGUAGE::Name() },
+ MOD_EDIT_RELEASE_LANGUAGE ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_LANGUAGE::Name() },
MOD_EDIT_TRACKTIME ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_EDIT_TRACKTIME::Name() },
MOD_REMOVE_PUID ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
@@ -1761,7 +1761,7 @@
if ($this->GetType == &ModDefs::MOD_REMOVE_RELEASES or
$this->GetType == &ModDefs::MOD_MERGE_RELEASE or
$this->GetType == &ModDefs::MOD_MERGE_RELEASE_MAC or
- $this->GetType == &ModDefs::MOD_EDIT_ALBUM_LANGUAGE or
+ $this->GetType == &ModDefs::MOD_EDIT_RELEASE_LANGUAGE or
$this->GetType == &ModDefs::MOD_EDIT_ALBUMATTRS);
$mason->out(qq!<table class="edittype">!);
Deleted: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ALBUM_LANGUAGE.pm
Copied: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_LANGUAGE.pm (from rev 9732, mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ALBUM_LANGUAGE.pm)
Modified: mb_server/branches/terminology/htdocs/comp/form/currentvalue
===================================================================
--- mb_server/branches/terminology/htdocs/comp/form/currentvalue 2008-03-10 16:18:42 UTC (rev 9751)
+++ mb_server/branches/terminology/htdocs/comp/form/currentvalue 2008-03-10 16:21:27 UTC (rev 9752)
@@ -103,7 +103,7 @@
elsif ($release)
{
SWITCH: {
- if ($mp_type == &ModDefs::MOD_EDIT_ALBUM_LANGUAGE)
+ if ($mp_type == &ModDefs::MOD_EDIT_RELEASE_LANGUAGE)
{
$mp = $release->GetLanguageModPending;
last SWITCH;
Modified: mb_server/branches/terminology/htdocs/comp/layout/editformbegin
===================================================================
--- mb_server/branches/terminology/htdocs/comp/layout/editformbegin 2008-03-10 16:18:42 UTC (rev 9751)
+++ mb_server/branches/terminology/htdocs/comp/layout/editformbegin 2008-03-10 16:21:27 UTC (rev 9752)
@@ -41,7 +41,7 @@
$type => undef # artist or release
$id => undef # rowid
$mp => undef # optional moderation type argument
- $mp_type => "" # optional moderation type argument (e.g. MOD_EDIT_ALBUMATTRS|MOD_EDIT_ALBUM_LANGUAGE...)
+ $mp_type => "" # optional moderation type argument (e.g. MOD_EDIT_ALBUMATTRS|MOD_EDIT_RELEASE_LANGUAGE...)
$show_coc => 1
@@ -85,7 +85,7 @@
$mp_url = sprintf($mp_urlrelease, $id);
# release language
- if ($mp_type == &ModDefs::MOD_EDIT_ALBUM_LANGUAGE)
+ if ($mp_type == &ModDefs::MOD_EDIT_RELEASE_LANGUAGE)
{
$mp = $release->GetLanguageModPending;
}
@@ -210,7 +210,7 @@
}
# edit release language
- elsif ($mp_type == &ModDefs::MOD_EDIT_ALBUM_LANGUAGE)
+ elsif ($mp_type == &ModDefs::MOD_EDIT_RELEASE_LANGUAGE)
{
$mp_type_message = $m->scomp("/comp/linkdoc", "EditReleaseLanguageEdit", "Edit Release Language edits");
}
Deleted: mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_ALBUM_LANGUAGE
Copied: mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_RELEASE_LANGUAGE (from rev 9732, mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_ALBUM_LANGUAGE)
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:18:42 UTC (rev 9751)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit 2008-03-10 16:21:27 UTC (rev 9752)
@@ -161,7 +161,7 @@
);
}
- # MOD_EDIT_ALBUM_LANGUAGE
+ # MOD_EDIT_RELEASE_LANGUAGE
# Enter an edit if the album language/script was changed
$ov = $orig{"attr_language"}.",".$orig{"attr_script"};
$nv = $ARGS{"attr_language"}.",".$ARGS{"attr_script"};
@@ -171,7 +171,7 @@
DBH => $mb->{DBH},
uid => $session{uid},
privs => $session{privs},
- type => &ModDefs::MOD_EDIT_ALBUM_LANGUAGE,
+ type => &ModDefs::MOD_EDIT_RELEASE_LANGUAGE,
# --
albums => [ $release ],
language => $ARGS{"attr_language"},
Modified: mb_server/branches/terminology/htdocs/comp/release_editor/review
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/review 2008-03-10 16:18:42 UTC (rev 9751)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/review 2008-03-10 16:21:27 UTC (rev 9752)
@@ -444,7 +444,7 @@
oldvalue => $langvalues[0],
newvalue => $langvalues[1],
- modtype => &ModDefs::MOD_EDIT_ALBUM_LANGUAGE,
+ modtype => &ModDefs::MOD_EDIT_RELEASE_LANGUAGE,
cnt => ++$releasechanges
);
}
Modified: mb_server/branches/terminology/htdocs/edit/albumlanguage/edit.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/albumlanguage/edit.html 2008-03-10 16:18:42 UTC (rev 9751)
+++ mb_server/branches/terminology/htdocs/edit/albumlanguage/edit.html 2008-03-10 16:21:27 UTC (rev 9752)
@@ -130,7 +130,7 @@
DBH => $mb->{DBH},
uid => $session{uid},
privs => $session{privs},
- type => &ModDefs::MOD_EDIT_ALBUM_LANGUAGE,
+ type => &ModDefs::MOD_EDIT_RELEASE_LANGUAGE,
# --
albums => \@releaseobjs,
language => $language_new,
@@ -217,7 +217,7 @@
<& /comp/layout/editformbegin, title => "Edit release language/script",
release => $releaseobjs[0],
- mp_type => &ModDefs::MOD_EDIT_ALBUM_LANGUAGE,
+ mp_type => &ModDefs::MOD_EDIT_RELEASE_LANGUAGE,
&>
% }
@@ -225,7 +225,7 @@
% {
<& /comp/layout/editformbegin, title => "Edit release language/script",
- mp_type => &ModDefs::MOD_EDIT_ALBUM_LANGUAGE,
+ mp_type => &ModDefs::MOD_EDIT_RELEASE_LANGUAGE,
mp => $mp,
&>
@@ -281,7 +281,7 @@
# $m->out(qq!</td><td style="padding-right: 40px">!);
$m->out(qq!<td style="padding-right: 40px">!);
- $m->comp("/comp/form/currentvalue", release => $release, mp_type => &ModDefs::MOD_EDIT_ALBUM_LANGUAGE);
+ $m->comp("/comp/form/currentvalue", release => $release, mp_type => &ModDefs::MOD_EDIT_RELEASE_LANGUAGE);
$m->out(qq!</td><td style="padding-right: 40px">!);
$m->out(
defined $release->GetLanguage
Modified: mb_server/branches/terminology/htdocs/edit/albumquality/edit.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/albumquality/edit.html 2008-03-10 16:18:42 UTC (rev 9751)
+++ mb_server/branches/terminology/htdocs/edit/albumquality/edit.html 2008-03-10 16:21:27 UTC (rev 9752)
@@ -242,7 +242,7 @@
# $m->out(qq!</td><td style="padding-right: 40px">!);
$m->out(qq!<td style="padding-right: 40px">!);
- $m->comp("/comp/form/currentvalue", release => $release, mp_type => &ModDefs::MOD_EDIT_ALBUM_LANGUAGE);
+ $m->comp("/comp/form/currentvalue", release => $release, mp_type => &ModDefs::MOD_EDIT_RELEASE_LANGUAGE);
$m->out(qq!</td><td style="padding-right: 40px">!);
$m->out(ModDefs::GetQualityText($release->GetQuality));
$m->out(qq!</td></tr>!);
More information about the MusicBrainz-commits
mailing list