fix(i18n): map expected failure codes instead of raw messages #4641
+286
−54
There are no files selected for viewing
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,117 @@ | ||
| /* | ||
| * 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 { readFileSync } from 'node:fs'; | ||
| import { test } from 'node:test'; | ||
| import { | ||
| getProviderSettingsCopy, | ||
| providerPanelActionErrorMessage, | ||
| } from '../../renderer/features/connection-settings/index.js'; | ||
| import { | ||
| getSettingsProjectsCopy, | ||
| runtimeHostManagementErrorMessage, | ||
| } 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'), | ||
| 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.', | ||
| }); | ||
| // Commit-outcome-unknown codes fold into the generic log-pointer (managed-deployment.ts, update-policy-store.ts). | ||
| 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', | ||
| ]) { | ||
| assert.deepEqual(rendered(code), unknownFallback); | ||
| } | ||
| }); | ||
|
|
||
| function extractErrorCodes(source: string, className: string): string[] { | ||
| const classIndex = source.indexOf(`class ${className}`); | ||
| assert.ok(classIndex !== -1, `expected ${className} in CLI source`); | ||
| const classBlock = source.slice(classIndex); | ||
| const codeIndex = classBlock.indexOf('readonly code:'); | ||
| const messageIndex = classBlock.indexOf('message: string'); | ||
| assert.ok(codeIndex !== -1 && messageIndex !== -1 && codeIndex < messageIndex); | ||
| const codes = classBlock | ||
| .slice(codeIndex, messageIndex) | ||
| .match(/'([a-z_]+)'/gu) | ||
| ?.map((literal) => literal.slice(1, -1)); | ||
| assert.ok(codes && codes.length > 0, `expected the ${className} code union`); | ||
| return codes; | ||
| } | ||
|
|
||
| function readCliSource(fileName: string): string { | ||
| return readFileSync( | ||
| new URL(`../../../../../packages/cli/src/${fileName}`, import.meta.url), | ||
| 'utf8', | ||
| ); | ||
| } | ||
|
|
||
| // [source file, error class] pairs presented distinctly. The two inline codes | ||
| // below have no error class (reconciliation, update-command). | ||
| const CLI_ERROR_SOURCES = [ | ||
| ['runtime-host-service-manager.ts', 'RuntimeHostServiceManagerError'], | ||
| ['runtime-host-registry-update.ts', 'RuntimeHostUpdateDiscoveryError'], | ||
| ['runtime-host-update-package.ts', 'RuntimeHostUpdatePackageError'], | ||
| ['runtime-host-update-policy-store.ts', 'RuntimeHostUpdatePolicyError'], | ||
| ] as const; | ||
|
|
||
| test('presenter maps every management code the CLI can emit', () => { | ||
| const extracted = CLI_ERROR_SOURCES.flatMap(([file, className]) => | ||
| extractErrorCodes(readCliSource(file), className), | ||
| ); | ||
| const codes = [...new Set([...extracted, 'update_policy_changed', 'update_not_admitted'])]; | ||
| assert.ok(codes.length >= 20, `expected the CLI code set, got ${codes.length}`); | ||
| const presented = Object.keys(getSettingsProjectsCopy('en').runtimeHost.managementError); | ||
| assert.deepEqual(codes.filter((code) => !presented.includes(code)), [ | ||
| 'update_policy_commit_outcome_unknown', | ||
| ]); | ||
| // Deployment-internal codes (managed-deployment.ts, …) intentionally fall back to unknown. | ||
| }); | ||
|
|
||
| test('provider action errors never echo a raw Chinese message', () => { | ||
| const error = new Error('连接失败，请稍后重试'); | ||
| assert.equal( | ||
| providerPanelActionErrorMessage(error, 'zh'), | ||
| getProviderSettingsCopy('zh').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
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.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
P3: this is the exact pattern the PR title targets, left in the file the PR edits. Main throws
new Error('Unable to delete Connection: connection_stale')at runtime-host-connections-ipc-main.ts:333 and the renderer regexes the code back out of the sentence. Same for the lastTest lookup on line 38, which is keyed on lowercased message text. Not asking you to fix it here, but the body should say that this surface and artifact-pane.tsx only lost their CJK passthrough this round and are still raw-message classified, otherwise it reads as if the whole path is code-driven now.