From eddbb1eee92d22524e3f7eea49d9000341629440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joaqu=C3=ADn=20S=C3=A1nchez?= Date: Sat, 24 Feb 2024 19:24:19 +0100 Subject: [PATCH] chore: cleanup isHydrated (#2614) Co-authored-by: patak <583075+patak-dev@users.noreply.github.com> --- components/publish/PublishWidget.vue | 10 +++++----- components/search/SearchWidget.vue | 2 +- pages/[[server]]/explore.vue | 8 ++++---- pages/settings/index.vue | 2 +- pages/settings/notifications/notifications.vue | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/components/publish/PublishWidget.vue b/components/publish/PublishWidget.vue index 622cbd09..2a2bd4a1 100644 --- a/components/publish/PublishWidget.vue +++ b/components/publish/PublishWidget.vue @@ -88,23 +88,23 @@ function deletePollOption(index: number) { const expiresInOptions = computed(() => [ { seconds: 1 * 60 * 60, - label: isHydrated.value ? t('time_ago_options.hour_future', 1) : '', + label: t('time_ago_options.hour_future', 1), }, { seconds: 2 * 60 * 60, - label: isHydrated.value ? t('time_ago_options.hour_future', 2) : '', + label: t('time_ago_options.hour_future', 2), }, { seconds: 1 * 24 * 60 * 60, - label: isHydrated.value ? t('time_ago_options.day_future', 1) : '', + label: t('time_ago_options.day_future', 1), }, { seconds: 2 * 24 * 60 * 60, - label: isHydrated.value ? t('time_ago_options.day_future', 2) : '', + label: t('time_ago_options.day_future', 2), }, { seconds: 7 * 24 * 60 * 60, - label: isHydrated.value ? t('time_ago_options.day_future', 7) : '', + label: t('time_ago_options.day_future', 7), }, ]) diff --git a/components/search/SearchWidget.vue b/components/search/SearchWidget.vue index f1752b00..3eb31b50 100644 --- a/components/search/SearchWidget.vue +++ b/components/search/SearchWidget.vue @@ -77,7 +77,7 @@ function activate() { ps-3 pe-1 ml-1 - :placeholder="isHydrated ? t('nav.search') : ''" + :placeholder="t('nav.search')" pb="1px" placeholder-text-secondary @keydown.down.prevent="shift(1)" diff --git a/pages/[[server]]/explore.vue b/pages/[[server]]/explore.vue index 41d570df..40f71768 100644 --- a/pages/[[server]]/explore.vue +++ b/pages/[[server]]/explore.vue @@ -19,21 +19,21 @@ const userSettings = useUserSettings() const tabs = computed(() => [ { to: isHydrated.value ? `/${currentServer.value}/explore` : '/explore', - display: isHydrated.value ? t('tab.posts') : '', + display: t('tab.posts'), }, { to: isHydrated.value ? `/${currentServer.value}/explore/tags` : '/explore/tags', - display: isHydrated.value ? t('tab.hashtags') : '', + display: t('tab.hashtags'), }, { to: isHydrated.value ? `/${currentServer.value}/explore/links` : '/explore/links', - display: isHydrated.value ? t('tab.news') : '', + display: t('tab.news'), hide: userSettings.value.preferences.hideNews, }, // This section can only be accessed after logging in { to: isHydrated.value ? `/${currentServer.value}/explore/users` : '/explore/users', - display: isHydrated.value ? t('tab.for_you') : '', + display: t('tab.for_you'), disabled: !isHydrated.value || !currentUser.value, }, ]) diff --git a/pages/settings/index.vue b/pages/settings/index.vue index e3c4d759..c0ee6207 100644 --- a/pages/settings/index.vue +++ b/pages/settings/index.vue @@ -2,7 +2,7 @@
- {{ isHydrated ? $t('settings.select_a_settings') : '' }} + {{ $t('settings.select_a_settings') }}
diff --git a/pages/settings/notifications/notifications.vue b/pages/settings/notifications/notifications.vue index 561f1d1e..0cb65cda 100644 --- a/pages/settings/notifications/notifications.vue +++ b/pages/settings/notifications/notifications.vue @@ -15,16 +15,16 @@ useHydratedHead({

- {{ isHydrated ? $t('settings.notifications.under_construction') : '' }} + {{ $t('settings.notifications.under_construction') }} 🚧

- {{ isHydrated ? $t('settings.notifications.notifications.label') : '' }} + {{ $t('settings.notifications.notifications.label') }}