Skip to content

Commit

Permalink
revert: "feat: display i18n text on SSR"
Browse files Browse the repository at this point in the history
This reverts commit cafc995.
  • Loading branch information
sxzz committed Jan 12, 2023
1 parent e9dccc9 commit a41a317
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion components/nav/NavSideItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const noUserVisual = computed(() => isMastoInitialised.value && props.userOnly &
<div :class="icon" text-xl />
</slot>
<slot>
<span block sm:hidden xl:block>{{ text }}</span>
<span block sm:hidden xl:block>{{ isHydrated ? text : '&nbsp;' }}</span>
</slot>
</div>
</CommonTooltip>
Expand Down
7 changes: 4 additions & 3 deletions components/search/SearchWidget.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ const query = ref('')
const { accounts, hashtags, loading, statuses } = useSearch(query)
const index = ref(0)
const { t } = useI18n()
const el = ref<HTMLElement>()
const router = useRouter()
const { focused } = useFocusWithin(el)
Expand Down Expand Up @@ -65,7 +66,7 @@ const activate = () => {
bg-transparent
outline="focus:none"
pe-4
:placeholder="$t('nav.search')"
:placeholder="isHydrated ? t('nav.search') : ''"
pb="1px"
placeholder-text-secondary
@keydown.down.prevent="shift(1)"
Expand All @@ -77,7 +78,7 @@ const activate = () => {
<div left-0 top-12 absolute w-full z10 group-focus-within="pointer-events-auto visible" invisible pointer-events-none>
<div w-full bg-base border="~ base" rounded-3 max-h-100 overflow-auto py2>
<span v-if="query.trim().length === 0" block text-center text-sm text-secondary>
{{ $t('search.search_desc') }}
{{ t('search.search_desc') }}
</span>
<template v-else-if="!loading">
<template v-if="results.length > 0">
Expand All @@ -89,7 +90,7 @@ const activate = () => {
/>
</template>
<span v-else block text-center text-sm text-secondary>
{{ $t('search.search_empty') }}
{{ t('search.search_empty') }}
</span>
</template>
<div v-else>
Expand Down
8 changes: 4 additions & 4 deletions pages/[[server]]/explore.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ const { t } = useI18n()
const tabs = $computed(() => [
{
to: isHydrated.value ? `/${currentServer.value}/explore` : '/explore',
display: t('tab.posts'),
display: isHydrated.value ? t('tab.posts') : '',
},
{
to: isHydrated.value ? `/${currentServer.value}/explore/tags` : '/explore/tags',
display: t('tab.hashtags'),
display: isHydrated.value ? t('tab.hashtags') : '',
},
{
to: isHydrated.value ? `/${currentServer.value}/explore/links` : '/explore/links',
display: t('tab.news'),
display: isHydrated.value ? t('tab.news') : '',
},
// This section can only be accessed after logging in
{
to: isHydrated.value ? `/${currentServer.value}/explore/users` : '/explore/users',
display: t('tab.for_you'),
display: isHydrated.value ? t('tab.for_you') : '',
disabled: !isMastoInitialised.value || !currentUser.value,
},
] as const)
Expand Down
4 changes: 2 additions & 2 deletions pages/notifications.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ const tabs = $computed(() => [
{
name: 'all',
to: '/notifications',
display: t('tab.notifications_all'),
display: isHydrated.value ? t('tab.notifications_all') : '',
},
{
name: 'mention',
to: '/notifications/mention',
display: t('tab.notifications_mention'),
display: isHydrated.value ? t('tab.notifications_mention') : '',
},
] as const)
</script>
Expand Down

0 comments on commit a41a317

Please sign in to comment.