chore

kokonect-link · Jan 1, 2025 · 4d60782 · 4d60782
1 parent 24b3750
commit 4d60782
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 12 deletions.
diff --git a/compose.local-db.yml b/compose.local-db.yml
@@ -40,7 +40,7 @@ services:
 
 #  translator:
 #    restart: always
-#    image:  libretranslate/libretranslate:latest
+#    image: libretranslate/libretranslate:latest
 #    healthcheck:
 #    test: ['CMD-SHELL', './venv/bin/python scripts/healthcheck.py']
 
diff --git a/compose_example.yml b/compose_example.yml
@@ -94,7 +94,7 @@ services:
 
 #  translator:
 #    restart: always
-#    image:  libretranslate/libretranslate:latest
+#    image: libretranslate/libretranslate:latest
 #    healthcheck:
 #    test: ['CMD-SHELL', './venv/bin/python scripts/healthcheck.py']
 

diff --git a/locales/en-US.yml b/locales/en-US.yml
@@ -3170,7 +3170,6 @@ _scheduledNoteDelete:
 _getQRCode:
   title: "Scan QR Code"
   description: "Can scan or share the QR code below."
-
 _searchSite:
   title: "Search Engine"
   description: "Change search engine that used in search MFM."

diff --git a/packages/backend/src/core/activitypub/ApResolverService.ts b/packages/backend/src/core/activitypub/ApResolverService.ts
@@ -15,12 +15,12 @@ import { UtilityService } from '@/core/UtilityService.js';
 import { bindThis } from '@/decorators.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import type Logger from '@/logger.js';
+import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { isCollectionOrOrderedCollection } from './type.js';
 import { ApDbResolverService } from './ApDbResolverService.js';
 import { ApRendererService } from './ApRendererService.js';
 import { ApRequestService } from './ApRequestService.js';
 import type { IObject, ICollection, IOrderedCollection } from './type.js';
-import { IdentifiableError } from '@/misc/identifiable-error.js';
 
 export class Resolver {
 	private history: Set<string>;

diff --git a/packages/backend/src/models/Meta.ts b/packages/backend/src/models/Meta.ts
@@ -393,25 +393,25 @@ export class MiMeta {
 		length: 1024,
 		nullable: true,
 	})
-	public libreTranslateEndPoint: string | null;
+	public ctav3Model: string | null;
 
 	@Column('varchar', {
 		length: 1024,
 		nullable: true,
 	})
-	public libreTranslateApiKey: string | null;
+	public ctav3Glossary: string | null;
 
 	@Column('varchar', {
 		length: 1024,
 		nullable: true,
 	})
-	public ctav3Model: string | null;
+	public libreTranslateEndPoint: string | null;
 
 	@Column('varchar', {
 		length: 1024,
 		nullable: true,
 	})
-	public ctav3Glossary: string | null;
+	public libreTranslateApiKey: string | null;
 
 	@Column('varchar', {
 		length: 1024,

diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts
@@ -771,13 +771,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				remoteObjectStorageS3ForcePathStyle: instance.remoteObjectStorageS3ForcePathStyle,
 				deeplAuthKey: instance.deeplAuthKey,
 				deeplIsPro: instance.deeplIsPro,
-				libreTranslateEndPoint: instance.libreTranslateEndPoint,
-				libreTranslateApiKey: instance.libreTranslateApiKey,
 				ctav3SaKey: instance.ctav3SaKey,
 				ctav3ProjectId: instance.ctav3ProjectId,
 				ctav3Location: instance.ctav3Location,
 				ctav3Model: instance.ctav3Model,
 				ctav3Glossary: instance.ctav3Glossary,
+				libreTranslateEndPoint: instance.libreTranslateEndPoint,
+				libreTranslateApiKey: instance.libreTranslateApiKey,
 				enableIpLogging: instance.enableIpLogging,
 				enableActiveEmailValidation: instance.enableActiveEmailValidation,
 				enableVerifymailApi: instance.enableVerifymailApi,

diff --git a/packages/backend/src/server/api/endpoints/ap/show.ts b/packages/backend/src/server/api/endpoints/ap/show.ts
@@ -18,8 +18,8 @@ import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { bindThis } from '@/decorators.js';
-import { ApiError } from '../../error.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
+import { ApiError } from '../../error.js';
 
 export const meta = {
 	tags: ['federation'],

diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
@@ -201,6 +201,7 @@ import FormLink from '@/components/form/link.vue';
 import MkLink from '@/components/MkLink.vue';
 import MkInfo from '@/components/MkInfo.vue';
 import MkTextarea from '@/components/MkTextarea.vue';
+import MkInput from '@/components/MkInput.vue';
 import { defaultStore } from '@/store.js';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
@@ -210,7 +211,6 @@ import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { miLocalStorage } from '@/local-storage.js';
 import { globalEvents } from '@/events.js';
 import { $i } from '@/account.js';
-import MkInput from '@/components/MkInput.vue';
 
 const lang = ref(miLocalStorage.getItem('lang'));
 const dataSaver = ref(defaultStore.state.dataSaver);