mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Make valid-i18n-keys rule strict and fix most exceptions

Browse source
This commit is contained in:
Jamie Kyle 2023-03-29 10:15:54 -07:00 • committed by GitHub
parent 18a6da310f
commit 11cfcb4e32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 796 additions and 687 deletions
Download patch file Download diff file Expand all files Collapse all files

23
ts/test-node/components/leftPane/LeftPaneChooseGroupMembersHelper_test.ts
View file

@ -4,7 +4,7 @@
import { assert } from 'chai';
import * as sinon from 'sinon';
import { times } from 'lodash';
import { RowType } from '../../../components/ConversationList';
import { RowType, _testHeaderText } from '../../../components/ConversationList';
import { ContactCheckboxDisabledReason } from '../../../components/conversationList/ContactCheckbox';
import { getDefaultConversation } from '../../../test-both/helpers/getDefaultConversation';
@ -117,10 +117,7 @@ describe('LeftPaneChooseGroupMembersHelper', () => {
selectedContacts: [candidateContacts[1]],
});
assert.deepEqual(helper.getRow(0), {
type: RowType.Header,
i18nKey: 'contactsHeader',
});
assert.deepEqual(_testHeaderText(helper.getRow(0)), 'contactsHeader');
assert.deepEqual(helper.getRow(1), {
type: RowType.ContactCheckbox,
contact: candidateContacts[0],
@ -167,10 +164,10 @@ describe('LeftPaneChooseGroupMembersHelper', () => {
selectedContacts: [],
});
assert.deepEqual(helper.getRow(0), {
type: RowType.Header,
i18nKey: 'findByPhoneNumberHeader',
});
assert.deepEqual(
_testHeaderText(helper.getRow(0)),
'findByPhoneNumberHeader'
);
assert.deepEqual(helper.getRow(1), {
type: RowType.PhoneNumberCheckbox,
phoneNumber: {
@ -192,10 +189,10 @@ describe('LeftPaneChooseGroupMembersHelper', () => {
selectedContacts: [],
});
assert.deepEqual(helper.getRow(0), {
type: RowType.Header,
i18nKey: 'findByUsernameHeader',
});
assert.deepEqual(
_testHeaderText(helper.getRow(0)),
'findByUsernameHeader'
);
assert.deepEqual(helper.getRow(1), {
type: RowType.UsernameCheckbox,
username: 'signal',

47
ts/test-node/components/leftPane/LeftPaneComposeHelper_test.ts
View file

@ -3,7 +3,7 @@
import { assert } from 'chai';
import * as sinon from 'sinon';
import { RowType } from '../../../components/ConversationList';
import { RowType, _testHeaderText } from '../../../components/ConversationList';
import { FindDirection } from '../../../components/leftPane/LeftPaneHelper';
import {
getDefaultConversation,
@ -223,10 +223,7 @@ describe('LeftPaneComposeHelper', () => {
assert.deepEqual(helper.getRow(0), {
type: RowType.CreateNewGroup,
});
assert.deepEqual(helper.getRow(1), {
type: RowType.Header,
i18nKey: 'contactsHeader',
});
assert.deepEqual(_testHeaderText(helper.getRow(1)), 'contactsHeader');
assert.deepEqual(helper.getRow(2), {
type: RowType.Contact,
contact: composeContacts[0],
@ -258,11 +255,7 @@ describe('LeftPaneComposeHelper', () => {
assert.deepEqual(helper.getRow(0), {
type: RowType.CreateNewGroup,
});
assert.deepEqual(helper.getRow(1), {
type: RowType.Header,
i18nKey: 'contactsHeader',
});
assert.deepEqual(_testHeaderText(helper.getRow(1)), 'contactsHeader');
assert.deepEqual(helper.getRow(2), {
type: RowType.Contact,
contact: composeContacts[0],
@ -271,10 +264,7 @@ describe('LeftPaneComposeHelper', () => {
type: RowType.Contact,
contact: composeContacts[1],
});
assert.deepEqual(helper.getRow(4), {
type: RowType.Header,
i18nKey: 'groupsHeader',
});
assert.deepEqual(_testHeaderText(helper.getRow(4)), 'groupsHeader');
assert.deepEqual(helper.getRow(5), {
type: RowType.SelectSingleGroup,
group: composeGroups[0],
@ -333,10 +323,10 @@ describe('LeftPaneComposeHelper', () => {
uuidFetchState: {},
});
assert.deepEqual(helper.getRow(0), {
type: RowType.Header,
i18nKey: 'findByPhoneNumberHeader',
});
assert.deepEqual(
_testHeaderText(helper.getRow(0)),
'findByPhoneNumberHeader'
);
assert.deepEqual(helper.getRow(1), {
type: RowType.StartNewConversation,
phoneNumber: {
@ -363,10 +353,10 @@ describe('LeftPaneComposeHelper', () => {
},
});
assert.deepEqual(helper.getRow(0), {
type: RowType.Header,
i18nKey: 'findByUsernameHeader',
});
assert.deepEqual(
_testHeaderText(helper.getRow(0)),
'findByUsernameHeader'
);
assert.deepEqual(helper.getRow(1), {
type: RowType.UsernameSearchResult,
username,
@ -389,10 +379,7 @@ describe('LeftPaneComposeHelper', () => {
uuidFetchState: {},
});
assert.deepEqual(helper.getRow(0), {
type: RowType.Header,
i18nKey: 'contactsHeader',
});
assert.deepEqual(_testHeaderText(helper.getRow(0)), 'contactsHeader');
assert.deepEqual(helper.getRow(1), {
type: RowType.Contact,
contact: composeContacts[0],
@ -401,10 +388,10 @@ describe('LeftPaneComposeHelper', () => {
type: RowType.Contact,
contact: composeContacts[1],
});
assert.deepEqual(helper.getRow(3), {
type: RowType.Header,
i18nKey: 'findByPhoneNumberHeader',
});
assert.deepEqual(
_testHeaderText(helper.getRow(3)),
'findByPhoneNumberHeader'
);
assert.deepEqual(helper.getRow(4), {
type: RowType.StartNewConversation,
phoneNumber: {

22
ts/test-node/components/leftPane/LeftPaneInboxHelper_test.tsx
View file

@ -3,7 +3,7 @@
import { assert } from 'chai';
import * as sinon from 'sinon';
import { RowType } from '../../../components/ConversationList';
import { RowType, _testHeaderText } from '../../../components/ConversationList';
import { FindDirection } from '../../../components/leftPane/LeftPaneHelper';
import { getDefaultConversation } from '../../../test-both/helpers/getDefaultConversation';
@ -339,10 +339,7 @@ describe('LeftPaneInboxHelper', () => {
pinnedConversations,
});
assert.deepEqual(helper.getRow(0), {
type: RowType.Header,
i18nKey: 'LeftPane--pinned',
});
assert.deepEqual(_testHeaderText(helper.getRow(0)), 'LeftPane--pinned');
assert.deepEqual(helper.getRow(1), {
type: RowType.Conversation,
conversation: pinnedConversations[0],
@ -351,10 +348,7 @@ describe('LeftPaneInboxHelper', () => {
type: RowType.Conversation,
conversation: pinnedConversations[1],
});
assert.deepEqual(helper.getRow(3), {
type: RowType.Header,
i18nKey: 'LeftPane--chats',
});
assert.deepEqual(_testHeaderText(helper.getRow(3)), 'LeftPane--chats');
assert.deepEqual(helper.getRow(4), {
type: RowType.Conversation,
conversation: conversations[0],
@ -388,10 +382,7 @@ describe('LeftPaneInboxHelper', () => {
archivedConversations: [getDefaultConversation()],
});
assert.deepEqual(helper.getRow(0), {
type: RowType.Header,
i18nKey: 'LeftPane--pinned',
});
assert.deepEqual(_testHeaderText(helper.getRow(0)), 'LeftPane--pinned');
assert.deepEqual(helper.getRow(1), {
type: RowType.Conversation,
conversation: pinnedConversations[0],
@ -400,10 +391,7 @@ describe('LeftPaneInboxHelper', () => {
type: RowType.Conversation,
conversation: pinnedConversations[1],
});
assert.deepEqual(helper.getRow(3), {
type: RowType.Header,
i18nKey: 'LeftPane--chats',
});
assert.deepEqual(_testHeaderText(helper.getRow(3)), 'LeftPane--chats');
assert.deepEqual(helper.getRow(4), {
type: RowType.Conversation,
conversation: conversations[0],

53
ts/test-node/components/leftPane/LeftPaneSearchHelper_test.ts
View file

@ -4,7 +4,7 @@
import { assert } from 'chai';
import * as sinon from 'sinon';
import { v4 as uuid } from 'uuid';
import { RowType } from '../../../components/ConversationList';
import { RowType, _testHeaderText } from '../../../components/ConversationList';
import { getDefaultConversation } from '../../../test-both/helpers/getDefaultConversation';
import { LeftPaneSearchHelper } from '../../../components/leftPane/LeftPaneSearchHelper';
@ -192,10 +192,10 @@ describe('LeftPaneSearchHelper', () => {
startSearchCounter: 0,
});
assert.deepEqual(helper.getRow(0), {
type: RowType.Header,
i18nKey: 'conversationsHeader',
});
assert.deepEqual(
_testHeaderText(helper.getRow(0)),
'conversationsHeader'
);
assert.deepEqual(helper.getRow(1), {
type: RowType.Conversation,
conversation: conversations[0],
@ -204,18 +204,12 @@ describe('LeftPaneSearchHelper', () => {
type: RowType.Conversation,
conversation: conversations[1],
});
assert.deepEqual(helper.getRow(3), {
type: RowType.Header,
i18nKey: 'contactsHeader',
});
assert.deepEqual(_testHeaderText(helper.getRow(3)), 'contactsHeader');
assert.deepEqual(helper.getRow(4), {
type: RowType.Conversation,
conversation: contacts[0],
});
assert.deepEqual(helper.getRow(5), {
type: RowType.Header,
i18nKey: 'messagesHeader',
});
assert.deepEqual(_testHeaderText(helper.getRow(5)), 'messagesHeader');
assert.deepEqual(helper.getRow(6), {
type: RowType.MessageSearchResult,
messageId: messages[0].id,
@ -244,18 +238,12 @@ describe('LeftPaneSearchHelper', () => {
startSearchCounter: 0,
});
assert.deepEqual(helper.getRow(0), {
type: RowType.Header,
i18nKey: 'contactsHeader',
});
assert.deepEqual(_testHeaderText(helper.getRow(0)), 'contactsHeader');
assert.deepEqual(helper.getRow(1), {
type: RowType.Conversation,
conversation: contacts[0],
});
assert.deepEqual(helper.getRow(2), {
type: RowType.Header,
i18nKey: 'messagesHeader',
});
assert.deepEqual(_testHeaderText(helper.getRow(2)), 'messagesHeader');
assert.deepEqual(helper.getRow(3), {
type: RowType.MessageSearchResult,
messageId: messages[0].id,
@ -287,10 +275,10 @@ describe('LeftPaneSearchHelper', () => {
startSearchCounter: 0,
});
assert.deepEqual(helper.getRow(0), {
type: RowType.Header,
i18nKey: 'conversationsHeader',
});
assert.deepEqual(
_testHeaderText(helper.getRow(0)),
'conversationsHeader'
);
assert.deepEqual(helper.getRow(1), {
type: RowType.Conversation,
conversation: conversations[0],
@ -299,10 +287,7 @@ describe('LeftPaneSearchHelper', () => {
type: RowType.Conversation,
conversation: conversations[1],
});
assert.deepEqual(helper.getRow(3), {
type: RowType.Header,
i18nKey: 'messagesHeader',
});
assert.deepEqual(_testHeaderText(helper.getRow(3)), 'messagesHeader');
assert.deepEqual(helper.getRow(4), {
type: RowType.MessageSearchResult,
messageId: messages[0].id,
@ -332,10 +317,7 @@ describe('LeftPaneSearchHelper', () => {
startSearchCounter: 0,
});
assert.deepEqual(helper.getRow(0), {
type: RowType.Header,
i18nKey: 'conversationsHeader',
});
assert.deepEqual(_testHeaderText(helper.getRow(0)), 'conversationsHeader');
assert.deepEqual(helper.getRow(1), {
type: RowType.Conversation,
conversation: conversations[0],
@ -344,10 +326,7 @@ describe('LeftPaneSearchHelper', () => {
type: RowType.Conversation,
conversation: conversations[1],
});
assert.deepEqual(helper.getRow(3), {
type: RowType.Header,
i18nKey: 'contactsHeader',
});
assert.deepEqual(_testHeaderText(helper.getRow(3)), 'contactsHeader');
assert.deepEqual(helper.getRow(4), {
type: RowType.Conversation,
conversation: contacts[0],

10
ts/test-node/components/leftPane/LeftPaneSetGroupMetadataHelper_test.ts
View file

@ -3,7 +3,7 @@
import { assert } from 'chai';
import * as sinon from 'sinon';
import { RowType } from '../../../components/ConversationList';
import { RowType, _testHeaderText } from '../../../components/ConversationList';
import { getDefaultConversation } from '../../../test-both/helpers/getDefaultConversation';
import { DurationInSeconds } from '../../../util/durations';
@ -92,10 +92,10 @@ describe('LeftPaneSetGroupMetadataHelper', () => {
selectedContacts,
});
assert.deepEqual(helper.getRow(0), {
type: RowType.Header,
i18nKey: 'setGroupMetadata__members-header',
});
assert.deepEqual(
_testHeaderText(helper.getRow(0)),
'setGroupMetadata__members-header'
);
assert.deepEqual(helper.getRow(1), {
type: RowType.Contact,
contact: selectedContacts[0],