Permalink
Browse files

Merge remote branch 'navap/nitpick14'

* navap/nitpick14:
  MBS-3520: Rename "quality" to "data quality"
  MBS-1911: Cryptic warning when merging works
  • Loading branch information...
2 parents 68d12c8 + aef8a4f commit 4830be27093b664daa71de1f2a03de0e4c64b3ca Oliver Charles committed Jan 4, 2012
View
4 lib/MusicBrainz/Server/Form/Merge.pm
@@ -1,6 +1,7 @@
package MusicBrainz::Server::Form::Merge;
use HTML::FormHandler::Moose;
use namespace::autoclean;
+use MusicBrainz::Server::Translation 'l';
extends 'MusicBrainz::Server::Form';
with 'MusicBrainz::Server::Form::Role::Edit';
@@ -11,7 +12,8 @@ has '+name' => ( default => 'merge' );
has_field 'target' => (
type => '+MusicBrainz::Server::Form::Field::Integer',
- required => 1
+ required => 1,
+ required_message => l('Please pick which work you want the others merged into.')
);
has_field 'merging' => (
View
8 root/components/common-macros.tt
@@ -448,10 +448,10 @@ END -%]
[%- END -%]
[%- MACRO quality_name(quality) SWITCH quality;
- CASE 0; l('low quality level');
- CASE 1; l('normal quality level');
- CASE -1; l('normal quality level');
- CASE 2; l('high quality level');
+ CASE 0; l('Low');
+ CASE 1; l('Normal');
+ CASE -1; l('Normal');
+ CASE 2; l('High');
END -%]
[%- MACRO edit_conditions(expire_action) SWITCH expire_action;
View
4 root/doc/edit_type.tt
@@ -32,9 +32,9 @@
<table class="tbl">
<thead>
<tr>
- <th></th>
+ <th>[% l('Data Quality') %]</th>
[% FOR quality=quality_levels %]
- <th>[% make_ucfirst(quality_name(quality)) %]</th>
+ <th>[% quality_name(quality) %]</th>
[% END %]
</tr>
</thead>
View
6 root/edit/details/change_artist_quality.tt
@@ -4,8 +4,8 @@
<td colspan="2">[% link_entity(edit.display_data.artist) %]</td>
</tr>
<tr>
- <th>[% l('Quality:') %]</th>
- <td class="old">[% make_ucfirst(quality_name(edit.display_data.quality.old)) %]</td>
- <td class="new">[% make_ucfirst(quality_name(edit.display_data.quality.new)) %]</td>
+ <th>[% l('Data Quality:') %]</th>
+ <td class="old">[% quality_name(edit.display_data.quality.old) %]</td>
+ <td class="new">[% quality_name(edit.display_data.quality.new) %]</td>
</tr>
</table>
View
6 root/edit/details/change_release_quality.tt
@@ -4,8 +4,8 @@
<td colspan="2">[% descriptive_link(edit.display_data.release) %]</td>
</tr>
<tr>
- <th>[% l('Quality:') %]</th>
- <td class="old">[% make_ucfirst(quality_name(edit.display_data.quality.old)) %]</td>
- <td class="new">[% make_ucfirst(quality_name(edit.display_data.quality.new)) %]</td>
+ <th>[% l('Data Quality:') %]</th>
+ <td class="old">[% quality_name(edit.display_data.quality.old) %]</td>
+ <td class="new">[% quality_name(edit.display_data.quality.new) %]</td>
</tr>
</table>
View
6 root/edit/details/historic/change_release_quality.tt
@@ -11,9 +11,9 @@
</td>
</tr>
<tr>
- <th>[% l('Quality:') %]</th>
- <td class="old">[% make_ucfirst(quality_name(change.quality.old)) %]</td>
- <td class="new">[% make_ucfirst(quality_name(change.quality.new)) %]</td>
+ <th>[% l('Data Quality:') %]</th>
+ <td class="old">[% quality_name(change.quality.old) %]</td>
+ <td class="new">[% quality_name(change.quality.new) %]</td>
</tr>
[% END %]
</table>
View
4 root/edit/info.tt
@@ -43,8 +43,8 @@
content=(edit.status == 8) ? l('<em>Cancelling</em>') : html_escape(UserDate.format(edit.close_time)) %]
[% END %]
- [%- INCLUDE 'layout/sidebar/property.tt' label=l('Affects:')
- content=make_ucfirst(quality_name(edit.quality)) -%]
+ [%- INCLUDE 'layout/sidebar/property.tt' label=l('Data Quality:')
+ content=quality_name(edit.quality) -%]
[%- INCLUDE 'layout/sidebar/property.tt' label=l('Requires:')
content=ln('1 vote', '{n} unanimous votes', edit.conditions.votes,
{ n => edit.conditions.votes }) -%]
View
6 root/release/change_quality.tt
@@ -1,8 +1,8 @@
-[% WRAPPER 'release/layout.tt' title=l('Change release quality') full_width=1 %]
- <h2>[% l('Change quality') %]</h2>
+[% WRAPPER 'release/layout.tt' title=l('Change release data quality') full_width=1 %]
+ <h2>[% l('Change release data quality') %]</h2>
<form method="post">
[% USE r = FormRenderer(form) %]
- [% form_row_select(r, 'quality', l('Quality:')) %]
+ [% form_row_select(r, 'quality', l('Data Quality:')) %]
[% INCLUDE 'forms/edit-note.tt' %]
[% enter_edit() %]
</form>
View
4 root/release/sidebar.tt
@@ -33,8 +33,8 @@
content=release.language.name IF release.language.name;
INCLUDE 'layout/sidebar/property.tt' label=l('Script:')
content=release.script.name IF release.script.name;
- INCLUDE 'layout/sidebar/property.tt' label=l('Quality:')
- content=make_ucfirst(quality_name(release.quality)) IF release.quality != -1;
+ INCLUDE 'layout/sidebar/property.tt' label=l('Data Quality:')
+ content=quality_name(release.quality) IF release.quality != -1;
END %]
[% IF release.labels.size %]

0 comments on commit 4830be2

Please sign in to comment.