diff --git a/src/routes/_components/virtualList/VirtualList.html b/src/routes/_components/virtualList/VirtualList.html
index 7b4b3b54..62a92952 100644
--- a/src/routes/_components/virtualList/VirtualList.html
+++ b/src/routes/_components/virtualList/VirtualList.html
@@ -14,7 +14,7 @@
{/each}
{#if !$visibleItems.length}
- Nothing to show.
+ {intl.nothingToShow}
{/if}
{/if}
diff --git a/src/routes/_intl/formatTimeagoDate.js b/src/routes/_intl/formatTimeagoDate.js
index 0ff57d98..4757351f 100644
--- a/src/routes/_intl/formatTimeagoDate.js
+++ b/src/routes/_intl/formatTimeagoDate.js
@@ -4,8 +4,8 @@ import { mark, stop } from '../_utils/marks'
// Format a date in the past
export function formatTimeagoDate (date, now) {
mark('formatTimeagoDate')
- // use Math.max() to avoid things like "in 10 seconds" when the timestamps are slightly off
- const res = format(date, Math.max(now, date))
+ // use Math.min() to avoid things like "in 10 seconds" when the timestamps are slightly off
+ const res = format(Math.min(0, date - now))
stop('formatTimeagoDate')
return res
}
@@ -13,8 +13,8 @@ export function formatTimeagoDate (date, now) {
// Format a date in the future
export function formatTimeagoFutureDate (date, now) {
mark('formatTimeagoFutureDate')
- // use Math.min() for same reason as above
- const res = format(date, Math.min(now, date))
+ // use Math.max() for same reason as above
+ const res = format(Math.max(0, date - now))
stop('formatTimeagoFutureDate')
return res
}
diff --git a/src/routes/_pages/accounts/[accountId]/followers.html b/src/routes/_pages/accounts/[accountId]/followers.html
index 1d388c02..82e933f3 100644
--- a/src/routes/_pages/accounts/[accountId]/followers.html
+++ b/src/routes/_pages/accounts/[accountId]/followers.html
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
+
diff --git a/src/routes/_pages/local.html b/src/routes/_pages/local.html
index a7e67430..aaa84e58 100644
--- a/src/routes/_pages/local.html
+++ b/src/routes/_pages/local.html
@@ -1,15 +1,15 @@
{#if $isUserLoggedIn}
{#if $pinnedPage !== '/local'}
-
+
{/if}
{:else}
- Local
+ {intl.local}
- Your local timeline will appear here when logged in.
+ {intl.localTimelineNotLoggedIn}
{/if}
diff --git a/src/routes/_pages/muted.html b/src/routes/_pages/muted.html
index 5e0c49ea..70eac360 100644
--- a/src/routes/_pages/muted.html
+++ b/src/routes/_pages/muted.html
@@ -1,4 +1,4 @@
-
+
{#if $isUserLoggedIn }
{/if}
@@ -14,7 +14,7 @@
accountActions: [
{
icon: '#fa-volume-up',
- label: 'Unmute',
+ label: 'intl.unmute',
onclick: (accountId) => setAccountMuted(accountId,
/* mute */ false,
/* notifications */ false,
diff --git a/src/routes/_pages/notifications/index.html b/src/routes/_pages/notifications/index.html
index f8feaada..3e125e09 100644
--- a/src/routes/_pages/notifications/index.html
+++ b/src/routes/_pages/notifications/index.html
@@ -4,13 +4,13 @@
{:else}
- Notifications
+ {intl.notifications}
- Your notifications will appear here when logged in.
+ {intl.notificationsNotLoggedIn}
{/if}
diff --git a/src/routes/_pages/notifications/mentions.html b/src/routes/_pages/notifications/mentions.html
index 65e9dcb2..fd8e76b1 100644
--- a/src/routes/_pages/notifications/mentions.html
+++ b/src/routes/_pages/notifications/mentions.html
@@ -4,9 +4,9 @@
{:else}
- Notification mentions
+ {intl.notificationMentions}
- Your notification mentions will appear here when logged in.
+ {intl.notificationMentionsNotLoggedIn}
{/if}
diff --git a/src/routes/_pages/pinned.html b/src/routes/_pages/pinned.html
index 9c5ce9b3..82d70dd8 100644
--- a/src/routes/_pages/pinned.html
+++ b/src/routes/_pages/pinned.html
@@ -1,4 +1,4 @@
-
+
{#if $isUserLoggedIn }
{#if loading}
@@ -37,6 +37,7 @@
import DynamicPageBanner from '../_components/DynamicPageBanner.html'
import { getPinnedStatuses } from '../_api/pinnedStatuses'
import { updateVerifyCredentialsForInstance } from '../_actions/instances'
+ import { formatIntl } from '../_utils/formatIntl'
export default {
async oncreate () {
@@ -47,7 +48,7 @@
const statuses = await getPinnedStatuses(currentInstance, accessToken, currentVerifyCredentials.id)
this.set({ statuses: statuses })
} catch (e) {
- toast.say('Error: ' + (e.name || '') + ' ' + (e.message || ''))
+ /* no await */ toast.say(formatIntl('intl.error', { error: (e.name || '') + ' ' + (e.message || '') }))
} finally {
this.set({ loading: false })
}
diff --git a/src/routes/_pages/requests.html b/src/routes/_pages/requests.html
index 55655e8b..0161cfb1 100644
--- a/src/routes/_pages/requests.html
+++ b/src/routes/_pages/requests.html
@@ -1,4 +1,4 @@
-
+
{#if $isUserLoggedIn }
{/if}
@@ -23,12 +23,12 @@
accountActions: [
{
icon: '#fa-check',
- label: 'Approve',
+ label: 'intl.approve',
onclick: (accountId) => setFollowRequestApprovedOrRejected(accountId, true, true)
},
{
icon: '#fa-times',
- label: 'Reject',
+ label: 'intl.reject',
onclick: (accountId) => setFollowRequestApprovedOrRejected(accountId, false, true)
}
]
diff --git a/src/routes/_pages/search.html b/src/routes/_pages/search.html
index 4bdfe7f4..9145b390 100644
--- a/src/routes/_pages/search.html
+++ b/src/routes/_pages/search.html
@@ -5,21 +5,21 @@
{:else}
- Search
+ {intl.search}
- You can search once logged in to an instance.
+ {intl.searchNotLoggedIn}
{/if}