Skip to content

Commit

Permalink
Merge branch 'beta'
Browse files Browse the repository at this point in the history
* beta:
  Use flushSync to avoid render lag (fixes MBS-12424) (#2559)
  Update translations from Transifex
  MBS-12420: Support comma-separated IDs for edit search types again (#2556)
  MBS-12416: Avoid wrapping in menu links
  MBS-12415: Stop most interface wrapping
  • Loading branch information
mwiencek committed Jun 2, 2022
2 parents 9fbd4e7 + 62e78c0 commit d63f32f
Show file tree
Hide file tree
Showing 33 changed files with 2,601 additions and 1,903 deletions.
23 changes: 23 additions & 0 deletions lib/MusicBrainz/Server/EditSearch/Predicate/EditIDSet.pm
@@ -0,0 +1,23 @@
package MusicBrainz::Server::EditSearch::Predicate::EditIDSet;
use Moose;
use namespace::autoclean;
use List::AllUtils qw( any );
use MusicBrainz::Server::Validation qw( is_integer );

extends 'MusicBrainz::Server::EditSearch::Predicate::Set';

sub valid {
my ($self) = @_;

return 0 unless $self->arguments > 0;

# We support one edit type having multiple IDs (for historical edits)
for my $argument ($self->arguments) {
my @ids = split(/,/, $argument);
return 0 if any { !is_integer($_) } @ids;
}

return 1;
}

1;
4 changes: 3 additions & 1 deletion lib/MusicBrainz/Server/EditSearch/Predicate/Set.pm
Expand Up @@ -16,10 +16,12 @@ sub operator_cardinality_map {
sub valid {
my ($self) = @_;

return 0 unless $self->arguments > 0;

# If you want to allow non-integer sets, please create ::IntegerSet, etc
return 0 if any { !is_integer($_) } $self->arguments;

return $self->arguments > 0;
return 1;
}

sub combine_with_query {
Expand Down
3 changes: 2 additions & 1 deletion lib/MusicBrainz/Server/EditSearch/Query.pm
Expand Up @@ -8,6 +8,7 @@ use Moose::Util::TypeConstraints qw( enum role_type );
use MusicBrainz::Server::Constants qw( $LIMIT_FOR_EDIT_LISTING entities_with );
use MusicBrainz::Server::EditSearch::Predicate::Date;
use MusicBrainz::Server::EditSearch::Predicate::ID;
use MusicBrainz::Server::EditSearch::Predicate::EditIDSet;
use MusicBrainz::Server::EditSearch::Predicate::Set;
use MusicBrainz::Server::EditSearch::Predicate::Entity;
use MusicBrainz::Server::EditSearch::Predicate::Editor;
Expand All @@ -32,7 +33,7 @@ my %field_map = (
open_time => 'MusicBrainz::Server::EditSearch::Predicate::Date',
close_time => 'MusicBrainz::Server::EditSearch::Predicate::Date',
expire_time => 'MusicBrainz::Server::EditSearch::Predicate::Date',
type => 'MusicBrainz::Server::EditSearch::Predicate::Set',
type => 'MusicBrainz::Server::EditSearch::Predicate::EditIDSet',
status => 'MusicBrainz::Server::EditSearch::Predicate::Set',
vote_count => 'MusicBrainz::Server::EditSearch::Predicate::VoteCount',
editor => 'MusicBrainz::Server::EditSearch::Predicate::Editor',
Expand Down
10 changes: 5 additions & 5 deletions po/attributes.it.po
Expand Up @@ -6,15 +6,15 @@
# Gioele <email address hidden>, 2012
# Gioele <email address hidden>, 2012
# leofiore <email address hidden>, 2012
# Luca Salini, 2016-2022
# Luca Salini, 2013-2015
# Luca Salini, 2012
# Luca Salini, 2022
# salo.rock, 2016-2022
# salo.rock, 2013-2015
# salo.rock, 2012
# salo.rock, 2022
msgid ""
msgstr ""
"Project-Id-Version: MusicBrainz\n"
"PO-Revision-Date: 2012-05-24 18:52+0000\n"
"Last-Translator: Luca Salini, 2022\n"
"Last-Translator: salo.rock, 2022\n"
"Language-Team: Italian (http://www.transifex.com/musicbrainz/musicbrainz/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
6 changes: 3 additions & 3 deletions po/countries.it.po
Expand Up @@ -2,13 +2,13 @@
# Translators:
# Gioele <email address hidden>, 2012
# leofiore <email address hidden>, 2012
# Luca Salini, 2014-2015
# Luca Salini, 2012
# salo.rock, 2014-2015
# salo.rock, 2012
msgid ""
msgstr ""
"Project-Id-Version: MusicBrainz\n"
"PO-Revision-Date: 2012-05-24 19:20+0000\n"
"Last-Translator: Luca Salini, 2014-2015\n"
"Last-Translator: salo.rock, 2014-2015\n"
"Language-Team: Italian (http://www.transifex.com/musicbrainz/musicbrainz/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
10 changes: 5 additions & 5 deletions po/instrument_descriptions.it.po
Expand Up @@ -7,16 +7,16 @@
# Fen0x F <email address hidden>, 2020
# Gioele <email address hidden>, 2012
# leofiore <email address hidden>, 2012
# Luca Salini, 2020-2022
# Luca Salini, 2020
# Luca Salini, 2012
# Luca Salini, 2022
# salo.rock, 2020-2022
# salo.rock, 2020
# salo.rock, 2012
# salo.rock, 2022
# Valentina Menale <email address hidden>, 2016
msgid ""
msgstr ""
"Project-Id-Version: MusicBrainz\n"
"PO-Revision-Date: 2012-05-24 19:17+0000\n"
"Last-Translator: Luca Salini, 2020-2022\n"
"Last-Translator: salo.rock, 2020-2022\n"
"Language-Team: Italian (http://www.transifex.com/musicbrainz/musicbrainz/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
6 changes: 3 additions & 3 deletions po/instruments.it.po
Expand Up @@ -7,15 +7,15 @@
# Gioele <email address hidden>, 2012
# leofiore <email address hidden>, 2012
# Luca Panfilo <email address hidden>, 2017
# Luca Salini, 2020-2022
# salo.rock, 2020-2022
# Monica <email address hidden>, 2014
# Luca Salini, 2012
# salo.rock, 2012
# Valentina Menale <email address hidden>, 2016
msgid ""
msgstr ""
"Project-Id-Version: MusicBrainz\n"
"PO-Revision-Date: 2012-05-24 18:57+0000\n"
"Last-Translator: Luca Salini, 2020-2022\n"
"Last-Translator: salo.rock, 2020-2022\n"
"Language-Team: Italian (http://www.transifex.com/musicbrainz/musicbrainz/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down
8 changes: 4 additions & 4 deletions po/languages.it.po
Expand Up @@ -2,14 +2,14 @@
# Translators:
# Gioele <email address hidden>, 2012
# leofiore <email address hidden>, 2012
# Luca Salini, 2016-2022
# Luca Salini, 2013-2015
# Luca Salini, 2012
# salo.rock, 2016-2022
# salo.rock, 2013-2015
# salo.rock, 2012
msgid ""
msgstr ""
"Project-Id-Version: MusicBrainz\n"
"PO-Revision-Date: 2012-05-24 19:23+0000\n"
"Last-Translator: Luca Salini, 2016-2022\n"
"Last-Translator: salo.rock, 2016-2022\n"
"Language-Team: Italian (http://www.transifex.com/musicbrainz/musicbrainz/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down

0 comments on commit d63f32f

Please sign in to comment.