Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
5a6581af09
1 changed files with 2 additions and 3 deletions
|
@ -1629,6 +1629,8 @@ func exportSYZip(boxID, rootDirPath, baseFolderName string, docPaths []string) (
|
|||
}
|
||||
|
||||
for _, asset := range assets {
|
||||
util.PushEndlessProgress(Conf.language(65) + " " + fmt.Sprintf(Conf.language(70), asset))
|
||||
|
||||
asset = string(html.DecodeDestination([]byte(asset)))
|
||||
if strings.Contains(asset, "?") {
|
||||
asset = asset[:strings.LastIndex(asset, "?")]
|
||||
|
@ -1662,9 +1664,6 @@ func exportSYZip(boxID, rootDirPath, baseFolderName string, docPaths []string) (
|
|||
}
|
||||
|
||||
copiedAssets.Add(asset)
|
||||
|
||||
msg := Conf.language(65) + " " + fmt.Sprintf(Conf.language(70), asset)
|
||||
util.PushEndlessProgress(msg)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue