Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge remote branch 'navap/nitpick14'

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

0 comments on commit 4830be2

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