Merge branch 'beta'

Conflicts:
	lib/VNDB/Handler/Discussions.pm

1 files changed, 6 insertions, 2 deletions

diff --git a/lib/VNDB/Handler/Producers.pm b/lib/VNDB/Handler/Producers.pm
index 2931e25f..6e11e829 100644
--- a/lib/VNDB/Handler/Producers.pm
+++ b/lib/VNDB/Handler/Producers.pm
@@ -60,13 +60,13 @@ sub page {
       [ type      => serialize => sub { mt "_ptype_$_[0]" } ],
       [ name      => diff => 1 ],
       [ original  => diff => 1 ],
-      [ alias     => diff => 1 ],
+      [ alias     => diff => qr/[ ,\n\.]/ ],
       [ lang      => serialize => sub { "$_[0] (".mt("_lang_$_[0]").')' } ],
       [ website   => diff => 1 ],
       [ l_wp      => htmlize => sub {
         $_[0] ? sprintf '<a href="http://en.wikipedia.org/wiki/%s">%1$s</a>', xml_escape $_[0] : mt '_revision_nolink'
       }],
-      [ desc      => diff => 1 ],
+      [ desc      => diff => qr/[ ,\n\.]/ ],
       [ relations   => join => '<br />', split => sub {
         my @r = map sprintf('%s: <a href="/p%d" title="%s">%s</a>',
           mt("_prodrel_$_->{relation}"), $_->{id}, xml_escape($_->{original}||$_->{name}), xml_escape shorten $_->{name}, 40
@@ -153,6 +153,10 @@ sub _releases {
        td colspan => 6;
         i; lit $self->{l10n}->datestr($vn{$v->{vid}}[0]{released}); end;
         a href => "/v$v->{vid}", title => $v->{original}, $v->{title};
+        span '('.join(', ',
+           (grep($_->{developer}, @{$vn{$v->{vid}}}) ? mt '_prodpage_dev' : ()),
+           (grep($_->{publisher}, @{$vn{$v->{vid}}}) ? mt '_prodpage_pub' : ())
+        ).')';
        end;
       end;
       for my $rel (@{$vn{$v->{vid}}}) {