From 4c2574b8d18132134469a9d5083782a7c5308afd Mon Sep 17 00:00:00 2001 From: Ivan Ha Date: Thu, 29 Dec 2022 11:55:26 +0800 Subject: [PATCH 1/2] fix: translations of RelationInputDataManager --- .../RelationInputDataManager.js | 16 +++++++--------- .../core/admin/admin/src/translations/en.json | 7 +++++++ .../core/admin/admin/src/translations/zh.json | 7 +++++++ 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/RelationInputDataManager.js b/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/RelationInputDataManager.js index 63ac4098af..7ffc49415a 100644 --- a/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/RelationInputDataManager.js +++ b/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/RelationInputDataManager.js @@ -11,8 +11,6 @@ import { RelationInput } from '../RelationInput'; import { useRelation } from '../../hooks/useRelation'; -import { getTrad } from '../../utils'; - import { PUBLICATION_STATES, RELATIONS_TO_DISPLAY, SEARCH_RESULTS_TO_DISPLAY } from './constants'; import { connect, select, normalizeSearchResults, diffRelations, normalizeRelation } from './utils'; @@ -174,23 +172,23 @@ export const RelationInputDataManager = ({ labelLoadMore={ !isCreatingEntry ? formatMessage({ - id: getTrad('relation.loadMore'), + id: 'relation.loadMore', defaultMessage: 'Load More', }) : null } labelDisconnectRelation={formatMessage({ - id: getTrad('relation.disconnect'), + id: 'relation.disconnect', defaultMessage: 'Remove', })} listHeight={320} loadingMessage={formatMessage({ - id: getTrad('relation.isLoading'), + id: 'relation.isLoading', defaultMessage: 'Relations are loading', })} name={name} noRelationsMessage={formatMessage({ - id: getTrad('relation.notAvailable'), + id: 'relation.notAvailable', defaultMessage: 'No relations available', })} numberOfRelationsToDisplay={RELATIONS_TO_DISPLAY} @@ -201,18 +199,18 @@ export const RelationInputDataManager = ({ onSearchNextPage={() => handleSearchMore()} placeholder={formatMessage( placeholder || { - id: getTrad('relation.add'), + id: 'relation.add', defaultMessage: 'Add relation', } )} publicationStateTranslations={{ [PUBLICATION_STATES.DRAFT]: formatMessage({ - id: getTrad('relation.publicationState.draft'), + id: 'relation.publicationState.draft', defaultMessage: 'Draft', }), [PUBLICATION_STATES.PUBLISHED]: formatMessage({ - id: getTrad('relation.publicationState.published'), + id: 'relation.publicationState.published', defaultMessage: 'Published', }), }} diff --git a/packages/core/admin/admin/src/translations/en.json b/packages/core/admin/admin/src/translations/en.json index 8ca8b62020..b51f5d4c8d 100644 --- a/packages/core/admin/admin/src/translations/en.json +++ b/packages/core/admin/admin/src/translations/en.json @@ -791,6 +791,13 @@ "notification.warning.title": "Warning:", "notification.warning.404": "404 - Not found", "or": "OR", + "relation.loadMore": "Load More", + "relation.disconnect": "Remove", + "relation.isLoading": "Relations are loading", + "relation.notAvailable": "No relations available", + "relation.add": "Add relation", + "relation.publicationState.draft": "Draft", + "relation.publicationState.published": "Published", "request.error.model.unknown": "This model doesn't exist", "skipToContent": "Skip to content", "submit": "Submit" diff --git a/packages/core/admin/admin/src/translations/zh.json b/packages/core/admin/admin/src/translations/zh.json index c8c28f7084..0c0fe36255 100644 --- a/packages/core/admin/admin/src/translations/zh.json +++ b/packages/core/admin/admin/src/translations/zh.json @@ -786,6 +786,13 @@ "notification.warning.title": "警告:", "notification.warning.404": "404 - 找不到", "or": "或", + "relation.loadMore": "載入更多", + "relation.disconnect": "刪除", + "relation.isLoading": "關聯載入中", + "relation.notAvailable": "沒有可用關聯", + "relation.add": "加入關聯", + "relation.publicationState.draft": "草稿", + "relation.publicationState.published": "已發布", "request.error.model.unknown": "不存在的資料", "skipToContent": "跳過到內容", "submit": "送出" From e41226d794415067bbc79c68c241836772f6a29d Mon Sep 17 00:00:00 2001 From: Ivan Ha Date: Fri, 6 Jan 2023 11:43:54 +0800 Subject: [PATCH 2/2] fixup! fix: translations of RelationInputDataManager --- .../RelationInputDataManager.js | 16 +++++++++------- .../core/admin/admin/src/translations/en.json | 14 +++++++------- .../core/admin/admin/src/translations/zh.json | 14 +++++++------- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/RelationInputDataManager.js b/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/RelationInputDataManager.js index 7ffc49415a..63ac4098af 100644 --- a/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/RelationInputDataManager.js +++ b/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/RelationInputDataManager.js @@ -11,6 +11,8 @@ import { RelationInput } from '../RelationInput'; import { useRelation } from '../../hooks/useRelation'; +import { getTrad } from '../../utils'; + import { PUBLICATION_STATES, RELATIONS_TO_DISPLAY, SEARCH_RESULTS_TO_DISPLAY } from './constants'; import { connect, select, normalizeSearchResults, diffRelations, normalizeRelation } from './utils'; @@ -172,23 +174,23 @@ export const RelationInputDataManager = ({ labelLoadMore={ !isCreatingEntry ? formatMessage({ - id: 'relation.loadMore', + id: getTrad('relation.loadMore'), defaultMessage: 'Load More', }) : null } labelDisconnectRelation={formatMessage({ - id: 'relation.disconnect', + id: getTrad('relation.disconnect'), defaultMessage: 'Remove', })} listHeight={320} loadingMessage={formatMessage({ - id: 'relation.isLoading', + id: getTrad('relation.isLoading'), defaultMessage: 'Relations are loading', })} name={name} noRelationsMessage={formatMessage({ - id: 'relation.notAvailable', + id: getTrad('relation.notAvailable'), defaultMessage: 'No relations available', })} numberOfRelationsToDisplay={RELATIONS_TO_DISPLAY} @@ -199,18 +201,18 @@ export const RelationInputDataManager = ({ onSearchNextPage={() => handleSearchMore()} placeholder={formatMessage( placeholder || { - id: 'relation.add', + id: getTrad('relation.add'), defaultMessage: 'Add relation', } )} publicationStateTranslations={{ [PUBLICATION_STATES.DRAFT]: formatMessage({ - id: 'relation.publicationState.draft', + id: getTrad('relation.publicationState.draft'), defaultMessage: 'Draft', }), [PUBLICATION_STATES.PUBLISHED]: formatMessage({ - id: 'relation.publicationState.published', + id: getTrad('relation.publicationState.published'), defaultMessage: 'Published', }), }} diff --git a/packages/core/admin/admin/src/translations/en.json b/packages/core/admin/admin/src/translations/en.json index b51f5d4c8d..e1fc7ac6c7 100644 --- a/packages/core/admin/admin/src/translations/en.json +++ b/packages/core/admin/admin/src/translations/en.json @@ -722,6 +722,13 @@ "content-manager.popUpWarning.warning.publish-question": "Do you still want to publish?", "content-manager.popUpwarning.warning.has-draft-relations.button-confirm": "Yes, publish", "content-manager.popUpwarning.warning.has-draft-relations.message": "{count, plural, one { relation is } other { relations are } } not published yet and might lead to unexpected behavior.", + "content-manager.relation.loadMore": "Load More", + "content-manager.relation.disconnect": "Remove", + "content-manager.relation.isLoading": "Relations are loading", + "content-manager.relation.notAvailable": "No relations available", + "content-manager.relation.add": "Add relation", + "content-manager.relation.publicationState.draft": "Draft", + "content-manager.relation.publicationState.published": "Published", "form.button.continue": "Continue", "form.button.done": "Done", "global.search": "Search", @@ -791,13 +798,6 @@ "notification.warning.title": "Warning:", "notification.warning.404": "404 - Not found", "or": "OR", - "relation.loadMore": "Load More", - "relation.disconnect": "Remove", - "relation.isLoading": "Relations are loading", - "relation.notAvailable": "No relations available", - "relation.add": "Add relation", - "relation.publicationState.draft": "Draft", - "relation.publicationState.published": "Published", "request.error.model.unknown": "This model doesn't exist", "skipToContent": "Skip to content", "submit": "Submit" diff --git a/packages/core/admin/admin/src/translations/zh.json b/packages/core/admin/admin/src/translations/zh.json index 0c0fe36255..b6cbf3899b 100644 --- a/packages/core/admin/admin/src/translations/zh.json +++ b/packages/core/admin/admin/src/translations/zh.json @@ -717,6 +717,13 @@ "content-manager.popUpWarning.warning.publish-question": "您依然要發布它嗎?", "content-manager.popUpwarning.warning.has-draft-relations.button-confirm": "是, 發布", "content-manager.popUpwarning.warning.has-draft-relations.message": "{count, plural, =0 { 個內容關聯} one { 個內容關聯} other { 個內容關聯}} 還沒有發佈。

它可能會在您的項目中產生關聯失效和錯誤。", + "content-manager.relation.loadMore": "載入更多", + "content-manager.relation.disconnect": "刪除", + "content-manager.relation.isLoading": "關聯載入中", + "content-manager.relation.notAvailable": "沒有可用關聯", + "content-manager.relation.add": "加入關聯", + "content-manager.relation.publicationState.draft": "草稿", + "content-manager.relation.publicationState.published": "已發布", "form.button.continue": "繼續", "form.button.done": "完成", "global.search": "搜尋", @@ -786,13 +793,6 @@ "notification.warning.title": "警告:", "notification.warning.404": "404 - 找不到", "or": "或", - "relation.loadMore": "載入更多", - "relation.disconnect": "刪除", - "relation.isLoading": "關聯載入中", - "relation.notAvailable": "沒有可用關聯", - "relation.add": "加入關聯", - "relation.publicationState.draft": "草稿", - "relation.publicationState.published": "已發布", "request.error.model.unknown": "不存在的資料", "skipToContent": "跳過到內容", "submit": "送出"