opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-29 17:58:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10381 from ioito/automated-cherry-pick-of-#10380-upstream-release-3.7

Browse Source 
Automated cherry pick of #10380: fix: add bucket tooltip
This commit is contained in:
Zexi Li
2021-03-11 11:41:41 +08:00
committed by GitHub
parent 58c60516ea 0cb8100ad9
commit be52206d23
3 changed files with 3657 additions and 3530 deletions
Download Patch File Download Diff File Expand all files Collapse all files
locales/locales.go
+2734 -2703
View File
File diff suppressed because it is too large Load Diff
locales/zh-CN/messages.gotext.json
+922 -826
View File
File diff suppressed because it is too large Load Diff
pkg/compute/models/buckets.go
+1 -1
View File
@@ -1196,7 +1196,7 @@ func (bucket *SBucket) ValidateDeleteCondition(ctx context.Context) error {
return bucket.SSharableVirtualResourceBase.ValidateDeleteCondition(ctx)
}
if bucket.ObjectCnt > 0 {
return httperrors.NewNotEmptyError("not an empty bucket")
return httperrors.NewNotEmptyError("Buckets that are not empty do not support this operation")
}
return bucket.ValidatePurgeCondition(ctx)
}