From cfedc89e7ef8a477156589e6be8bda7ac440d793 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 27 Oct 2022 12:03:32 -0500 Subject: [PATCH 1/3] Support Docker local development --- Dockerfile.dev | 18 ++++++++++++++++++ compose-dev.yaml | 10 ++++++++++ 2 files changed, 28 insertions(+) create mode 100644 Dockerfile.dev create mode 100644 compose-dev.yaml diff --git a/Dockerfile.dev b/Dockerfile.dev new file mode 100644 index 000000000..8d1655db0 --- /dev/null +++ b/Dockerfile.dev @@ -0,0 +1,18 @@ +FROM node:18 + +RUN apt-get update &&\ + apt-get install -y inotify-tools &&\ + # clean up apt + rm -rf /var/lib/apt/lists/* + +WORKDIR /app +ENV NODE_ENV=development + +COPY package.json . +COPY yarn.lock . +RUN yarn + +COPY . . + +ENV DEVSERVER_URL=http://0.0.0.0:3036 +CMD yarn dev \ No newline at end of file diff --git a/compose-dev.yaml b/compose-dev.yaml new file mode 100644 index 000000000..2359ac5ba --- /dev/null +++ b/compose-dev.yaml @@ -0,0 +1,10 @@ +services: + app: + build: + context: . + dockerfile: Dockerfile.dev + image: soapbox-dev + ports: + - "3036:3036" + volumes: + - .:/app \ No newline at end of file From 2effafd1f63d37bfdb84377e1b302b64ab8896bd Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 27 Oct 2022 14:29:40 -0500 Subject: [PATCH 2/3] Remove favicon from index.html --- app/index.ejs | 1 - 1 file changed, 1 deletion(-) diff --git a/app/index.ejs b/app/index.ejs index 495eeaff7..b0d109e1f 100644 --- a/app/index.ejs +++ b/app/index.ejs @@ -8,7 +8,6 @@ - <%= snippets %> From 643e59d426d2b6daed79922be8f271cc90387c9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Sat, 29 Oct 2022 23:12:08 +0200 Subject: [PATCH 3/3] Fix typo in Polish translation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- app/soapbox/locales/pl.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json index 12d21681d..4385b4446 100644 --- a/app/soapbox/locales/pl.json +++ b/app/soapbox/locales/pl.json @@ -915,7 +915,7 @@ "preferences.fields.expand_spoilers_label": "Zawsze rozwijaj wpisy z ostrzeżeniami o zawartości", "preferences.fields.language_label": "Język", "preferences.fields.media_display_label": "Wyświetlanie zawartości multimedialnej", - "preferences.fields.missing_description_modal_label": "SPokazuj prośbę o potwierdzenie przed wysłaniem wpisu bez opisu multimediów", + "preferences.fields.missing_description_modal_label": "Pokazuj prośbę o potwierdzenie przed wysłaniem wpisu bez opisu multimediów", "preferences.fields.privacy_label": "Prywatność wpisów", "preferences.fields.reduce_motion_label": "Ogranicz ruch w animacjach", "preferences.fields.system_font_label": "Używaj domyślnej czcionki systemu", @@ -1255,6 +1255,7 @@ "time_remaining.seconds": "{number, plural, one {Pozostała # sekunda} few {Pozostały # sekundy} many {Pozostało # sekund} other {Pozostało # sekund}}", "trends.count_by_accounts": "{count} {rawCount, plural, one {osoba rozmawia} few {osoby rozmawiają} other {osób rozmawia}} o tym", "trends.title": "Trendy", + "trendsPanel.viewAll": "Pokaż wszystkie", "ui.beforeunload": "Utracisz tworzony wpis, jeżeli opuścisz Soapbox.", "unauthorized_modal.footer": "Masz już konto? {login}.", "unauthorized_modal.text": "Musisz się zalogować, aby to zrobić.",