From 3c62bbff47d48cde2e5a3dae7e488d1396f871b4 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Tue, 28 Feb 2023 09:43:44 +0000 Subject: [PATCH] Merge pull request #11983 from overleaf/jpa-server-pro-3-5-1 [misc] add hotfixes for Server CE and Server Pro 3.5.1 GitOrigin-RevId: ea9c39b65bcc7d9ac1132ec8aed6c35274acfd13 --- server-ce/hotfix/3.5.1/Dockerfile | 6 ++++++ server-ce/hotfix/3.5.1/fix_de_locales.patch | 10 ++++++++++ 2 files changed, 16 insertions(+) create mode 100644 server-ce/hotfix/3.5.1/Dockerfile create mode 100644 server-ce/hotfix/3.5.1/fix_de_locales.patch diff --git a/server-ce/hotfix/3.5.1/Dockerfile b/server-ce/hotfix/3.5.1/Dockerfile new file mode 100644 index 0000000000..cd108405f9 --- /dev/null +++ b/server-ce/hotfix/3.5.1/Dockerfile @@ -0,0 +1,6 @@ +FROM sharelatex/sharelatex:3.5.0 + +# Patch: fix German locales +COPY fix_de_locales.patch . +RUN patch -p0 < fix_de_locales.patch +RUN node genScript compile | bash diff --git a/server-ce/hotfix/3.5.1/fix_de_locales.patch b/server-ce/hotfix/3.5.1/fix_de_locales.patch new file mode 100644 index 0000000000..54ed1f1c2a --- /dev/null +++ b/server-ce/hotfix/3.5.1/fix_de_locales.patch @@ -0,0 +1,10 @@ +--- services/web/locales/de.json ++++ services/web/locales/de.json +@@ -348,7 +348,6 @@ + "edit_dictionary_empty": "Dein benutzerdefiniertes Wörterbuch ist leer.", + "edit_dictionary_remove": "Aus Wörterbuch entfernen", + "editing": "Bearbeitung", +- "editor_and_pdf": "Editor & PDF", + "editor_disconected_click_to_reconnect": "Editor wurde getrennt", + "editor_only_hide_pdf": "Nur Editor <0>(PDF ausblenden)", + "editor_resources": "Editor-Literatur",