[mb-commits] branch, beta, updated. Merge remote-tracking branch 'ianmcorvidae/mbs-5492-english-name-countries' i...

The branch, beta has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=869c96e2f3ee4949857bcd1fd5f6c2e0c3df8e69 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=cbe3a586faebaa47e36906834035fff923fc757c (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=da00e4accfb56c782127ec4eb7578c9cc0e096b4 (commit)

Summary of changes:
 lib/MusicBrainz/Server/Entity/Country.pm  |   21 ---------------------
 root/otherlookup/results-release.tt       |    2 +-
 root/search/lib/inline-results-release.tt |    2 +-
 3 files changed, 2 insertions(+), 23 deletions(-)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 869c96e2f3ee4949857bcd1fd5f6c2e0c3df8e69
Merge: da00e4a cbe3a58
Author: warp <[email protected]>
Date:   Mon Nov 5 13:20:59 2012 +0100

    Merge remote-tracking branch 'ianmcorvidae/mbs-5492-english-name-countries' into beta
    
    * ianmcorvidae/mbs-5492-english-name-countries:
      MBS-5492: get rid of iso_code_for_display, fixing i18n and some special-casing too


commit cbe3a586faebaa47e36906834035fff923fc757c
Author: Ian McEwen <[email protected]>
Date:   Tue Oct 30 13:49:40 2012 -0700

    MBS-5492: get rid of iso_code_for_display, fixing i18n and some special-casing too

diff --git a/lib/MusicBrainz/Server/Entity/Country.pm b/lib/MusicBrainz/Server/Entity/Country.pm
index c5452e9..82d94b0 100644
--- a/lib/MusicBrainz/Server/Entity/Country.pm
+++ b/lib/MusicBrainz/Server/Entity/Country.pm
@@ -20,27 +20,6 @@ has 'iso_code' => (
     isa => 'Str'
 );
 
-=method iso_code_for_display
-
-Any iso code starting with 'X' should be considered internal to how
-MusicBrainz operates and never be displayed to the user.  This
-function will output normal iso codes for any valid iso code, but
-output the name for the X* codes -- possibly shortened if the name
-contains a comment about historical usage.
-
-=cut
-
-sub iso_code_for_display {
-    my $self = shift;
-
-    return $self->iso_code unless $self->iso_code =~ m/^X/;
-
-    my $name = $self->name;
-    $name =~ s/ \(historical.*//;
-
-    return $name;
-};
-
 __PACKAGE__->meta->make_immutable;
 no Moose;
 1;
diff --git a/root/otherlookup/results-release.tt b/root/otherlookup/results-release.tt
index a87fdf2..66cec70 100644
--- a/root/otherlookup/results-release.tt
+++ b/root/otherlookup/results-release.tt
@@ -21,7 +21,7 @@
               <td>[% artist_credit(result.artist_credit) %]</td>
               <td>[% result.combined_track_count %]</td>
               <td>
-                <abbr title="[% result.country.name %]">[% result.country.iso_code_for_display %]</abbr>
+                <abbr title="[% result.country.name %]">[% result.country.iso_code %]</abbr>
               </td>
               <td>
                 <abbr title="[% result.language.name %]">[% result.language.iso_code_3 %]</abbr>
diff --git a/root/search/lib/inline-results-release.tt b/root/search/lib/inline-results-release.tt
index d59d4e4..7b7c027 100644
--- a/root/search/lib/inline-results-release.tt
+++ b/root/search/lib/inline-results-release.tt
@@ -26,7 +26,7 @@
           <td>[% artist_credit(result.entity.artist_credit) %]</td>
           <td>[% result.entity.combined_track_count %]</td>
           <td>
-            <abbr title="[% result.entity.country.l_name %]">[% result.entity.country.iso_code_for_display %]</abbr>
+            <abbr title="[% result.entity.country.l_name %]">[% result.entity.country.iso_code %]</abbr>
           </td>
           <td>
             <abbr title="[% result.entity.language.l_name %]">[% result.entity.language.iso_code_3 %]</abbr>

-----------------------------------------------------------------------


hooks/post-receive
-- 
mb_server