Leahnaya/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2026-09-12 00:56:22 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

adds isLoading to translation state

Browse Source
This commit is contained in:
ChaosExAnima
2026-09-11 18:20:46 +02:00
parent 1d53d9d7e7
commit f12789ec33
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/javascript/mastodon/components/status/content.stories.tsx
View File

@@ -29,6 +29,7 @@ const meta = {
spoilerHtml: '',
language: args.translatedTo,
detected_source_language: 'en',
isLoading: false,
} satisfies StatusTranslation;
}

2
app/javascript/mastodon/components/status_content.jsx
View File

@@ -41,7 +41,7 @@ class TranslateButton extends PureComponent {
render () {
const { translation, onClick } = this.props;
if (translation) {
if (translation && !translation.get('isLoading')) {
const language = preloadedLanguages.find(lang => lang[0] === translation.get('detected_source_language'));
const languageName = language ? language[1] : translation.get('detected_source_language');
const provider = translation.get('provider');

4
app/javascript/mastodon/models/status.ts
View File

@@ -156,4 +156,6 @@ export type FilterResult = Omit<ApiFilterResultJSON, 'filter'> & {
filter: string;
};
export type StatusTranslation = Omit<ApiStatusTranslationJSON, 'poll'>;
export type StatusTranslation = Omit<ApiStatusTranslationJSON, 'poll'> & {
isLoading: boolean;
};

5
app/javascript/mastodon/reducers/statuses.js
View File

@@ -24,6 +24,7 @@ import {
STATUS_REVEAL,
STATUS_HIDE,
STATUS_COLLAPSE,
STATUS_TRANSLATE_REQUEST,
STATUS_TRANSLATE_SUCCESS,
STATUS_TRANSLATE_UNDO,
STATUS_FETCH_REQUEST,
@@ -46,7 +47,7 @@ const deleteStatus = (state, id, references) => {
const statusTranslateSuccess = (state, id, translation) => {
return state.withMutations(map => {
map.setIn([id, 'translation'], fromJS(normalizeStatusTranslation(translation, map.get(id))));
map.setIn([id, 'translation'], fromJS(normalizeStatusTranslation(translation, map.get(id))).set('isLoading', false));
const list = map.getIn([id, 'media_attachments']);
if (translation.media_attachments && list) {
@@ -146,6 +147,8 @@ export default function statuses(state = initialState, action) {
return state.setIn([action.id, 'collapsed'], action.isCollapsed);
case timelineDelete.type:
return deleteStatus(state, action.payload.statusId, action.payload.references);
case STATUS_TRANSLATE_REQUEST:
return state.setIn([action.id, 'translation', 'isLoading'], true);
case STATUS_TRANSLATE_SUCCESS:
return statusTranslateSuccess(state, action.id, action.translation);
case STATUS_TRANSLATE_UNDO: