diff --git a/src/app/tabs/dashboard.component.html b/src/app/tabs/dashboard.component.html index 73507288..f73b3123 100644 --- a/src/app/tabs/dashboard.component.html +++ b/src/app/tabs/dashboard.component.html @@ -2,77 +2,77 @@

{{'sync' | i18n}}

- Last group sync: + {{'lastGroupSync' | i18n}}: - {{lastGroupSync | date:'medium'}} -
Last user sync: +
{{'lastUserSync' | i18n}}: - {{lastUserSync | date:'medium'}}

- Sync status: - Running - Stopped + {{'syncStatus' | i18n}}: + {{'running' | i18n}} + {{'stopped' | i18n}}

-

Testing

+

{{'testing' | i18n}}

-

You can run tests to see how your directory and sync settings are working. Tests will not sync to your Bitwarden organization.

+

{{'testingDesc' | i18n}}

- +

-

Users

+

{{'users' | i18n}}

  • {{u.displayName}}
-

No users to list.

-

Disabled Users

+

{{'noUsers' | i18n}}

+

{{'disabledUsers' | i18n}}

  • {{u.displayName}}
-

No users to list.

-

Deleted Users

+

{{'noUsers' | i18n}}

+

{{'deletedUsers' | i18n}}

  • {{u.displayName}}
-

No users to list.

+

{{'noUsers' | i18n}}

-

Groups

+

{{'groups' | i18n}}

  • @@ -82,7 +82,7 @@
-

No groups to list.

+

{{'noGroups' | i18n}}

diff --git a/src/app/tabs/dashboard.component.ts b/src/app/tabs/dashboard.component.ts index 63df3bc5..56874e41 100644 --- a/src/app/tabs/dashboard.component.ts +++ b/src/app/tabs/dashboard.component.ts @@ -78,13 +78,13 @@ export class DashboardComponent implements OnInit, OnDestroy { await this.startPromise; this.messagingService.send('scheduleNextDirSync'); this.syncRunning = true; - this.toasterService.popAsync('success', null, 'Syncing started.'); + this.toasterService.popAsync('success', null, this.i18nService.t('syncingStarted')); } async stop() { this.messagingService.send('cancelDirSync'); this.syncRunning = false; - this.toasterService.popAsync('success', null, 'Syncing stopped.'); + this.toasterService.popAsync('success', null, this.i18nService.t('syncingStopped')); } async sync() { @@ -92,7 +92,8 @@ export class DashboardComponent implements OnInit, OnDestroy { const result = await this.syncPromise; const groupCount = result[0] != null ? result[0].length : 0; const userCount = result[1] != null ? result[1].length : 0; - this.toasterService.popAsync('success', null, 'Synced ' + groupCount + ' groups and ' + userCount + ' users.'); + this.toasterService.popAsync('success', null, + this.i18nService.t('syncCounts', groupCount.toString(), userCount.toString())); } async simulate() { @@ -108,7 +109,7 @@ export class DashboardComponent implements OnInit, OnDestroy { this.simUsers = result[1]; this.simGroups = result[0]; } catch (e) { - reject(e || 'Sync error.'); + reject(e || this.i18nService.t('syncError')); } const userMap = new Map(); diff --git a/src/app/tabs/settings.component.html b/src/app/tabs/settings.component.html index 9fc7bae2..0f2ad04e 100644 --- a/src/app/tabs/settings.component.html +++ b/src/app/tabs/settings.component.html @@ -116,7 +116,7 @@
-

{{'organization' | i18n}}

+

{{'account' | i18n}}

diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json index afd6b103..854698ec 100644 --- a/src/locales/en/messages.json +++ b/src/locales/en/messages.json @@ -446,5 +446,84 @@ }, "syncCacheCleared": { "message": "The sync cache has been cleared." + }, + "lastGroupSync": { + "message": "Last group sync" + }, + "lastUserSync": { + "message": "Last user sync" + }, + "syncStatus": { + "message": "Sync status" + }, + "running": { + "message": "Running" + }, + "stopped": { + "message": "Stopped" + }, + "startSync": { + "message": "Start Sync" + }, + "stopSync": { + "message": "Stop Sync" + }, + "syncNow": { + "message": "Sync Now" + }, + "testing": { + "message": "Testing" + }, + "testingDesc": { + "message": "You can run tests to see how your directory and sync settings are working. Tests will not sync to your Bitwarden organization." + }, + "testNow": { + "message": "Test Now" + }, + "testLastSync": { + "message": "Test since the last successful sync" + }, + "users": { + "message": "Users" + }, + "disabledUsers": { + "message": "Disabled Users" + }, + "deletedUsers": { + "message": "Deleted Users" + }, + "noUsers": { + "message": "No users to list." + }, + "groups": { + "message": "Groups" + }, + "noGroups": { + "message": "No groups to list." + }, + "syncingStarted": { + "message": "Syncing started." + }, + "syncingStopped": { + "message": "Syncing stopped." + }, + "syncCounts": { + "message": "Synced $GROUP_COUNT$ group(s) and $USER_COUNT$ user(s).", + "placeholders": { + "group_count": { + "content": "$1", + "example": "10" + }, + "user_count": { + "content": "$1", + "example": "55" + } + } + }, + "syncError": { + "message": "Sync error." + }, + "account": { + "message": "Account" } }