Skip to content

Commit d836877

Browse files
hahn-kevhahn-kev
authored
change how durations are formatted to be i18n friendly (#1968)
1 parent bba6889 commit d836877

7 files changed

Lines changed: 95 additions & 85 deletions

File tree

‎frontend/viewer/src/lib/activity/ActivityView.svelte‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script lang="ts">
22
import type { ICommitMetadata } from '$lib/dotnet-types/generated-types/SIL/Harmony/Core/ICommitMetadata';
33
import { useHistoryService } from '$lib/services/history-service';
4-
import { t } from 'svelte-i18n-lingui';
4+
import { t, T } from 'svelte-i18n-lingui';
55
import { useProjectContext } from '$lib/project-context.svelte';
66
import { resource } from 'runed';
77
import {SidebarTrigger} from '$lib/components/ui/sidebar';
@@ -70,16 +70,18 @@
7070
<span>{row.changeName}</span>
7171
<div class="text-sm text-muted-foreground">
7272
{#if row.previousTimestamp}
73-
<FormatDuration start={new Date(row.timestamp)}
74-
end={new Date(row.previousTimestamp)}
75-
smallestUnit="seconds"
76-
options={{style: 'narrow'}}/>
77-
{$t`before`}
73+
<T msg="# before">
74+
<FormatDuration start={new Date(row.timestamp)}
75+
end={new Date(row.previousTimestamp)}
76+
smallestUnit="seconds"
77+
options={{style: 'narrow'}}/>
78+
</T>
7879
{:else}
79-
<FormatDuration start={new Date(row.timestamp)}
80-
smallestUnit="seconds"
81-
options={{style: 'narrow'}}/>
82-
{$t`ago`}
80+
<T msg="# ago">
81+
<FormatDuration start={new Date(row.timestamp)}
82+
smallestUnit="seconds"
83+
options={{style: 'narrow'}}/>
84+
</T>
8385
{/if}
8486
</div>
8587
</ListItem>
@@ -105,9 +107,7 @@
105107
{/if}
106108
{#if selectedRow.metadata.extraMetadata['SyncDate']}
107109
<span class="float-right">
108-
{$t`Synced`}
109-
{formatDuration({seconds: (new Date().getTime() - new Date(selectedRow.metadata.extraMetadata['SyncDate']).getTime()) / 1000}, 'seconds', {style: 'narrow'})}
110-
{$t`ago`}
110+
{$t`Synced ${formatDuration({seconds: (new Date().getTime() - new Date(selectedRow.metadata.extraMetadata['SyncDate']).getTime()) / 1000}, 'seconds', {style: 'narrow'})} ago`}
111111
</span>
112112
{/if}
113113
</div>

‎frontend/viewer/src/lib/history/HistoryView.svelte‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script lang="ts">
22
import * as Dialog from '$lib/components/ui/dialog';
3-
import {t} from 'svelte-i18n-lingui';
3+
import {T, t} from 'svelte-i18n-lingui';
44
import EntryEditor from '../entry-editor/object-editors/EntryEditor.svelte';
55
import ExampleEditorPrimitive from '../entry-editor/object-editors/ExampleEditorPrimitive.svelte';
66
import SenseEditorPrimitive from '../entry-editor/object-editors/SenseEditorPrimitive.svelte';
@@ -78,18 +78,18 @@
7878
<span>{row.changeName ?? $t`No change name`}</span>
7979
<div class="text-sm text-muted-foreground">
8080
{#if row.previousTimestamp}
81-
<FormatDuration
82-
start={new Date(row.timestamp)}
83-
end={new Date(row.previousTimestamp)}
84-
smallestUnit="seconds"
85-
options={{style: 'narrow'}}/>
86-
{$t`before`}
81+
<T msg="# before">
82+
<FormatDuration start={new Date(row.timestamp)}
83+
end={new Date(row.previousTimestamp)}
84+
smallestUnit="seconds"
85+
options={{style: 'narrow'}}/>
86+
</T>
8787
{:else}
88-
<FormatDuration
89-
start={new Date(row.timestamp)}
90-
smallestUnit="seconds"
91-
options={{style: 'narrow'}}/>
92-
{$t`ago`}
88+
<T msg="# ago">
89+
<FormatDuration start={new Date(row.timestamp)}
90+
smallestUnit="seconds"
91+
options={{style: 'narrow'}}/>
92+
</T>
9393
{/if}
9494
</div>
9595
</ListItem>

‎frontend/viewer/src/locales/en.po‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,16 @@ msgstr "{0} synced to FieldWorks. {1} synced to FieldWorks Lite."
5757
msgid "{num, plural, one {# change} other {# changes}}"
5858
msgstr "{num, plural, one {# change} other {# changes}}"
5959

60+
#: src/lib/history/HistoryView.svelte
61+
#: src/lib/activity/ActivityView.svelte
62+
msgid "# ago"
63+
msgstr "# ago"
64+
65+
#: src/lib/history/HistoryView.svelte
66+
#: src/lib/activity/ActivityView.svelte
67+
msgid "# before"
68+
msgstr "# before"
69+
6070
#: src/lib/notifications/NotificationOutlet.svelte
6171
msgid "A new version of FieldWorks Lite is available."
6272
msgstr "A new version of FieldWorks Lite is available."
@@ -108,12 +118,6 @@ msgstr "Add part of"
108118
msgid "Add Sense"
109119
msgstr "Add Sense"
110120

111-
#: src/lib/history/HistoryView.svelte
112-
#: src/lib/activity/ActivityView.svelte
113-
#: src/lib/activity/ActivityView.svelte
114-
msgid "ago"
115-
msgstr "ago"
116-
117121
#: src/project/browse/BrowseView.svelte
118122
msgid "an entry"
119123
msgstr "an entry"
@@ -155,11 +159,6 @@ msgstr "Auto"
155159
msgid "Auto synchronizing"
156160
msgstr "Auto synchronizing"
157161

158-
#: src/lib/history/HistoryView.svelte
159-
#: src/lib/activity/ActivityView.svelte
160-
msgid "before"
161-
msgstr "before"
162-
163162
#: src/project/browse/SortMenu.svelte
164163
msgid "Best match"
165164
msgstr "Best match"
@@ -1005,10 +1004,13 @@ msgid "Suggest your ideas"
10051004
msgstr "Suggest your ideas"
10061005

10071006
#: src/project/ProjectSidebar.svelte
1008-
#: src/lib/activity/ActivityView.svelte
10091007
msgid "Synced"
10101008
msgstr "Synced"
10111009

1010+
#: src/lib/activity/ActivityView.svelte
1011+
msgid "Synced {0} ago"
1012+
msgstr "Synced {0} ago"
1013+
10121014
#: src/home/HomeView.svelte
10131015
msgid "Synced with {0}"
10141016
msgstr "Synced with {0}"

‎frontend/viewer/src/locales/es.po‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,16 @@ msgstr "{0} sincronizado con FieldWorks. {1} sincronizado con FieldWorks Lite."
6262
msgid "{num, plural, one {# change} other {# changes}}"
6363
msgstr "{num, plural, one {# cambios} other {# cambios}}"
6464

65+
#: src/lib/history/HistoryView.svelte
66+
#: src/lib/activity/ActivityView.svelte
67+
msgid "# ago"
68+
msgstr ""
69+
70+
#: src/lib/history/HistoryView.svelte
71+
#: src/lib/activity/ActivityView.svelte
72+
msgid "# before"
73+
msgstr ""
74+
6575
#: src/lib/notifications/NotificationOutlet.svelte
6676
msgid "A new version of FieldWorks Lite is available."
6777
msgstr ""
@@ -113,12 +123,6 @@ msgstr "Añadir parte de"
113123
msgid "Add Sense"
114124
msgstr "Añadir sentido"
115125

116-
#: src/lib/history/HistoryView.svelte
117-
#: src/lib/activity/ActivityView.svelte
118-
#: src/lib/activity/ActivityView.svelte
119-
msgid "ago"
120-
msgstr "hace"
121-
122126
#: src/project/browse/BrowseView.svelte
123127
msgid "an entry"
124128
msgstr "una entrada"
@@ -160,11 +164,6 @@ msgstr "Auto"
160164
msgid "Auto synchronizing"
161165
msgstr "Sincronización automática"
162166

163-
#: src/lib/history/HistoryView.svelte
164-
#: src/lib/activity/ActivityView.svelte
165-
msgid "before"
166-
msgstr "antes de"
167-
168167
#: src/project/browse/SortMenu.svelte
169168
msgid "Best match"
170169
msgstr "Mejor partido"
@@ -1010,10 +1009,13 @@ msgid "Suggest your ideas"
10101009
msgstr ""
10111010

10121011
#: src/project/ProjectSidebar.svelte
1013-
#: src/lib/activity/ActivityView.svelte
10141012
msgid "Synced"
10151013
msgstr "Sincronizado"
10161014

1015+
#: src/lib/activity/ActivityView.svelte
1016+
msgid "Synced {0} ago"
1017+
msgstr ""
1018+
10171019
#: src/home/HomeView.svelte
10181020
msgid "Synced with {0}"
10191021
msgstr "Sincronizado con {0}"

‎frontend/viewer/src/locales/fr.po‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,16 @@ msgstr "{0} synchronisé avec FieldWorks. {1} synchronisé avec FieldWorks Lite.
6262
msgid "{num, plural, one {# change} other {# changes}}"
6363
msgstr "{num, plural, one {# change} other {# changes}}"
6464

65+
#: src/lib/history/HistoryView.svelte
66+
#: src/lib/activity/ActivityView.svelte
67+
msgid "# ago"
68+
msgstr ""
69+
70+
#: src/lib/history/HistoryView.svelte
71+
#: src/lib/activity/ActivityView.svelte
72+
msgid "# before"
73+
msgstr ""
74+
6575
#: src/lib/notifications/NotificationOutlet.svelte
6676
msgid "A new version of FieldWorks Lite is available."
6777
msgstr ""
@@ -113,12 +123,6 @@ msgstr "Ajouter une partie de"
113123
msgid "Add Sense"
114124
msgstr "Ajouter du sens"
115125

116-
#: src/lib/history/HistoryView.svelte
117-
#: src/lib/activity/ActivityView.svelte
118-
#: src/lib/activity/ActivityView.svelte
119-
msgid "ago"
120-
msgstr "il y a"
121-
122126
#: src/project/browse/BrowseView.svelte
123127
msgid "an entry"
124128
msgstr "une entrée"
@@ -160,11 +164,6 @@ msgstr "Auto"
160164
msgid "Auto synchronizing"
161165
msgstr "Synchronisation automatique"
162166

163-
#: src/lib/history/HistoryView.svelte
164-
#: src/lib/activity/ActivityView.svelte
165-
msgid "before"
166-
msgstr "avant"
167-
168167
#: src/project/browse/SortMenu.svelte
169168
msgid "Best match"
170169
msgstr "Meilleure correspondance"
@@ -1010,10 +1009,13 @@ msgid "Suggest your ideas"
10101009
msgstr ""
10111010

10121011
#: src/project/ProjectSidebar.svelte
1013-
#: src/lib/activity/ActivityView.svelte
10141012
msgid "Synced"
10151013
msgstr "Synchronisé"
10161014

1015+
#: src/lib/activity/ActivityView.svelte
1016+
msgid "Synced {0} ago"
1017+
msgstr ""
1018+
10171019
#: src/home/HomeView.svelte
10181020
msgid "Synced with {0}"
10191021
msgstr "Synchronisé avec {0}"

‎frontend/viewer/src/locales/id.po‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,16 @@ msgstr "{0} disinkronkan ke FieldWorks. {1} disinkronkan ke FieldWorks Lite."
6262
msgid "{num, plural, one {# change} other {# changes}}"
6363
msgstr "{num, plural, one {# perubahan} other {# perubahan}}"
6464

65+
#: src/lib/history/HistoryView.svelte
66+
#: src/lib/activity/ActivityView.svelte
67+
msgid "# ago"
68+
msgstr ""
69+
70+
#: src/lib/history/HistoryView.svelte
71+
#: src/lib/activity/ActivityView.svelte
72+
msgid "# before"
73+
msgstr ""
74+
6575
#: src/lib/notifications/NotificationOutlet.svelte
6676
msgid "A new version of FieldWorks Lite is available."
6777
msgstr ""
@@ -113,12 +123,6 @@ msgstr "Tambahkan bagian dari"
113123
msgid "Add Sense"
114124
msgstr "Tambahkan Sense"
115125

116-
#: src/lib/history/HistoryView.svelte
117-
#: src/lib/activity/ActivityView.svelte
118-
#: src/lib/activity/ActivityView.svelte
119-
msgid "ago"
120-
msgstr "yang lalu"
121-
122126
#: src/project/browse/BrowseView.svelte
123127
msgid "an entry"
124128
msgstr "sebuah entri"
@@ -160,11 +164,6 @@ msgstr "Otomatis"
160164
msgid "Auto synchronizing"
161165
msgstr "Sinkronisasi otomatis"
162166

163-
#: src/lib/history/HistoryView.svelte
164-
#: src/lib/activity/ActivityView.svelte
165-
msgid "before"
166-
msgstr "sebelum"
167-
168167
#: src/project/browse/SortMenu.svelte
169168
msgid "Best match"
170169
msgstr "Pertandingan terbaik"
@@ -1010,10 +1009,13 @@ msgid "Suggest your ideas"
10101009
msgstr ""
10111010

10121011
#: src/project/ProjectSidebar.svelte
1013-
#: src/lib/activity/ActivityView.svelte
10141012
msgid "Synced"
10151013
msgstr "Disinkronkan"
10161014

1015+
#: src/lib/activity/ActivityView.svelte
1016+
msgid "Synced {0} ago"
1017+
msgstr ""
1018+
10171019
#: src/home/HomeView.svelte
10181020
msgid "Synced with {0}"
10191021
msgstr "Disinkronkan dengan {0}"

‎frontend/viewer/src/locales/ko.po‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,16 @@ msgstr "{0} FieldWorks에 동기화됨. {1} FieldWorks Lite에 동기화됨."
6262
msgid "{num, plural, one {# change} other {# changes}}"
6363
msgstr "{num, plural, one {#변경} other {#변경}}"
6464

65+
#: src/lib/history/HistoryView.svelte
66+
#: src/lib/activity/ActivityView.svelte
67+
msgid "# ago"
68+
msgstr ""
69+
70+
#: src/lib/history/HistoryView.svelte
71+
#: src/lib/activity/ActivityView.svelte
72+
msgid "# before"
73+
msgstr ""
74+
6575
#: src/lib/notifications/NotificationOutlet.svelte
6676
msgid "A new version of FieldWorks Lite is available."
6777
msgstr ""
@@ -113,12 +123,6 @@ msgstr "의 일부를 추가합니다."
113123
msgid "Add Sense"
114124
msgstr "센스 추가"
115125

116-
#: src/lib/history/HistoryView.svelte
117-
#: src/lib/activity/ActivityView.svelte
118-
#: src/lib/activity/ActivityView.svelte
119-
msgid "ago"
120-
msgstr "전"
121-
122126
#: src/project/browse/BrowseView.svelte
123127
msgid "an entry"
124128
msgstr "항목"
@@ -160,11 +164,6 @@ msgstr "자동"
160164
msgid "Auto synchronizing"
161165
msgstr "자동 동기화"
162166

163-
#: src/lib/history/HistoryView.svelte
164-
#: src/lib/activity/ActivityView.svelte
165-
msgid "before"
166-
msgstr "전에"
167-
168167
#: src/project/browse/SortMenu.svelte
169168
msgid "Best match"
170169
msgstr "베스트 매치"
@@ -1010,10 +1009,13 @@ msgid "Suggest your ideas"
10101009
msgstr ""
10111010

10121011
#: src/project/ProjectSidebar.svelte
1013-
#: src/lib/activity/ActivityView.svelte
10141012
msgid "Synced"
10151013
msgstr "동기화"
10161014

1015+
#: src/lib/activity/ActivityView.svelte
1016+
msgid "Synced {0} ago"
1017+
msgstr ""
1018+
10171019
#: src/home/HomeView.svelte
10181020
msgid "Synced with {0}"
10191021
msgstr "{0}으로 동기화"

0 commit comments

Comments
 (0)