Skip to content

Commit 169b862

Browse files
reosarevokreosarevok
committed
Merge branch 'production'
* production: Update translations from Transifex MBS-11444: Pass Label->new() call through to_json_object MBS-11441: Beta: ISE on /account/applications
2 parents 8c4b0ff + 11446cf commit 169b862

17 files changed

+227
-225
lines changed

‎lib/MusicBrainz/Server/Edit/Label/Create.pm

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ sub build_display_data
7070
my ($self, $loaded) = @_;
7171

7272
my $data = {
73-
label => ($self->entity_id && to_json_object(
73+
label => to_json_object(($self->entity_id &&
7474
$loaded->{Label}{ $self->entity_id }) ||
7575
Label->new( name => $self->data->{name} )
7676
),

‎lib/MusicBrainz/Server/Entity/EditorOAuthToken.pm

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use MusicBrainz::Server::Types qw( DateTime );
88
use MusicBrainz::Server::Translation qw( N_l );
99
use MusicBrainz::Server::Data::Utils qw( boolean_to_json datetime_to_iso8601 );
1010
use MusicBrainz::Server::Entity::Types;
11+
use MusicBrainz::Server::Entity::Util::JSON qw( to_json_object );
1112

1213
extends 'MusicBrainz::Server::Entity';
1314

@@ -118,7 +119,7 @@ around TO_JSON => sub {
118119

119120
return {
120121
%{ $self->$orig },
121-
application => $self->application,
122+
application => to_json_object($self->application),
122123
editor => defined $self->editor ? $self->editor->TO_JSON : undef,
123124
granted => datetime_to_iso8601($self->granted),
124125
is_offline => boolean_to_json($self->is_offline),

‎po/attributes.fr.po

+20-20
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
msgid ""
3030
msgstr ""
3131
"Project-Id-Version: MusicBrainz\n"
32-
"PO-Revision-Date: 2021-03-01 17:25+0000\n"
33-
"Last-Translator: Nicolás Tamargo <email address hidden>\n"
32+
"PO-Revision-Date: 2021-03-15 08:22+0000\n"
33+
"Last-Translator: yvanz\n"
3434
"Language-Team: French (http://www.transifex.com/musicbrainz/musicbrainz/language/fr/)\n"
3535
"MIME-Version: 1.0\n"
3636
"Content-Type: text/plain; charset=UTF-8\n"
@@ -451,7 +451,7 @@ msgstr "La♯ mineur"
451451
#: DB:work_attribute_type/name:57
452452
msgctxt "work_attribute_type"
453453
msgid "AACIMH ID"
454-
msgstr ""
454+
msgstr "ID AACIMH"
455455

456456
#: DB:work_attribute_type/name:44
457457
msgctxt "work_attribute_type"
@@ -466,7 +466,7 @@ msgstr "ID ACDAM"
466466
#: DB:work_attribute_type/name:58
467467
msgctxt "work_attribute_type"
468468
msgid "AEI ID"
469-
msgstr ""
469+
msgstr "ID AEI"
470470

471471
#: DB:work_attribute_type/name:43
472472
msgctxt "work_attribute_type"
@@ -476,7 +476,7 @@ msgstr "ID AGADU"
476476
#: DB:work_attribute_type/name:63
477477
msgctxt "work_attribute_type"
478478
msgid "AKKA/LAA ID"
479-
msgstr ""
479+
msgstr "ID AKKA/LAA"
480480

481481
#: DB:work_attribute_type/name:23
482482
msgctxt "work_attribute_type"
@@ -2817,7 +2817,7 @@ msgstr "HDCD"
28172817
#: DB:work_attribute_type/name:64
28182818
msgctxt "work_attribute_type"
28192819
msgid "HFA ID"
2820-
msgstr ""
2820+
msgstr "ID HFA"
28212821

28222822
#: DB:medium_format/name:37
28232823
msgctxt "medium_format"
@@ -3207,7 +3207,7 @@ msgstr "ID pour la SABAM, société belge de gestion des droits d'auteur"
32073207
#: DB:work_attribute_type/description:61
32083208
msgctxt "work_attribute_type"
32093209
msgid "ID for the Bolivian rights society SOBODAYCOM"
3210-
msgstr ""
3210+
msgstr "ID pour la SOBODAYCOM, société bolivienne de gestion des droits d'auteur"
32113211

32123212
#: DB:work_attribute_type/description:37
32133213
msgctxt "work_attribute_type"
@@ -3257,7 +3257,7 @@ msgstr "ID pour la KODA, société danoise de gestion des droits"
32573257
#: DB:work_attribute_type/description:60
32583258
msgctxt "work_attribute_type"
32593259
msgid "ID for the Dominican rights society SGACEDOM"
3260-
msgstr ""
3260+
msgstr "ID pour la SGACEDOM, société dominicaine de gestion des droits d'auteur"
32613261

32623262
#: DB:work_attribute_type/description:26
32633263
msgctxt "work_attribute_type"
@@ -3282,12 +3282,12 @@ msgstr "ID pour la GEMA, société allemande de gestion des droits"
32823282
#: DB:work_attribute_type/description:58
32833283
msgctxt "work_attribute_type"
32843284
msgid "ID for the Guatemalan rights society AEI"
3285-
msgstr ""
3285+
msgstr "ID pour l’AEI, société guatémaltèque de gestion des droits"
32863286

32873287
#: DB:work_attribute_type/description:57
32883288
msgctxt "work_attribute_type"
32893289
msgid "ID for the Honduran rights society AACIMH"
3290-
msgstr ""
3290+
msgstr "ID pour l’AACIMH, société hondurienne de gestion des droits d'auteur"
32913291

32923292
#: DB:work_attribute_type/description:19
32933293
msgctxt "work_attribute_type"
@@ -3337,7 +3337,7 @@ msgstr "ID pour la KOMCA, société coréenne de gestion des droits"
33373337
#: DB:work_attribute_type/description:63
33383338
msgctxt "work_attribute_type"
33393339
msgid "ID for the Latvian rights society AKKA/LAA"
3340-
msgstr ""
3340+
msgstr "ID pour l’AKKA/LAA, société lettone de gestion des droits"
33413341

33423342
#: DB:work_attribute_type/description:49
33433343
msgctxt "work_attribute_type"
@@ -3352,12 +3352,12 @@ msgstr "ID pour la SACM, société mexicaine de gestion des droits d'auteur"
33523352
#: DB:work_attribute_type/description:59
33533353
msgctxt "work_attribute_type"
33543354
msgid "ID for the Nicaraguan rights society NICAUTOR"
3355-
msgstr ""
3355+
msgstr "ID pour la NICAUTOR, société nicaraguayenne de gestion des droits"
33563356

33573357
#: DB:work_attribute_type/description:62
33583358
msgctxt "work_attribute_type"
33593359
msgid "ID for the Panamanian rights society SPAC"
3360-
msgstr ""
3360+
msgstr "ID pour la SPAC, société panaméenne de gestion des droits d'auteur"
33613361

33623362
#: DB:work_attribute_type/description:46
33633363
msgctxt "work_attribute_type"
@@ -3382,7 +3382,7 @@ msgstr "ID pour la SPA, société portugaise de gestion des droits"
33823382
#: DB:work_attribute_type/description:56
33833383
msgctxt "work_attribute_type"
33843384
msgid "ID for the Salvadoran rights society SACIM"
3385-
msgstr ""
3385+
msgstr "ID pour la SACIM, société salvadorienne de gestion des droits d'auteur"
33863386

33873387
#: DB:work_attribute_type/description:45
33883388
msgctxt "work_attribute_type"
@@ -3452,7 +3452,7 @@ msgstr "ID pour la CCLI, compagnie privée de gestion de licences"
34523452
#: DB:work_attribute_type/description:64
34533453
msgctxt "work_attribute_type"
34543454
msgid "ID for the private licensing company HFA (Harry Fox Agency)"
3455-
msgstr ""
3455+
msgstr "ID pour la HFA (Harry Fox Agency), compagnie privée de gestion de licences"
34563456

34573457
#: DB:work_attribute_type/name:52
34583458
msgctxt "work_attribute_type"
@@ -4791,7 +4791,7 @@ msgstr "Môhanam"
47914791
#: DB:work_attribute_type/name:59
47924792
msgctxt "work_attribute_type"
47934793
msgid "NICAUTOR ID"
4794-
msgstr ""
4794+
msgstr "ID NICAUTOR"
47954795

47964796
#: DB:work_attribute_type_allowed_value/value:647
47974797
msgctxt "work_attribute_type_allowed_value"
@@ -5859,7 +5859,7 @@ msgstr "ID SACEM"
58595859
#: DB:work_attribute_type/name:56
58605860
msgctxt "work_attribute_type"
58615861
msgid "SACIM ID"
5862-
msgstr ""
5862+
msgstr "ID SACIM"
58635863

58645864
#: DB:work_attribute_type/name:27
58655865
msgctxt "work_attribute_type"
@@ -5899,7 +5899,7 @@ msgstr "ID SESAC"
58995899
#: DB:work_attribute_type/name:60
59005900
msgctxt "work_attribute_type"
59015901
msgid "SGACEDOM ID"
5902-
msgstr ""
5902+
msgstr "ID SGACEDOM"
59035903

59045904
#: DB:work_attribute_type/name:20
59055905
msgctxt "work_attribute_type"
@@ -5934,7 +5934,7 @@ msgstr "SIAE ID"
59345934
#: DB:work_attribute_type/name:61
59355935
msgctxt "work_attribute_type"
59365936
msgid "SOBODAYCOM ID"
5937-
msgstr ""
5937+
msgstr "ID SOBODAYCOM"
59385938

59395939
#: DB:work_attribute_type/name:10
59405940
msgctxt "work_attribute_type"
@@ -5954,7 +5954,7 @@ msgstr "SPA ID"
59545954
#: DB:work_attribute_type/name:62
59555955
msgctxt "work_attribute_type"
59565956
msgid "SPAC ID"
5957-
msgstr ""
5957+
msgstr "ID SPAC"
59585958

59595959
#: DB:work_attribute_type/name:54
59605960
msgctxt "work_attribute_type"

‎po/instrument_descriptions.es.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# Marta PD <email address hidden>, 2014
1212
# Maurizio Corripio <email address hidden>, 2019
1313
# Nicolás Tamargo <email address hidden>, 2011-2013
14-
# Peter Cuevas H <email address hidden>, 2020
14+
# Peter Cuevas <email address hidden>, 2020
1515
# Salvador Morales León <email address hidden>, 2016
1616
# t0n3t <email address hidden>, 2012
1717
# Kevin Doncam Demian López Brante <email address hidden>, 2012

‎po/instrument_descriptions.it.po

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
msgid ""
1515
msgstr ""
1616
"Project-Id-Version: MusicBrainz\n"
17-
"PO-Revision-Date: 2021-03-11 07:23+0000\n"
18-
"Last-Translator: Nicolás Tamargo <email address hidden>\n"
17+
"PO-Revision-Date: 2021-03-11 22:07+0000\n"
18+
"Last-Translator: Luca Salini\n"
1919
"Language-Team: Italian (http://www.transifex.com/musicbrainz/musicbrainz/language/it/)\n"
2020
"MIME-Version: 1.0\n"
2121
"Content-Type: text/plain; charset=UTF-8\n"
@@ -1571,7 +1571,7 @@ msgid ""
15711571
"Large wide tube with a very strongly flaring bell, the telescoping creates "
15721572
"only subtle fluctuating overtones. It inspired the name of the anti-tank "
15731573
"weapon."
1574-
msgstr ""
1574+
msgstr "Tubo grande e largo con un padiglione a campana molto svasato, manipolandone la lunghezza si creano tenui armoniche superiori fluttuanti. Ha ispirato il nome dell'arma anticarro."
15751575

15761576
#. name:reed organ
15771577
#: DB:instrument/description:204
@@ -1656,7 +1656,7 @@ msgstr "Assomiglia ad un flauto dolce, ma ha ance doppie e il sistema di diteggi
16561656
#. name:marimba lumina
16571657
#: DB:instrument/description:767
16581658
msgid "MIDI controller with a marimba-layout inspired control deck"
1659-
msgstr ""
1659+
msgstr "Controller MIDI con una superficie di controllo ispirata alla struttura di una marimba."
16601660

16611661
#. name:madal
16621662
#: DB:instrument/description:186

‎po/languages.es.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# Maurizio Corripio <email address hidden>, 2019
1212
# Nacho Pique, 2016
1313
# Nicolás Tamargo <email address hidden>, 2011-2013
14-
# Peter Cuevas H <email address hidden>, 2017
14+
# Peter Cuevas <email address hidden>, 2017
1515
# Pier Jose Gotta Perez <email address hidden>, 2017
1616
# Kevin Doncam Demian López Brante <email address hidden>, 2012
1717
# Tobias Quathamer <email address hidden>, 2007

‎po/mb_server.de.po

+17-17
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ msgid ""
6969
msgstr ""
7070
"Project-Id-Version: MusicBrainz\n"
7171
"Report-Msgid-Bugs-To: \n"
72-
"POT-Creation-Date: 2021-03-11 09:21+0200\n"
72+
"POT-Creation-Date: 2021-03-11 22:21+0200\n"
7373
"PO-Revision-Date: 2021-03-11 07:23+0000\n"
7474
"Last-Translator: Nicolás Tamargo <email address hidden>\n"
7575
"Language-Team: German (http://www.transifex.com/musicbrainz/musicbrainz/language/de/)\n"
@@ -858,7 +858,7 @@ msgstr "Strichcode"
858858
#: ../root/edit/details/edit_barcodes.tt:17
859859
#: ../root/edit/details/edit_barcodes.tt:21
860860
#: ../root/edit/details/edit_release.tt:53
861-
#: ../root/edit/details/edit_release_label.tt:61
861+
#: ../root/edit/details/edit_release_label.tt:60
862862
#: ../root/release/edit/information.tt:216
863863
#: ../root/release_group/set_cover_art.tt:62
864864
#: ../root/layout/components/sidebar/CDStubSidebar.js:76
@@ -1253,7 +1253,7 @@ msgstr "Kopiere zu Enddatum"
12531253
msgid "Country"
12541254
msgstr "Land"
12551255

1256-
#: ../root/edit/details/edit_release_label.tt:44
1256+
#: ../root/edit/details/edit_release_label.tt:43
12571257
#: ../root/release/edit/information.tt:150
12581258
#: ../root/release_group/set_cover_art.tt:41
12591259
msgid "Country:"
@@ -1351,7 +1351,7 @@ msgstr "Datum"
13511351
msgid "Date Period"
13521352
msgstr "Zeitraum"
13531353

1354-
#: ../root/edit/details/edit_release_label.tt:38
1354+
#: ../root/edit/details/edit_release_label.tt:37
13551355
#: ../root/release/edit/information.tt:124
13561356
#: ../root/release_group/set_cover_art.tt:37
13571357
#: ../root/layout/components/sidebar/EventSidebar.js:56
@@ -1931,7 +1931,7 @@ msgstr "Weitere Informationen findest du in der {doc_doc|Dokumentation}."
19311931
msgid "Format"
19321932
msgstr "Format"
19331933

1934-
#: ../root/edit/details/edit_release_label.tt:67
1934+
#: ../root/edit/details/edit_release_label.tt:66
19351935
#: ../root/release/edit/tracklist.tt:292
19361936
#: ../root/release_group/set_cover_art.tt:46
19371937
#: ../root/edit/details/AddMedium.js:149
@@ -2103,7 +2103,7 @@ msgstr ""
21032103

21042104
#: ../root/components/common-macros.tt:607
21052105
#: ../lib/MusicBrainz/Server/Controller/Edit.pm:236
2106-
#: ../root/static/scripts/common/constants.js:259
2106+
#: ../root/static/scripts/common/constants.js:260
21072107
msgid "High"
21082108
msgstr "Hoch"
21092109

@@ -2590,7 +2590,7 @@ msgstr "Anzahl Aufrufe"
25902590

25912591
#: ../root/components/common-macros.tt:607
25922592
#: ../lib/MusicBrainz/Server/Controller/Edit.pm:236
2593-
#: ../root/static/scripts/common/constants.js:256
2593+
#: ../root/static/scripts/common/constants.js:257
25942594
msgid "Low"
25952595
msgstr "Niedrig"
25962596

@@ -3002,8 +3002,8 @@ msgstr "Keinem der Medien auf dieser Veröffentlichung kann die angegebene CD-TO
30023002

30033003
#: ../root/components/common-macros.tt:607
30043004
#: ../lib/MusicBrainz/Server/Controller/Edit.pm:236
3005-
#: ../root/static/scripts/common/constants.js:257
30063005
#: ../root/static/scripts/common/constants.js:258
3006+
#: ../root/static/scripts/common/constants.js:259
30073007
msgid "Normal"
30083008
msgstr "Normal"
30093009

@@ -3601,7 +3601,7 @@ msgid "Release event"
36013601
msgstr "Veröffentlichungsereignis"
36023602

36033603
#: ../root/edit/details/add_release.tt:74
3604-
#: ../root/edit/details/edit_release_label.tt:50
3604+
#: ../root/edit/details/edit_release_label.tt:49
36053605
#: ../root/static/scripts/edit/components/edit/ReleaseEventsDiff.js:120
36063606
msgid "Release events:"
36073607
msgstr "Veröffentlichungsereignisse:"
@@ -7537,22 +7537,22 @@ msgid "Invalid URL format"
75377537
msgstr "Ungültiges URL-Format"
75387538

75397539
#: ../lib/MusicBrainz/Server/Form/Role/UserProfile.pm:68
7540-
#: ../root/static/scripts/common/constants.js:267
7540+
#: ../root/static/scripts/common/constants.js:268
75417541
msgid "Basic"
75427542
msgstr "Anfänger"
75437543

75447544
#: ../lib/MusicBrainz/Server/Form/Role/UserProfile.pm:69
7545-
#: ../root/static/scripts/common/constants.js:268
7545+
#: ../root/static/scripts/common/constants.js:269
75467546
msgid "Intermediate"
75477547
msgstr "Fortgeschrittener Anfänger"
75487548

75497549
#: ../lib/MusicBrainz/Server/Form/Role/UserProfile.pm:70
7550-
#: ../root/static/scripts/common/constants.js:266
7550+
#: ../root/static/scripts/common/constants.js:267
75517551
msgid "Advanced"
75527552
msgstr "Fortgeschritten"
75537553

75547554
#: ../lib/MusicBrainz/Server/Form/Role/UserProfile.pm:71
7555-
#: ../root/static/scripts/common/constants.js:269
7555+
#: ../root/static/scripts/common/constants.js:270
75567556
msgid "Native"
75577557
msgstr "Muttersprachler"
75587558

@@ -14095,19 +14095,19 @@ msgstr "BPM:"
1409514095
msgid "Automatic suggestion from entry #1/{count}"
1409614096
msgstr "Automatischer Vorschlag aus Eintrag Nr. 1/{count}"
1409714097

14098-
#: ../root/static/scripts/common/entity.js:241
14098+
#: ../root/static/scripts/common/entity.js:242
1409914099
msgid "You selected {label}."
1410014100
msgstr "Du hast {label} ausgewählt."
1410114101

14102-
#: ../root/static/scripts/common/entity.js:247
14102+
#: ../root/static/scripts/common/entity.js:248
1410314103
msgid "Label code: {code}"
1410414104
msgstr "Label-Code: {code}"
1410514105

14106-
#: ../root/static/scripts/common/entity.js:262
14106+
#: ../root/static/scripts/common/entity.js:270
1410714107
msgid "You selected {area}."
1410814108
msgstr "Du hast {area} ausgewählt."
1410914109

14110-
#: ../root/static/scripts/common/entity.js:356
14110+
#: ../root/static/scripts/common/entity.js:364
1411114111
msgid "You selected {releasegroup}."
1411214112
msgstr "Du hast {releasegroup} ausgewählt."
1411314113

0 commit comments

Comments
 (0)