Skip to content

Commit

Permalink
Merge pull request #125 from salute-developers/athena-instead-eva
Browse files Browse the repository at this point in the history
fix: athena вместо eva
  • Loading branch information
sasha-tlt authored Feb 13, 2024
2 parents 32292d8 + 0923f30 commit 92d1175
Show file tree
Hide file tree
Showing 7 changed files with 69 additions and 69 deletions.
62 changes: 31 additions & 31 deletions examples/echo/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/echo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"dev": "nodemon --watch 'src/**/*.ts' --exec 'ts-node' ./src/server.ts"
},
"dependencies": {
"@salutejs/client": "1.21.5",
"@salutejs/client": "1.32.6",
"@salutejs/plasma-icons": "1.150.0",
"@salutejs/plasma-tokens": "1.55.0",
"@salutejs/plasma-ui": "1.197.0",
Expand Down
62 changes: 31 additions & 31 deletions examples/todo/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/todo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"test": "jest"
},
"dependencies": {
"@salutejs/client": "1.21.5",
"@salutejs/client": "1.32.6",
"@salutejs/plasma-icons": "1.150.0",
"@salutejs/plasma-tokens": "1.55.0",
"@salutejs/plasma-ui": "1.197.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/todo/src/Components/GlobalStyles.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { FC, useMemo } from 'react';
import { createGlobalStyle } from 'styled-components';
import type { CharacterId } from '@salutejs/scenario';
import type { CharacterId } from '@salutejs/client';
import { darkJoy, darkEva, darkSber } from '@salutejs/plasma-tokens/themes';
import { text, background, gradient } from '@salutejs/plasma-tokens';

Expand Down
6 changes: 3 additions & 3 deletions packages/scenario/src/lib/i18n.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@ describe('i18n', () => {
});

describe('missing translate', () => {
it('missing in eva', () => {
expect(i18n('eva')(keysetDict)('Только СБЕР')).toEqual('Только СБЕР');
it('missing in athena', () => {
expect(i18n('athena')(keysetDict)('Только СБЕР')).toEqual('Только СБЕР');
});

it('missing in everywhere', () => {
expect(i18n('eva')(keysetDict)('Нигде нет перевода')).toEqual('Нигде нет перевода');
expect(i18n('athena')(keysetDict)('Нигде нет перевода')).toEqual('Нигде нет перевода');
});
});
});
2 changes: 1 addition & 1 deletion packages/scenario/src/lib/types/systemMessage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ export type Surface =
/**
* Идентификатор персонажа, которого выбрал пользователь.
*/
export type CharacterId = 'sber' | 'eva' | 'joy';
export type CharacterId = 'sber' | 'athena' | 'joy';
/**
* Имя персонажа.
*/
Expand Down

0 comments on commit 92d1175

Please sign in to comment.