-
Notifications
You must be signed in to change notification settings - Fork 446
fix(i18n): map expected failure codes instead of raw messages #4641
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
orangeCatDeveloper
wants to merge
1
commit into
apache:main
Choose a base branch
from
orangeCatDeveloper:fix/locale-sniff-raw-message
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
88 changes: 88 additions & 0 deletions
88
apps/desktop/src/main/__tests__/expected-failure-copy.test.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import assert from 'node:assert/strict'; | ||
| import { test } from 'node:test'; | ||
| import { | ||
| getProviderSettingsCopy, | ||
| providerPanelActionErrorMessage, | ||
| } from '../../renderer/features/connection-settings/index.js'; | ||
| import type { RuntimeHostServiceErrorCode } from '@maka/runtime-host/operator'; | ||
| import { | ||
| getSettingsProjectsCopy, | ||
| runtimeHostManagementErrorMessage, | ||
| type SettingsProjectsCopy, | ||
| } from '../../renderer/locales/settings-projects-copy.js'; | ||
|
|
||
| test('Runtime Host management codes render per locale and unknown codes fall back', () => { | ||
| const rendered = (code: string) => ({ | ||
| zh: runtimeHostManagementErrorMessage(code, 'zh-CN'), | ||
| en: runtimeHostManagementErrorMessage(code, 'en'), | ||
| }); | ||
| assert.deepEqual(rendered('active_tasks'), { | ||
| zh: 'Runtime Host 正在执行任务，请稍后再试', | ||
| en: 'Runtime Host still owns active work. Try again later.', | ||
| }); | ||
| assert.deepEqual(rendered('linger_disabled'), { | ||
| zh: '请先为当前用户启用 systemd linger，服务才能在登出后继续运行', | ||
| en: 'Enable systemd linger for this user so the service keeps running after logout.', | ||
| }); | ||
| assert.deepEqual(rendered('package_integrity_mismatch'), { | ||
| zh: '更新包校验失败', | ||
| en: 'The update package failed its integrity check.', | ||
| }); | ||
| const unknownFallback = { | ||
| zh: '请查看服务日志了解详情', | ||
| en: 'Check the service logs for details.', | ||
| }; | ||
| for (const code of [ | ||
| 'deployment_commit_unknown', | ||
| 'update_policy_commit_outcome_unknown', | ||
| 'some_future_code', | ||
| 'constructor', | ||
| ]) { | ||
| assert.deepEqual(rendered(code), unknownFallback); | ||
| } | ||
| }); | ||
|
|
||
| type ManagementErrorCopy = SettingsProjectsCopy['runtimeHost']['managementError']; | ||
| type OperatorErrorCopy = Record<RuntimeHostServiceErrorCode | 'unknown', string>; | ||
|
|
||
| // The catalog cannot import the operator type (renderer dependency ratchet), so tsc pins the two | ||
| // unions here: each assignment compiles only while its source keys cover the target's. | ||
| const presentsEveryOperatorCode = (copy: ManagementErrorCopy): OperatorErrorCopy => copy; | ||
| const presentsOnlyOperatorCodes = (copy: OperatorErrorCopy): ManagementErrorCopy => copy; | ||
|
|
||
| test('presenter maps exactly the codes the operator commits to', () => { | ||
| const copy = getSettingsProjectsCopy('en').runtimeHost.managementError; | ||
| assert.equal(presentsEveryOperatorCode(copy), copy); | ||
| assert.equal(presentsOnlyOperatorCodes(copy), copy); | ||
| }); | ||
|
|
||
| test('provider action errors never echo a raw Chinese message', () => { | ||
| const error = new Error('连接失败，请稍后重试'); | ||
| assert.equal( | ||
| providerPanelActionErrorMessage(error, 'zh-CN'), | ||
| getProviderSettingsCopy('zh-CN').shared.actionFallback, | ||
| ); | ||
| assert.equal( | ||
| providerPanelActionErrorMessage(error, 'en'), | ||
| getProviderSettingsCopy('en').shared.actionFallback, | ||
| ); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.