From ca73612e3a3341062d9357c518211ae6286ca3f4 Mon Sep 17 00:00:00 2001 From: holan20180123 Date: Thu, 29 Jul 2021 14:04:34 +0800 Subject: [PATCH] * Fix bug #13825. --- module/tree/control.php | 1 + module/tree/lang/de.php | 1 + module/tree/lang/en.php | 1 + module/tree/lang/fr.php | 1 + module/tree/lang/vi.php | 1 + module/tree/lang/zh-cn.php | 1 + 6 files changed, 6 insertions(+) diff --git a/module/tree/control.php b/module/tree/control.php index e5d24f303f..df75195fa3 100644 --- a/module/tree/control.php +++ b/module/tree/control.php @@ -396,6 +396,7 @@ class tree extends control { $module = $this->tree->getByID($moduleID); $confirmLang = $this->lang->tree->confirmDelete; + if($module->type == 'doc') $confirmLang = $this->lang->tree->confirmDeleteMenu; if($module->type == 'line') $confirmLang = $this->lang->tree->confirmDeleteLine; if($module->type == 'host') $confirmLang = $this->lang->tree->confirmDeleteHost; if($module->type == 'feedback') $confirmLang = $this->lang->tree->confirmDelCategory; diff --git a/module/tree/lang/de.php b/module/tree/lang/de.php index 44d1c984a0..87be35fac9 100644 --- a/module/tree/lang/de.php +++ b/module/tree/lang/de.php @@ -37,6 +37,7 @@ $lang->tree->dragAndSort = "Ziehen und Sotieren"; $lang->tree->sort = "Sortieren"; $lang->tree->addChild = "Hinzufügen"; $lang->tree->confirmDelete = 'Do you want to delete this module and its child modules?'; +$lang->tree->confirmDeleteMenu = 'Do you want to delete this menu and its child menus?'; $lang->tree->confirmDelCategory = 'Möchten Sie diese Kategorie und ihre Kinderkategorien löschen?'; $lang->tree->confirmDeleteLine = "Do you want to delete this {$lang->productCommon} line?"; $lang->tree->confirmRoot = "Any changes to the {$lang->productCommon} will change the stories, bugs, cases of {$lang->productCommon} it belongs to, as well as the linkage of {$lang->executionCommon} and {$lang->productCommon}, which is dangerous. Do you want to change it?"; diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php index 504aeb7b7a..6c276c6abc 100644 --- a/module/tree/lang/en.php +++ b/module/tree/lang/en.php @@ -37,6 +37,7 @@ $lang->tree->dragAndSort = "Drag to order"; $lang->tree->sort = "Order"; $lang->tree->addChild = "Add Child Module"; $lang->tree->confirmDelete = 'Do you want to delete this module and its child modules?'; +$lang->tree->confirmDeleteMenu = 'Do you want to delete this menu and its child menus?'; $lang->tree->confirmDelCategory = 'Do you want to delete this category and its child categories?'; $lang->tree->confirmDeleteLine = "Do you want to delete this {$lang->productCommon} line?"; $lang->tree->confirmRoot = "Any changes to the {$lang->productCommon} will change the stories, bugs, cases of {$lang->productCommon} it belongs to, as well as the linkage of {$lang->executionCommon} and {$lang->productCommon}, which is dangerous. Do you want to change it?"; diff --git a/module/tree/lang/fr.php b/module/tree/lang/fr.php index 079ba1a056..327ac0fb43 100644 --- a/module/tree/lang/fr.php +++ b/module/tree/lang/fr.php @@ -37,6 +37,7 @@ $lang->tree->dragAndSort = "Faites glisser pour ordonner"; $lang->tree->sort = "Ordonnez"; $lang->tree->addChild = "Ajout Sous-Module"; $lang->tree->confirmDelete = 'Voulez-vous supprimer ce module et tous ses sous-modules ?'; +$lang->tree->confirmDeleteMenu = 'Do you want to delete this menu and its child menus?'; $lang->tree->confirmDelCategory = 'Voulez-vous supprimer cette catégorie et ses sous-catégories?'; $lang->tree->confirmDeleteLine = 'Voulez-vous supprimer cette ligne de produit ?'; $lang->tree->confirmRoot = "Les changements du {$lang->productCommon} vont impacter les stories, bugs, casTests du {$lang->productCommon} auquel ils appartiennent, ainsi que les associations de {$lang->executionCommon} et {$lang->productCommon}, ce qui est dangereux. Voulez-vous malgré tout effectuer le changement ?"; diff --git a/module/tree/lang/vi.php b/module/tree/lang/vi.php index 966243e7b1..f0900f94b3 100644 --- a/module/tree/lang/vi.php +++ b/module/tree/lang/vi.php @@ -37,6 +37,7 @@ $lang->tree->dragAndSort = "Drag để sắp xếp"; $lang->tree->sort = "Thứ tự"; $lang->tree->addChild = "Thêm Module con"; $lang->tree->confirmDelete = 'Bạn có muốn xóa module này và module con của nó?'; +$lang->tree->confirmDeleteMenu = 'Do you want to delete this menu and its child menus?'; $lang->tree->confirmDelCategory = 'Bạn có muốn xoá hạng mục này và loại con của nó không?'; $lang->tree->confirmDeleteLine = "Bạn có muốn xóa dòng {$lang->productCommon} này không?"; $lang->tree->confirmRoot = "Mọi sự thay đổi tới {$lang->productCommon} này sẽ thay đổi the câu chuyện, bugs, tình huống của {$lang->productCommon} nó sở hữu, cũng như liên kết của {$lang->executionCommon} và {$lang->productCommon}, điều này nguy hiểm. Bạn có muốn thay đổi nó?"; diff --git a/module/tree/lang/zh-cn.php b/module/tree/lang/zh-cn.php index 45e6fee09a..902bb3407f 100644 --- a/module/tree/lang/zh-cn.php +++ b/module/tree/lang/zh-cn.php @@ -37,6 +37,7 @@ $lang->tree->dragAndSort = "拖放排序"; $lang->tree->sort = "排序"; $lang->tree->addChild = "增加子模块"; $lang->tree->confirmDelete = '该模块及其子模块都会被删除，您确定删除吗？'; +$lang->tree->confirmDeleteMenu = '该目录及其子目录都会被删除，您确定删除吗？'; $lang->tree->confirmDelCategory = '该分类及其子分类都会被删除，您确定删除吗？'; $lang->tree->confirmDeleteLine = "您确定删除该{$lang->productCommon}线吗？"; $lang->tree->confirmRoot = "模块的所属{$lang->productCommon}修改，会关联修改该模块下的{$lang->SRCommon}、Bug、用例的所属{$lang->productCommon}，以及{$lang->executionCommon}和{$lang->productCommon}的关联关系。该操作比较危险，请谨慎操作。是否确认修改？";