Skip to content

Commit

Permalink
Specify that only individual unpair requires force close
Browse files Browse the repository at this point in the history
  • Loading branch information
xanderfrangos committed Apr 18, 2024
1 parent bb3c0ba commit 31c1f21
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
5 changes: 3 additions & 2 deletions src_assets/common/assets/web/public/assets/locale/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -368,10 +368,11 @@
"restart_sunshine_success": "Sunshine is restarting",
"troubleshooting": "Troubleshooting",
"unpair_all": "Unpair All",
"unpair_all_desc": "Remove your paired devices. Unpaired devices with an active session will remain connected, but cannot start or resume a session.",
"unpair_all_desc": "Remove your paired devices. Individually unpaired devices with an active session will remain connected, but cannot start or resume a session.",
"unpair_all_error": "Error while unpairing",
"unpair_all_success": "However, the device(s) may still be in an active session. Use the 'Force Close' button above to end any open sessions.",
"unpair_all_success": "All devices unpaired.",
"unpair_single_no_devices": "There are no paired devices.",
"unpair_single_success": "However, the device(s) may still be in an active session. Use the 'Force Close' button above to end any open sessions.",
"unpair_single_unknown": "Unknown Client",
"unpair_title": "Unpair Devices"
},
Expand Down
8 changes: 5 additions & 3 deletions src_assets/common/assets/web/troubleshooting.html
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,13 @@ <h2 id="unpair" class="text-center me-auto">{{ $t('troubleshooting.unpair_title'
<br />
<p class="mb-0">{{ $t('troubleshooting.unpair_all_desc') }}</p>
<div id="apply-alert" class="alert alert-success d-flex align-items-center mt-3" :style="{ 'display': (showApplyMessage ? 'flex !important': 'none !important') }">
<div class="me-2"><b>{{ $t('_common.success') }}</b> {{ $t('troubleshooting.unpair_all_success') }}</div>
<div class="me-2"><b>{{ $t('_common.success') }}</b> {{ $t('troubleshooting.unpair_single_success') }}</div>
<button class="btn btn-success ms-auto apply" @click="clickedApplyBanner">{{ $t('_common.dismiss') }}</button>
</div>
<div class="alert alert-danger" v-if="unpairAllStatus === false">
<div class="alert alert-danger mt-3" v-if="unpairAllStatus === true">
{{ $t('troubleshooting.unpair_all_success') }}
</div>
<div class="alert alert-danger mt-3" v-if="unpairAllStatus === false">
{{ $t('troubleshooting.unpair_all_error') }}
</div>
</div>
Expand Down Expand Up @@ -190,7 +193,6 @@ <h2 id="logs">{{ $t('troubleshooting.logs') }}</h2>
fetch("/api/clients/unpair-all", { method: "POST" })
.then((r) => r.json())
.then((r) => {
this.showApplyMessage = true;
this.unpairAllPressed = false;
this.unpairAllStatus = r.status.toString() === "true";
setTimeout(() => {
Expand Down

0 comments on commit 31c1f21

Please sign in to comment.