Skip to content
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.

Sign up for GitHub

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

docs: improve placeholder text of the route header override #1973

Merged
merged 3 commits into from
Jul 15, 2021
Merged

docs: improve placeholder text of the route header override #1973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d96f35
docs: improve placeholder text of the route header override
Jul 11, 2021
d4182cf
Merge branch 'apache:master' into patch-20210711
okaybase Jul 14, 2021
7e6145f
should create route test0, test1, test2
Jul 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/cypress/integration/route/search-route.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ context('Create and Search Route', () => {
cy.login();
});

it('should create route test1, test2, test3', function () {
it('should create route test0, test1, test2', function () {
cy.visit('/');
cy.contains('Route').click();
for (let i = 0; i < 3; i += 1) {
Expand Down
4 changes: 2 additions & 2 deletions web/src/pages/Route/components/Step1/ProxyRewrite.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ const ProxyRewrite: React.FC<RouteModule.Step1PassProps> = ({ form, disabled })
<Input
placeholder={`${formatMessage({
id: 'component.global.pleaseEnter',
})}${formatMessage({ id: 'page.route.parameterName' })}`}
})} ${formatMessage({ id: 'page.route.parameterName' })}`}
disabled={disabled}
/>
</Form.Item>
Expand All @@ -317,7 +317,7 @@ const ProxyRewrite: React.FC<RouteModule.Step1PassProps> = ({ form, disabled })
<Input
placeholder={`${formatMessage({
id: 'component.global.pleaseEnter',
})}${formatMessage({ id: 'page.route.value' })}`}
})} ${formatMessage({ id: 'page.route.value' })}`}
disabled={disabled}
/>
</Form.Item>
Expand Down
2 changes: 1 addition & 1 deletion web/src/pages/Route/components/Step3/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ const Page: React.FC<Props> = ({ data, onChange, readonly = false, isForceHttps
// NOTE: forceHttps do not support DRAW mode
const titleArr: string[] = [];
if (!useSupportBrowser) {
titleArr.push(formatMessage({ id: 'page.route.tooltip.pluginOrchOnlySuportChrome' }));
titleArr.push(formatMessage({ id: 'page.route.tooltip.pluginOrchOnlySupportChrome' }));
}
if (isForceHttps) {
titleArr.push(formatMessage({ id: 'page.route.tooltip.pluginOrchWithoutRedirect' }));
Expand Down
4 changes: 2 additions & 2 deletions web/src/pages/Route/locales/en-US.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export default {

'page.route.form.itemRulesRequiredMessage.parameterName':
'Only letters and Numbers are supported, and can only begin with letters',
'page.route.value': 'Value',
'page.route.value': 'Parameter Value',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why to change this, Value is fine IMO

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, without the Parameter is also ok here. @iamayushdas
Parameter is added only to be consistent with the Chinese version.

image

'page.route.panelSection.title.advancedMatchRule': 'Advanced Routing Matching Conditions',

'page.route.panelSection.title.nameDescription': 'Name And Description',
Expand Down Expand Up @@ -139,7 +139,7 @@ export default {
'page.route.list': 'Route List',
'page.route.panelSection.title.requestOverride': 'Request Override',
'page.route.form.itemLabel.headerRewrite': 'Header Override',
'page.route.tooltip.pluginOrchOnlySuportChrome': 'Plugin orchestration only supports Chrome.',
'page.route.tooltip.pluginOrchOnlySupportChrome': 'Plugin orchestration only supports Chrome.',
'page.route.tooltip.pluginOrchWithoutProxyRewrite': 'Plugin orchestration mode cannot be used when request override is configured in Step 1.',
'page.route.tooltip.pluginOrchWithoutRedirect': 'Plugin orchestration mode cannot be used when Redirect in Step 1 is selected to enable HTTPS.',

Expand Down
2 changes: 1 addition & 1 deletion web/src/pages/Route/locales/zh-CN.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ export default {
'page.route.button.importOpenApi': '导入 OpenAPI',
'page.route.button.selectFile': '请选择上传文件',
'page.route.list': '路由列表',
'page.route.tooltip.pluginOrchOnlySuportChrome': '插件编排仅支持 Chrome 浏览器。',
'page.route.tooltip.pluginOrchOnlySupportChrome': '插件编排仅支持 Chrome 浏览器。',
'page.route.tooltip.pluginOrchWithoutProxyRewrite': '当步骤一中 配置了 请求改写时，不可使用插件编排模式。',
'page.route.tooltip.pluginOrchWithoutRedirect': '当步骤一中 重定向 选择为 启用 HTTPS 时，不可使用插件编排模式。',

Expand Down