logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: f63ee29fac87489b754890a73f676bb143fb3b63
parent fcf62a13ed49359b6bc2e82e8d05f55bfe914803
Author: Henry Jameson <me@hjkos.com>
Date:   Mon,  8 Aug 2022 02:14:09 +0300

proper links and fix user detection

Diffstat:

Msrc/components/update_notification/update_notification.js2+-
Msrc/components/update_notification/update_notification.scss1+
Msrc/components/update_notification/update_notification.vue21++++++++++++---------
Msrc/i18n/en.json4++--
4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/components/update_notification/update_notification.js b/src/components/update_notification/update_notification.js @@ -31,7 +31,7 @@ const UpdateNotification = { }, shouldShow () { return !this.$store.state.instance.disableUpdateNotification && - this.$store.state.currentUser && + this.$store.state.users.currentUser && this.$store.state.serverSideStorage.flagStorage.updateCounter < CURRENT_UPDATE_COUNTER && !this.$store.state.serverSideStorage.flagStorage.dontShowUpdateNotifs } diff --git a/src/components/update_notification/update_notification.scss b/src/components/update_notification/update_notification.scss @@ -69,6 +69,7 @@ position: relative; shape-margin: 0.5em; filter: drop-shadow(5px 5px 10px rgba(0,0,0,0.5)); + pointer-events: none; } .spacer-top { diff --git a/src/components/update_notification/update_notification.vue b/src/components/update_notification/update_notification.vue @@ -1,6 +1,5 @@ <template> <Modal - v-if="shouldShow" :is-open="!!shouldShow" class="UpdateNotification" :no-background="true" @@ -22,14 +21,18 @@ <p> {{ $t('update.big_update_content') }} </p> - <p class="extra-info"> - {{ $t('update.update_bugs') }} - </p> - <p class="extra-info"> - {{ $t('update.update_changelog') }} - </p> - </div> - <div class="spacer-bottom"/> + <i18n-t keypath="update.update_bugs" tag="p" class="extra-info"> + <template #pleromaGitlab> + <a target="_blank" href="https://git.pleroma.social/">{{ $t('update.update_bugs_gitlab') }}</a> + </template> + </i18n-t> + <i18n-t keypath="update.update_changelog" tag="p" class="extra-info"> + <template #theFullChangelog> + <a target="_blank" href="https://pleroma.social/announcements/">{{ $t('update.update_changelog_here') }}</a> + </template> + </i18n-t> + </div> + <div class="spacer-bottom"/> </div> </div> <div class="panel-footer"> diff --git a/src/i18n/en.json b/src/i18n/en.json @@ -968,7 +968,7 @@ "big_update_content": "We haven't had a release in a while, so things might look and feel different than what you're used to.", "update_bugs": "Please report any issues and bugs on {pleromaGitlab}, as we have changed a lot, and although we test thoroughly and use development versions ourselves, we may have missed some things. We welcome your feedback and suggestions on issues you might encounter, or how to improve Pleroma and Pleroma-FE.", "update_bugs_gitlab": "Pleroma GitLab", - "update_changelog": "For more details on what's changed, see {theFullChangelog}", - "update_changelog_here": "here" + "update_changelog": "For more details on what's changed, see {theFullChangelog}.", + "update_changelog_here": "the full changelog" } }