Use full country name for flag on author page.

Closes #1039.
metacpan · Jan 31, 2014 · 3033db7 · 3033db7
1 parent 7b75e90
commit 3033db7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/lib/MetaCPAN/Web/Controller/Account.pm b/lib/MetaCPAN/Web/Controller/Account.pm
@@ -4,7 +4,6 @@ use Moose;
 use List::MoreUtils qw(pairwise);
 use DateTime ();
 use JSON::XS ();
-use Locale::Country ();
 
 BEGIN { extends 'MetaCPAN::Web::Controller' }
 
@@ -18,7 +17,7 @@ sub auto : Private {
 
 sub logout : Local {
     my ( $self, $c ) = @_;
-    $c->detach('/forbidden') unless( $c->req->method eq 'POST' );
+    $c->detach('/forbidden') unless ( $c->req->method eq 'POST' );
     $c->req->session->expire;
     $c->res->redirect('/');
 }
@@ -74,7 +73,6 @@ sub profile : Local {
         : undef;
     $data->{$_} = $req->params->{$_} eq "" ? undef : $req->params->{$_}
         for (qw(name asciiname gravatar_url city region country));
-    $data->{countryName} = Locale::Country::code2country($req->params->{country}) if $req->params->{country} ne '';
     $data->{$_} = [ grep {$_} $req->param($_) ] for (qw(website email));
     $data->{extra}
         = eval { JSON->new->relaxed->utf8->decode( $req->params->{extra} ) };

diff --git a/lib/MetaCPAN/Web/Controller/Author.pm b/lib/MetaCPAN/Web/Controller/Author.pm
@@ -4,6 +4,7 @@ use Moose;
 use List::Util                ();
 use DateTime::Format::ISO8601 ();
 use namespace::autoclean;
+use Locale::Country ();
 
 BEGIN { extends 'MetaCPAN::Web::Controller' }
 
@@ -47,6 +48,11 @@ sub index : Path : Args(1) {
             template    => 'author.html'
         }
     );
+
+    if ( $author->{country} ne '' ) {
+        $c->stash( author_country_name =>
+                Locale::Country::code2country( $author->{country} ) );
+    }
 }
 
 __PACKAGE__->meta->make_immutable;

diff --git a/root/author.html b/root/author.html
@@ -25,7 +25,7 @@
 <% IF author.country || author.city || author.region %>
 <strong>Location</strong><br>
 <% IF author.country %>
-<img src="/static/images/flag/<% author.country.lower %>.png" alt="<% author.countryName %>" title="<% author.countryName %>" width=16 height=11> &nbsp;
+<img src="/static/images/flag/<% author.country.lower %>.png" alt="<% author_country_name %>" title="<% author_country_name %>" width=16 height=11> &nbsp;
 <%- END %>
 <%- author.city; %><% IF author.city && author.region %>, <% END %><%- author.region %><br>
 <% END %>