Skip to content

Commit

Permalink
Merge branch '1.0-develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
vlssu committed Feb 3, 2024
2 parents 524af63 + 33c80be commit ef6983e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions resources/scripts/api/server/files/compressFiles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ export default async (uuid: string, directory: string, files: string[]): Promise
{ root: directory, files },
{
timeout: 60000,
timeoutErrorMessage:
'It looks like this archive is taking a long time to generate. It will appear once completed.',
timeoutErrorMessage: '打包成压缩包可能需要一些时间,一旦完成,您将能够看到生成的压缩文件。',
},
);

Expand Down
3 changes: 1 addition & 2 deletions resources/scripts/api/server/files/decompressFiles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ export default async (uuid: string, directory: string, file: string): Promise<vo
{ root: directory, file },
{
timeout: 300000,
timeoutErrorMessage:
'It looks like this archive is taking a long time to be unarchived. Once completed the unarchived files will appear.',
timeoutErrorMessage: '解压这个压缩包需要较长时间,一旦完成,您将能够看到解压后的文件。',
},
);
};

0 comments on commit ef6983e

Please sign in to comment.