Skip to content

Commit

Permalink
Merge pull request #281 from yvanzo/fix-website-lang
Browse files Browse the repository at this point in the history
MBVM-98: Fix enabling mirror website translations
  • Loading branch information
yvanzo authored Jun 24, 2024
2 parents f362446 + a093084 commit 5a31b7c
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ If you use [UFW](https://help.ubuntu.com/community/UFW) to manage your firewall:

## Components version

* Current MB Branch: [v-2024-05-13-schema-change](build/musicbrainz/Dockerfile#L88)
* Current MB Branch: [v-2024-06-24](build/musicbrainz/Dockerfile#L88)
* Current DB_SCHEMA_SEQUENCE: [29](build/musicbrainz/Dockerfile#L125)
* Postgres Version: [16](docker-compose.yml)
(can be changed by setting the environment variable `POSTGRES_VERSION`)
Expand Down
2 changes: 2 additions & 0 deletions build/musicbrainz-dev/DBDefs.pm
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,8 @@ sub DEVELOPMENT_SERVER { $ENV{MUSICBRAINZ_DEVELOPMENT_SERVER} == 1 ? 1 : 0 }
# Please activate the officially approved languages here. Not every .po
# file is active because we might have fully translated languages which
# are not yet properly supported, like right-to-left languages
#
# The corresponding language packs must be installed; See NOTE-LANGUAGES-1
sub MB_LANGUAGES { shift->DEVELOPMENT_SERVER()
? qw( de el es et he fi fr it ja nl sq en )
: qw( de fr it nl en )
Expand Down
1 change: 1 addition & 0 deletions build/musicbrainz-dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.asc] https://deb.nodesourc
git \
# Needed to generate SVG from database schema DOT diagrams
graphviz \
# NOTE-LANGUAGES-1: These language packs must match the definition of MB_LANGUAGES in DBDefs.pm
language-pack-de \
language-pack-el \
language-pack-es \
Expand Down
4 changes: 2 additions & 2 deletions build/musicbrainz-prebuilt/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ARG MUSICBRAINZ_SERVER_VERSION=v-2024-05-13-schema-change
ARG MUSICBRAINZ_BUILD_SEQUENCE=2
ARG MUSICBRAINZ_SERVER_VERSION=v-2024-06-24
ARG MUSICBRAINZ_BUILD_SEQUENCE=0
FROM metabrainz/musicbrainz-docker-musicbrainz:${MUSICBRAINZ_SERVER_VERSION}-build${MUSICBRAINZ_BUILD_SEQUENCE}
2 changes: 2 additions & 0 deletions build/musicbrainz/DBDefs.pm
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,8 @@ sub DEVELOPMENT_SERVER { $ENV{MUSICBRAINZ_DEVELOPMENT_SERVER} == 1 ? 1 : 0 }
# Please activate the officially approved languages here. Not every .po
# file is active because we might have fully translated languages which
# are not yet properly supported, like right-to-left languages
#
# The corresponding language packs must be installed; See NOTE-LANGUAGES-1
sub MB_LANGUAGES { shift->DEVELOPMENT_SERVER()
? qw( de el es et fi fr he it ja nl sq en )
: qw( de fr it nl en )
Expand Down
7 changes: 6 additions & 1 deletion build/musicbrainz/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.asc] https://deb.nodesourc
gettext \
g++ \
git \
# NOTE-LANGUAGES-1: These language packs must match the definition of MB_LANGUAGES in DBDefs.pm
language-pack-de \
language-pack-fr \
language-pack-it \
language-pack-nl \
# Needed for Cache in DB_File
libdb-dev \
libexpat1-dev \
Expand Down Expand Up @@ -90,7 +95,7 @@ RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.asc] https://deb.nodesourc
apt-get purge --auto-remove -y \
build-essential

ARG MUSICBRAINZ_SERVER_VERSION=v-2024-05-13-schema-change
ARG MUSICBRAINZ_SERVER_VERSION=v-2024-06-24
LABEL org.metabrainz.musicbrainz-server.version="${MUSICBRAINZ_SERVER_VERSION}"
RUN git clone --depth=1 --branch $MUSICBRAINZ_SERVER_VERSION https://github.com/metabrainz/musicbrainz-server.git musicbrainz-server

Expand Down

0 comments on commit 5a31b7c

Please sign in to comment.