mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #25803 from nextcloud/bugfix/25364/make-compatible-app-message-less-confusing 

Make the compatible app message less confusing for multi versions apps
This commit is contained in:
John Molakvoæ 2021-03-01 10:37:13 +01:00 committed by GitHub
parent 91f260fe29 4807ce3b08
commit cc7f4ab1ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/updatenotification/js/updatenotification.js
View File

File diff suppressed because one or more lines are too long

2
apps/updatenotification/js/updatenotification.js.map
View File

File diff suppressed because one or more lines are too long

15
apps/updatenotification/src/components/UpdateNotification.vue
View File

@ -17,7 +17,7 @@
<template v-if="missingAppUpdates.length"> <template v-if="missingAppUpdates.length">
<h3 @click="toggleHideMissingUpdates"> <h3 @click="toggleHideMissingUpdates">
{{ t('updatenotification', 'Apps missing updates') }} {{ t('updatenotification', 'Apps missing compatible version') }}
<span v-if="!hideMissingUpdates" class="icon icon-triangle-n" /> <span v-if="!hideMissingUpdates" class="icon icon-triangle-n" />
<span v-if="hideMissingUpdates" class="icon icon-triangle-s" /> <span v-if="hideMissingUpdates" class="icon icon-triangle-s" />
</h3> </h3>
@ -30,7 +30,7 @@
<template v-if="availableAppUpdates.length"> <template v-if="availableAppUpdates.length">
<h3 @click="toggleHideAvailableUpdates"> <h3 @click="toggleHideAvailableUpdates">
{{ t('updatenotification', 'Apps with available updates') }} {{ t('updatenotification', 'Apps with compatible version') }}
<span v-if="!hideAvailableUpdates" class="icon icon-triangle-n" /> <span v-if="!hideAvailableUpdates" class="icon icon-triangle-n" />
<span v-if="hideAvailableUpdates" class="icon icon-triangle-s" /> <span v-if="hideAvailableUpdates" class="icon icon-triangle-s" />
</h3> </h3>
@ -104,7 +104,7 @@
label="label" label="label"
track-by="value" track-by="value"
:tag-width="75" /><br> :tag-width="75" /><br>
<em v-if="currentChannel === 'daily' || currentChannel === 'git'">{{ t('updatenotification', 'Only notification for app updates are available.') }}</em> <em v-if="currentChannel === 'daily' || currentChannel === 'git'">{{ t('updatenotification', 'Only notifications for app updates are available.') }}</em>
<em v-if="currentChannel === 'daily'">{{ t('updatenotification', 'The selected update channel makes dedicated notifications for the server obsolete.') }}</em> <em v-if="currentChannel === 'daily'">{{ t('updatenotification', 'The selected update channel makes dedicated notifications for the server obsolete.') }}</em>
<em v-if="currentChannel === 'git'">{{ t('updatenotification', 'The selected update channel does not support updates of the server.') }}</em> <em v-if="currentChannel === 'git'">{{ t('updatenotification', 'The selected update channel does not support updates of the server.') }}</em>
</p> </p>
@ -174,7 +174,8 @@ export default {
}, },
noteDelayedStableString() { noteDelayedStableString() {
return t('updatenotification', 'Note that after a new release the update only shows up after the first minor release or later. We roll out new versions spread out over time to our users and sometimes skip a version when issues are found. Learn more about updates and release channels at {link}').replace('{link}', '<a href="https://nextcloud.com/release-channels/">https://nextcloud.com/release-channels/</a>') return t('updatenotification', 'Note that after a new release the update only shows up after the first minor release or later. We roll out new versions spread out over time to our users and sometimes skip a version when issues are found. Learn more about updates and release channels at {link}')
.replace('{link}', '<a href="https://nextcloud.com/release-channels/">https://nextcloud.com/release-channels/</a>')
}, },
lastCheckedOnString() { lastCheckedOnString() {
@ -185,7 +186,7 @@ export default {
statusText() { statusText() {
if (!this.isListFetched) { if (!this.isListFetched) {
return t('updatenotification', 'Checking apps for compatible updates') return t('updatenotification', 'Checking apps for compatible versions')
} }
if (this.appStoreDisabled) { if (this.appStoreDisabled) {
@ -197,8 +198,8 @@ export default {
} }
return this.missingAppUpdates.length === 0 return this.missingAppUpdates.length === 0
? t('updatenotification', '<strong>All</strong> apps have an update for this version available', this) ? t('updatenotification', '<strong>All</strong> apps have a compatible version for this Nextcloud version available', this)
: n('updatenotification', '<strong>%n</strong> app has no update for this version available', '<strong>%n</strong> apps have no update for this version available', this.missingAppUpdates.length) : n('updatenotification', '<strong>%n</strong> app has no compatible version for this Nextcloud version available', '<strong>%n</strong> apps have no compatible version for this Nextcloud version available', this.missingAppUpdates.length)
}, },
whatsNew() { whatsNew() {