Skip to content

Commit

Permalink
Merge branch 'beta' into production
Browse files Browse the repository at this point in the history 
* beta:
  Translated using Weblate (Albanian)
  Translated using Weblate (Italian)
  Translated using Weblate (Finnish)
  Translated using Weblate (Lithuanian)
  Update translation files
  Update POT files using the production database
  Update POT files using the production database
  Amend some l_statistics changes
  Translated using Weblate (Albanian)
  Translated using Weblate (Polish)
  Translated using Weblate (Chinese (Simplified Han script))
  Translated using Weblate (Italian)
  Translated using Weblate (Chinese (Traditional Han script))
  Update translation files
  MBS-13770: Don't show admin approval buttons on edit lists (#3449)
  MBS-13902: Add test for persistent (did:plc) Bluesky links (#3448)
  MBS-13907: Support Discogs label URLs for events (#3452)
  MBS-13903: Fix "CDTOC is already attached" error (#3451)
  Add providePluginConfig for `*l*_mb_server` functions
  Add missing `*l*_mb_server` function names to .eslintrc.unfixed.yaml
  Use more standard l_mb_server name
  Fix "Checking translation domain in statistics code" test
  Reuse server strings when possible in stats
  Update POT files using the production database
  Translated using Weblate (Italian)
  Merge pull request #3447 from reosarevok/MBS-13866
  Add `Form::Role::OptionsTree`
  Make `Data::LinkType` consume `Data::Role::OptionsTree`
  MBS-12781: Avoid admin accidentally breaking options trees
  Ensure all entities have "table" in entities.mjs
  Convert Wikimedia classes to components (#3407)
  MBS-13897: Display "Account admin" under user types on profile
  Link to bot docs from user types list
  Link to beginner docs from user types list
  MBS-13896: Fix anchor links for editor types
  Merge pull request #3443 from reosarevok/MBS-13870
  Merge pull request #3445 from reosarevok/MBS-13895
  MBS-13857: Block unicode Tags block in usernames
  MBS-13893: Block invisible characters (Hangul, Braille) in usernames
  MBS-13886: Don't crash on wrong link_type for paged rels (#3434)
  MBS-13781: Support browsing genres by collection in the API (#3394)
  Preserve the selected AC filter in more cases
  Fix untranslatable statistics label
  Don't force new vote names to be translated twice
  Clean broken enter_votes code
  MBS-13770: Allow admins to auto-approve and auto-reject any edit
  MBS-13770: Add new Admin approval/rejection votes
  Keep filter when navigating with ArtistIndex footer
  MBS-11950: Allow filtering VA RGs for artist
  MBS-8186: Allow filtering unofficial RG list
  Split and document Data::Alias test
  MBS-13564: Correctly override primary on alias locale change
  • Loading branch information
@reosarevok
reosarevok committed Jan 27, 2025
2 parents 7c1a9af + 5e2d29f commit 013b62b
Show file tree
Hide file tree
Showing 255 changed files with 37,710 additions and 37,937 deletions.
6 changes: 6 additions & 0 deletions .eslintrc.unfixed.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ rules:
"l_languages",
"ln_languages",
"lp_languages",
"l_mb_server",
"ln_mb_server",
"lp_mb_server",
"l_relationships",
"ln_relationships",
"lp_relationships",
Expand All @@ -34,6 +37,9 @@ rules:
"N_l",
"N_ln",
"N_lp",
"N_l_mb_server",
"N_ln_mb_server",
"N_lp_mb_server",
"N_l_statistics",
"N_lp_statistics",
"__webpack_public_path__",
Expand Down
4 changes: 3 additions & 1 deletion docker/musicbrainz-tests/run_circleci_tests.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ sudo -E -H -u musicbrainz ./node_modules/.bin/eslint --max-warnings 0 .
echo OK

echo Checking translation domain in statistics code
! sudo -E -H -u musicbrainz git grep -Pw '(N_)?l[np]?\(' -- 'root/statistics/**.js'
sudo -E -H -u musicbrainz \
git --no-pager grep -Pw '(N_)?l[np]?\(' -- 'root/statistics/**.js' \
&& { exit 1; }
echo OK

sv_start_if_down chrome
Expand Down
107 changes: 78 additions & 29 deletions entities.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"": "Automatically generated, do not edit. Refer to entities.mjs for instructions.",
"annotation": {
"model": "Annotation"
"model": "Annotation",
"table": "annotation"
},
"area": {
"add_edit_type": 81,
Expand Down Expand Up @@ -40,6 +41,7 @@
"removal": {
"manual": true
},
"table": "area",
"tags": true,
"type": {
"simple": true
Expand All @@ -51,7 +53,8 @@
"table": "area_alias_type"
},
"area_type": {
"model": "AreaType"
"model": "AreaType",
"table": "area_type"
},
"artist": {
"add_edit_type": 1,
Expand Down Expand Up @@ -109,6 +112,7 @@
"deleted": true,
"entity": true
},
"table": "artist",
"tags": true,
"type": {
"simple": true
Expand All @@ -120,17 +124,21 @@
"table": "artist_alias_type"
},
"artist_credit": {
"model": "ArtistCredit"
"model": "ArtistCredit",
"table": "artist_credit"
},
"artist_type": {
"model": "ArtistType"
"model": "ArtistType",
"table": "artist_type"
},
"cdstub": {
"model": "CDStub",
"table": "release_raw",
"url": "cdstub"
},
"cdtoc": {
"model": "CDTOC",
"table": "cdtoc",
"url": "cdtoc"
},
"collection": {
Expand All @@ -151,17 +159,20 @@
"url": "collection"
},
"collection_type": {
"model": "CollectionType"
"model": "CollectionType",
"table": "editor_collection_type"
},
"cover_art_type": {
"model": "CoverArtType"
"model": "CoverArtType",
"table": "cover_art_archive.art_type"
},
"editor": {
"last_updated_column": true,
"model": "Editor",
"subscriptions": {
"entity": false
},
"table": "editor",
"url": "user"
},
"event": {
Expand Down Expand Up @@ -197,6 +208,7 @@
},
"reviews": true,
"series": true,
"table": "event",
"tags": true,
"type": {
"simple": true
Expand All @@ -214,10 +226,12 @@
"model": "EventArtType"
},
"event_type": {
"model": "EventType"
"model": "EventType",
"table": "event_type"
},
"gender": {
"model": "Gender"
"model": "Gender",
"table": "gender"
},
"genre": {
"add_edit_type": 160,
Expand Down Expand Up @@ -245,6 +259,7 @@
"removal": {
"manual": true
},
"table": "genre",
"url": "genre"
},
"genre_alias_type": {
Expand Down Expand Up @@ -283,6 +298,7 @@
"removal": {
"manual": true
},
"table": "instrument",
"tags": true,
"type": {
"simple": true
Expand All @@ -294,14 +310,17 @@
"table": "instrument_alias_type"
},
"instrument_type": {
"model": "InstrumentType"
"model": "InstrumentType",
"table": "instrument_type"
},
"isrc": {
"model": "ISRC",
"table": "isrc",
"url": "isrc"
},
"iswc": {
"model": "ISWC",
"table": "iswc",
"url": "iswc"
},
"label": {
Expand Down Expand Up @@ -351,6 +370,7 @@
"deleted": true,
"entity": true
},
"table": "label",
"tags": true,
"type": {
"simple": true
Expand All @@ -362,34 +382,42 @@
"table": "label_alias_type"
},
"label_type": {
"model": "LabelType"
"model": "LabelType",
"table": "label_type"
},
"language": {
"model": "Language"
"model": "Language",
"table": "language"
},
"link": {
"model": "Link"
"model": "Link",
"table": "link"
},
"link_attribute_type": {
"last_updated_column": true,
"model": "LinkAttributeType"
"model": "LinkAttributeType",
"table": "link_attribute_type"
},
"link_type": {
"last_updated_column": true,
"mbid": {
"relatable": false
},
"model": "LinkType",
"table": "link_type",
"url": "relationship"
},
"medium": {
"model": "Medium"
"model": "Medium",
"table": "medium"
},
"medium_cdtoc": {
"model": "MediumCDTOC"
"model": "MediumCDTOC",
"table": "medium_cdtoc"
},
"medium_format": {
"model": "MediumFormat"
"model": "MediumFormat",
"table": "medium_format"
},
"place": {
"add_edit_type": 61,
Expand Down Expand Up @@ -427,6 +455,7 @@
},
"reviews": true,
"sitemaps_lastmod_table": true,
"table": "place",
"tags": true,
"type": {
"simple": true
Expand All @@ -438,7 +467,8 @@
"table": "place_alias_type"
},
"place_type": {
"model": "PlaceType"
"model": "PlaceType",
"table": "place_type"
},
"recording": {
"add_edit_type": 71,
Expand Down Expand Up @@ -476,6 +506,7 @@
"reviews": true,
"series": true,
"sitemaps_lastmod_table": true,
"table": "recording",
"tags": true,
"url": "recording"
},
Expand Down Expand Up @@ -516,6 +547,7 @@
"report_filter": true,
"series": true,
"sitemaps_lastmod_table": true,
"table": "release",
"tags": true,
"url": "release"
},
Expand Down Expand Up @@ -561,6 +593,7 @@
"reviews": true,
"series": true,
"sitemaps_lastmod_table": true,
"table": "release_group",
"tags": true,
"type": {
"complex": true
Expand All @@ -572,19 +605,24 @@
"table": "release_group_alias_type"
},
"release_group_secondary_type": {
"model": "ReleaseGroupSecondaryType"
"model": "ReleaseGroupSecondaryType",
"table": "release_group_secondary_type"
},
"release_group_type": {
"model": "ReleaseGroupType"
"model": "ReleaseGroupType",
"table": "release_group_primary_type"
},
"release_packaging": {
"model": "ReleasePackaging"
"model": "ReleasePackaging",
"table": "release_packaging"
},
"release_status": {
"model": "ReleaseStatus"
"model": "ReleaseStatus",
"table": "release_status"
},
"script": {
"model": "Script"
"model": "Script",
"table": "script"
},
"series": {
"add_edit_type": 140,
Expand Down Expand Up @@ -618,6 +656,7 @@
"deleted": true,
"entity": true
},
"table": "series",
"tags": true,
"type": {
"simple": true
Expand All @@ -629,13 +668,16 @@
"table": "series_alias_type"
},
"series_ordering_type": {
"model": "SeriesOrderingType"
"model": "SeriesOrderingType",
"table": "series_ordering_type"
},
"series_type": {
"model": "SeriesType"
"model": "SeriesType",
"table": "series_type"
},
"tag": {
"model": "Tag"
"model": "Tag",
"table": "tag"
},
"track": {
"artist_credits": true,
Expand All @@ -647,6 +689,7 @@
"model": "Track",
"plural": "tracks",
"plural_url": "tracks",
"table": "track",
"url": "track"
},
"url": {
Expand All @@ -663,6 +706,7 @@
"removal": {
"automatic": {}
},
"table": "url",
"url": "url"
},
"work": {
Expand Down Expand Up @@ -698,6 +742,7 @@
"reviews": true,
"series": true,
"sitemaps_lastmod_table": true,
"table": "work",
"tags": true,
"type": {
"simple": true
Expand All @@ -709,15 +754,19 @@
"table": "work_alias_type"
},
"work_attribute": {
"model": "WorkAttribute"
"model": "WorkAttribute",
"table": "work_attribute"
},
"work_attribute_type": {
"model": "WorkAttributeType"
"model": "WorkAttributeType",
"table": "work_attribute_type"
},
"work_attribute_type_allowed_value": {
"model": "WorkAttributeTypeAllowedValue"
"model": "WorkAttributeTypeAllowedValue",
"table": "work_attribute_type_allowed_value"
},
"work_type": {
"model": "WorkType"
"model": "WorkType",
"table": "work_type"
}
}
Loading

0 comments on commit 013b62b

Please sign in to comment.