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

sync #60

Merged
merged 2 commits into from
Feb 3, 2024
Merged

sync #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54ea445
随缘更新
vlssu Dec 30, 2023
33c80be
更新 Laravel 框架验证规则 10.x 文档指向
vlssu Jan 24, 2024
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
5 changes: 2 additions & 3 deletions resources/scripts/api/server/files/compressFiles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ 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: '打包成压缩包可能需要一些时间，一旦完成，您将能够看到生成的压缩文件。',
},
);

return rawDataToFileObject(data);
Expand Down
5 changes: 2 additions & 3 deletions resources/scripts/api/server/files/decompressFiles.ts
View file
Open in desktop
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: '解压这个压缩包需要较长时间，一旦完成，您将能够看到解压后的文件。',
},
);
};
4 changes: 2 additions & 2 deletions resources/views/admin/eggs/variables.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<div class="form-group">
<label class="form-label">输入规则</label>
<input type="text" name="rules" class="form-control" value="{{ $variable->rules }}" />
<p class="text-muted small">这些规则是使用 <a href="https://laravel.com/docs/5.7/validation#available-validation-rules" target="_blank">Laravel 框架验证规则</a> 标准定义的.</p>
<p class="text-muted small">这些规则是使用 <a href="https://laravel.com/docs/10.x/validation#available-validation-rules" target="_blank">Laravel 框架验证规则</a> 标准定义的.</p>
</div>
</div>
<div class="box-footer">
Expand Down Expand Up @@ -129,7 +129,7 @@
<div class="form-group">
<label class="control-label">输入规则 <span class="field-required"></span></label>
<input type="text" name="rules" class="form-control" value="{{ old('rules', 'required|string|max:20') }}" placeholder="required|string|max:20" />
<p class="text-muted small">这些规则是使用 <a href="https://laravel.com/docs/5.7/validation#available-validation-rules" target="_blank">Laravel 框架验证规则</a> 标准定义的.</p>
<p class="text-muted small">这些规则是使用 <a href="https://laravel.com/docs/10.x/validation#available-validation-rules" target="_blank">Laravel 框架验证规则</a> 标准定义的.</p>
</div>
</div>
<div class="modal-footer">
Expand Down
Loading