Merge branch 'master' into sbruens/issues

Jigsaw-Code · Mar 12, 2024 · 12b676a · 12b676a
2 parents 2b72826 + 72f5782
commit 12b676a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 47 deletions.
diff --git a/.github/workflows/pull_request_checks.yml b/.github/workflows/pull_request_checks.yml
@@ -82,47 +82,3 @@ jobs:
         run: |
           echo "This PR has the 'need test' label. Please remove it before merging."
           exit 1
-
-  translations:
-    name: '[WIP] Missing Translations Label'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: write
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Check resources/original_messages.json
-        id: changed-original-messages
-        uses: tj-actions/changed-files@v35
-        with:
-          files: resources/original_messages.json
-
-      - name: Collect src/www/messages Changes
-        if: steps.changed-original-messages.outputs.any_changed == 'true' 
-        id: changed-translated-messages
-        uses: tj-actions/changed-files@v35
-        with:
-          files: src/www/messages/*.json
-
-      - name: Check src/www/messages Changes
-        if: steps.changed-original-messages.outputs.any_changed == 'true'
-        id: not-every-translation-changed
-        run: |
-          TRANSLATIONS_COUNT="$(ls src/www/messages | wc -l | xargs)"
-          IFS=' ' read -r -a TRANSLATED_MESSAGES <<< "${{ steps.changed-translated-messages.outputs.all_changed_files }}"
-          TRANSLATED_MESSAGES_COUNT="${#TRANSLATED_MESSAGES[@]}"
-          if [ "${TRANSLATED_MESSAGES_COUNT}" != "${TRANSLATIONS_COUNT}" ]; then
-            echo "Translations are not atomic. Please update all translations in a single commit."
-            echo "Changed translations: ${TRANSLATED_MESSAGES_COUNT}"
-            echo "Expected translations: ${TRANSLATIONS_COUNT}"
-            echo "result=true" >> "${GITHUB_OUTPUT}"
-          fi
-
-      - name: Apply 'Missing Translations' Label
-        if: steps.not-every-translation-changed.outputs.result == 'true'
-        uses: actions-ecosystem/action-add-labels@v1
-        with:
-          labels: missing translations
diff --git a/resources/original_messages.json b/resources/original_messages.json
@@ -77,7 +77,7 @@
   },
   "contact_view_exit_connection": {
     "description": "Message shown to users who are trying to contact support about an unsupported issue.",
-    "message": "The Outline team is not able to assist with connecting to a server. Please try the troubleshooting steps listed $START_OF_LINK$hereEND_OF_LINK and then contact the person who gave you the access key to troubleshoot this issue.",
+    "message": "The Outline team is not able to assist with connecting to a server. Please try the troubleshooting steps listed $START_OF_LINK$here$END_OF_LINK$ and then contact the person who gave you the access key to troubleshoot this issue.",
     "placeholders": {
       "END_OF_LINK": {
         "content": "{closeLink}"
@@ -89,7 +89,7 @@
   },
   "contact_view_exit_no_server": {
     "description": "Message shown to users who are trying to contact support about an unsupported issue.",
-    "message": "The Outline team does not distribute free or paid access keys. $START_OF_LINK$Learn more about how to get an access key.END_OF_LINK",
+    "message": "The Outline team does not distribute free or paid access keys. $START_OF_LINK$Learn more about how to get an access key.$END_OF_LINK$",
     "placeholders": {
       "END_OF_LINK": {
         "content": "{closeLink}"

diff --git a/src/electron/install_windows_service.bat b/src/electron/install_windows_service.bat
@@ -29,7 +29,7 @@ set PWD=%~dp0%
 
 :: Install and start the service, configuring it to restart on boot.
 :: NOTE: spaces after the arguments are necessary for a correct installation, do not remove!
-%SystemRoot%\System32\sc create OutlineService binpath= "%PWD%OutlineService.exe" displayname= "OutlineService" start= "auto"
+%SystemRoot%\System32\sc create OutlineService binpath= "\"%PWD%OutlineService.exe\"" displayname= "OutlineService" start= "auto"
 %SystemRoot%\System32\net start OutlineService
 
 :: This is for the client: sudo-prompt discards stdout/stderr if the script