diff --git a/app/components/content/Activity.vue b/app/components/content/Activity.vue
index 3616107..45b01a7 100644
--- a/app/components/content/Activity.vue
+++ b/app/components/content/Activity.vue
@@ -17,13 +17,25 @@ const getActivity = computed(() => {
const project = activity.details ? capitalise(activity.details.replace('Workspace:', '')) : ''
const state = activity.state.split(' ')[1]
const start = {
- ago: useTimeAgo(activity.timestamps.start).value,
- formated: `${useDateFormat(
- activity.timestamps.start,
- 'DD MMM YYYY',
- { locales: currentLocale.value!.code ?? 'en' }
- ).value} ${t('separator')}
- ${useDateFormat(activity.timestamps.start, 'HH:mm:ss', { locales: currentLocale.value!.code ?? 'en' }).value}`
+ ago: locale.value === 'en'
+ ? useTimeAgo(activity.timestamps.start).value
+ : useTimeAgo(activity.timestamps.start).value
+ .replace('ago', '')
+ .replace('hours', 'heures')
+ .replace('minutes', 'minutes')
+ .replace('seconds', 'secondes'),
+ formated: {
+ date: useDateFormat(
+ activity.timestamps.start,
+ 'DD MMM YYYY',
+ { locales: currentLocale.value!.code ?? 'en' }
+ ).value,
+ time: useDateFormat(
+ activity.timestamps.start,
+ 'HH:mm:ss',
+ { locales: currentLocale.value!.code ?? 'en' }
+ ).value
+ }
}
return {
@@ -62,7 +74,6 @@ const { t } = useI18n({
v-if="getActivity.active"
keypath="working"
tag="div"
- class="space-x-1"
>
{{ getActivity.project }}
@@ -71,17 +82,19 @@ const { t } = useI18n({
{{ getActivity.state }}
-
- {{ getActivity.name }}
+
+
+ {{ getActivity.name }}
{{ getActivity.start.ago }}
- {{ getActivity.start.formated }}
+ {{ getActivity.start.formated.date }} {{ t('separator') }}
+ {{ getActivity.start.formated.time }}