bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-22 11:13:46 +00:00
Code Issues Releases Wiki Activity

revert usage of THING translations

Browse Source
This commit is contained in:
Kyle Spearrin
2018-07-10 08:39:05 -04:00
parent a6bd9ecfa3
commit 5ade229cb9
7 changed files with 102 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/organizations/manage/entity-users.component.ts
View File

@@ -82,8 +82,7 @@ export class EntityUsersComponent implements OnInit {
this.analytics.eventTrack.next({ action: 'Removed User From Collection' });
}
this.toasterService.popAsync('success', null,
this.i18nService.t('removedThing', this.i18nService.t('user').toLocaleLowerCase(), user.email));
this.toasterService.popAsync('success', null, this.i18nService.t('removedUserId', user.email));
this.onRemovedUser.emit();
const index = this.users.indexOf(user);
if (index > -1) {

1
src/app/organizations/manage/events.component.ts
View File

@@ -99,6 +99,7 @@ export class EventsComponent implements OnInit {
userEmail: user != null ? user.email : '',
date: r.date,
ip: r.ipAddress,
type: r.type,
};
});

4
src/app/organizations/manage/group-add-edit.component.html
View File

@@ -18,7 +18,7 @@
<div class="form-group">
<label for="externalId">{{'externalId' | i18n}}</label>
<input id="externalId" class="form-control" type="text" name="ExternalId" [(ngModel)]="externalId">
<small class="form-text text-muted">{{'externalIdDesc' | i18n : ('group' | i18n).toLocaleLowerCase()}}</small>
<small class="form-text text-muted">{{'externalIdGroupDesc' | i18n}}</small>
</div>
<h3 class="mt-4">{{'accessControl' | i18n}}</h3>
<div class="form-group">
@@ -51,7 +51,7 @@
<thead>
<tr>
<th>&nbsp;</th>
<th>{{'collection' | i18n}}</th>
<th>{{'collections' | i18n}}</th>
<th width="100" class="text-center">{{'readOnly' | i18n}}</th>
</tr>
</thead>

6
src/app/organizations/manage/group-add-edit.component.ts
View File

@@ -111,8 +111,7 @@ export class GroupAddEditComponent implements OnInit {
await this.formPromise;
this.analytics.eventTrack.next({ action: this.editMode ? 'Edited Group' : 'Created Group' });
this.toasterService.popAsync('success', null,
this.i18nService.t(this.editMode ? 'editedThing' : 'createdThing',
this.i18nService.t('group').toLocaleLowerCase(), this.name));
this.i18nService.t(this.editMode ? 'editedGroupId' : 'createdGroupId', this.name));
this.onSavedGroup.emit();
} catch { }
}
@@ -133,8 +132,7 @@ export class GroupAddEditComponent implements OnInit {
this.deletePromise = this.apiService.deleteGroup(this.organizationId, this.groupId);
await this.deletePromise;
this.analytics.eventTrack.next({ action: 'Deleted Group' });
this.toasterService.popAsync('success', null,
this.i18nService.t('deletedThing', this.i18nService.t('group').toLocaleLowerCase(), this.name));
this.toasterService.popAsync('success', null, this.i18nService.t('deletedGroupId', this.name));
this.onDeletedGroup.emit();
} catch { }
}

3
src/app/organizations/manage/groups.component.ts
View File

@@ -98,8 +98,7 @@ export class GroupsComponent implements OnInit {
try {
await this.apiService.deleteGroup(this.organizationId, group.id);
this.analytics.eventTrack.next({ action: 'Deleted Group' });
this.toasterService.popAsync('success', null,
this.i18nService.t('deletedThing', this.i18nService.t('group').toLocaleLowerCase(), group.name));
this.toasterService.popAsync('success', null, this.i18nService.t('deletedGroupId', group.name));
const index = this.groups.indexOf(group);
if (index > -1) {
this.groups.splice(index, 1);

36
src/app/services/event.service.ts
View File

@@ -64,16 +64,13 @@ export class EventService {
break;
// Cipher
case EventType.Cipher_Created:
msg = this.i18nService.t('createdThing', this.i18nService.t('item').toLocaleLowerCase(),
this.formatCipherId(ev, options));
msg = this.i18nService.t('createdItemId', this.formatCipherId(ev, options));
break;
case EventType.Cipher_Updated:
msg = this.i18nService.t('editedThing', this.i18nService.t('item').toLocaleLowerCase(),
this.formatCipherId(ev, options));
msg = this.i18nService.t('editedItemId', this.formatCipherId(ev, options));
break;
case EventType.Cipher_Deleted:
msg = this.i18nService.t('deletedThing', this.i18nService.t('item').toLocaleLowerCase(),
this.formatCipherId(ev, options));
msg = this.i18nService.t('deletedItemId', this.formatCipherId(ev, options));
break;
case EventType.Cipher_AttachmentCreated:
msg = this.i18nService.t('createdAttachmentForItem', this.formatCipherId(ev, options));
@@ -82,37 +79,30 @@ export class EventService {
msg = this.i18nService.t('deletedAttachmentForItem', this.formatCipherId(ev, options));
break;
case EventType.Cipher_Shared:
msg = this.i18nService.t('sharedThing', this.i18nService.t('item').toLocaleLowerCase(),
this.formatCipherId(ev, options));
msg = this.i18nService.t('sharedItemId', this.formatCipherId(ev, options));
break;
case EventType.Cipher_UpdatedCollections:
msg = this.i18nService.t('editedCollectionsForItem', this.formatCipherId(ev, options));
break;
// Collection
case EventType.Collection_Created:
msg = this.i18nService.t('createdThing', this.i18nService.t('collection').toLocaleLowerCase(),
this.formatCollectionId(ev));
msg = this.i18nService.t('createdCollectionId', this.formatCollectionId(ev));
break;
case EventType.Collection_Updated:
msg = this.i18nService.t('editedThing', this.i18nService.t('collection').toLocaleLowerCase(),
this.formatCollectionId(ev));
msg = this.i18nService.t('editedCollectionId', this.formatCollectionId(ev));
break;
case EventType.Collection_Deleted:
msg = this.i18nService.t('deletedThing', this.i18nService.t('collection').toLocaleLowerCase(),
this.formatCollectionId(ev));
msg = this.i18nService.t('deletedCollectionId', this.formatCollectionId(ev));
break;
// Group
case EventType.Group_Created:
msg = this.i18nService.t('createdThing', this.i18nService.t('group').toLocaleLowerCase(),
this.formatGroupId(ev));
msg = this.i18nService.t('createdGroupId', this.formatGroupId(ev));
break;
case EventType.Group_Updated:
msg = this.i18nService.t('editedThing', this.i18nService.t('group').toLocaleLowerCase(),
this.formatGroupId(ev));
msg = this.i18nService.t('editedGroupId', this.formatGroupId(ev));
break;
case EventType.Group_Deleted:
msg = this.i18nService.t('deletedThing', this.i18nService.t('group').toLocaleLowerCase(),
this.formatGroupId(ev));
msg = this.i18nService.t('deletedGroupId', this.formatGroupId(ev));
break;
// Org user
case EventType.OrganizationUser_Invited:
@@ -122,12 +112,10 @@ export class EventService {
msg = this.i18nService.t('confirmedUser', this.formatOrgUserId(ev));
break;
case EventType.OrganizationUser_Updated:
msg = this.i18nService.t('editedThing', this.i18nService.t('user').toLocaleLowerCase(),
this.formatOrgUserId(ev));
msg = this.i18nService.t('editedUserId', this.formatOrgUserId(ev));
break;
case EventType.OrganizationUser_Removed:
msg = this.i18nService.t('removedThing', this.i18nService.t('user').toLocaleLowerCase(),
this.formatOrgUserId(ev));
msg = this.i18nService.t('removedUserId', this.formatOrgUserId(ev));
break;
case EventType.OrganizationUser_UpdatedGroups:
msg = this.i18nService.t('editedGroupsForUser', this.formatOrgUserId(ev));