From 1e2040a354fe5ef5bc14c19c0c058727634f7ddd Mon Sep 17 00:00:00 2001
From: zhangjiaping <zhangjiaping@kylinos.cn>
Date: Fri, 5 Feb 2021 11:09:16 +0800
Subject: [PATCH] fix(frontend): Button for question dialog is in English.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Description: 修复删除黑名单询问弹窗按钮未汉化的Bug

Log: 修复删除黑名单询问弹窗按钮未汉化的Bug
Bug: http://172.17.66.192/biz/bug-view-38128.html
---
 src/settings-widget.cpp           |  6 +++--
 translations/ukui-search/bo.ts    | 40 +++++++++++++++++++------------
 translations/ukui-search/tr.ts    | 40 +++++++++++++++++++------------
 translations/ukui-search/zh_CN.ts | 40 +++++++++++++++++++------------
 4 files changed, 79 insertions(+), 47 deletions(-)

diff --git a/src/settings-widget.cpp b/src/settings-widget.cpp
index e8f63cb..69624a3 100644
--- a/src/settings-widget.cpp
+++ b/src/settings-widget.cpp
@@ -264,9 +264,11 @@ void SettingsWidget::refreshIndexState()
  * @param path 文件夹路径
  */
 void SettingsWidget::onBtnDelClicked(const QString& path) {
-    QMessageBox message(QMessageBox::Question, tr("Search"), tr("Whether to delete this directory?"), QMessageBox::No | QMessageBox::Yes, this);
+    QMessageBox message(QMessageBox::Question, tr("Search"), tr("Whether to delete this directory?"));
+    QPushButton * buttonYes = message.addButton(tr("Yes"), QMessageBox::YesRole);
+    QPushButton * buttonNo = message.addButton(tr("No"), QMessageBox::NoRole);
     message.exec();
-    if (message.clickedButton() != message.button(QMessageBox::Yes)) {
+    if (message.clickedButton() != buttonYes) {
         return;
     }
 
diff --git a/translations/ukui-search/bo.ts b/translations/ukui-search/bo.ts
index f1a08ef..0fc759c 100644
--- a/translations/ukui-search/bo.ts
+++ b/translations/ukui-search/bo.ts
@@ -152,7 +152,7 @@
     <message>
         <location filename="../../src/settings-widget.cpp" line="69"/>
         <location filename="../../src/settings-widget.cpp" line="267"/>
-        <location filename="../../src/settings-widget.cpp" line="468"/>
+        <location filename="../../src/settings-widget.cpp" line="470"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -193,12 +193,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="357"/>
+        <location filename="../../src/settings-widget.cpp" line="359"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="296"/>
+        <location filename="../../src/settings-widget.cpp" line="298"/>
         <source>Creating ...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -233,62 +233,72 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="299"/>
+        <location filename="../../src/settings-widget.cpp" line="268"/>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settings-widget.cpp" line="269"/>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settings-widget.cpp" line="301"/>
         <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="307"/>
+        <location filename="../../src/settings-widget.cpp" line="309"/>
         <source>Index Entry: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="351"/>
+        <location filename="../../src/settings-widget.cpp" line="353"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="352"/>
+        <location filename="../../src/settings-widget.cpp" line="354"/>
         <source>select blocked folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="353"/>
+        <location filename="../../src/settings-widget.cpp" line="355"/>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="354"/>
+        <location filename="../../src/settings-widget.cpp" line="356"/>
         <source>Position: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="355"/>
+        <location filename="../../src/settings-widget.cpp" line="357"/>
         <source>FileName: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="356"/>
+        <location filename="../../src/settings-widget.cpp" line="358"/>
         <source>FileType: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="452"/>
+        <location filename="../../src/settings-widget.cpp" line="454"/>
         <source>Choosen path is Empty!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="456"/>
+        <location filename="../../src/settings-widget.cpp" line="458"/>
         <source>Choosen path is not in &quot;home&quot;!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="460"/>
+        <location filename="../../src/settings-widget.cpp" line="462"/>
         <source>Its&apos; parent folder has been blocked!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="464"/>
+        <location filename="../../src/settings-widget.cpp" line="466"/>
         <source>Set blocked folder failed!</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/ukui-search/tr.ts b/translations/ukui-search/tr.ts
index f1a08ef..0fc759c 100644
--- a/translations/ukui-search/tr.ts
+++ b/translations/ukui-search/tr.ts
@@ -152,7 +152,7 @@
     <message>
         <location filename="../../src/settings-widget.cpp" line="69"/>
         <location filename="../../src/settings-widget.cpp" line="267"/>
-        <location filename="../../src/settings-widget.cpp" line="468"/>
+        <location filename="../../src/settings-widget.cpp" line="470"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -193,12 +193,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="357"/>
+        <location filename="../../src/settings-widget.cpp" line="359"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="296"/>
+        <location filename="../../src/settings-widget.cpp" line="298"/>
         <source>Creating ...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -233,62 +233,72 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="299"/>
+        <location filename="../../src/settings-widget.cpp" line="268"/>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settings-widget.cpp" line="269"/>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settings-widget.cpp" line="301"/>
         <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="307"/>
+        <location filename="../../src/settings-widget.cpp" line="309"/>
         <source>Index Entry: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="351"/>
+        <location filename="../../src/settings-widget.cpp" line="353"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="352"/>
+        <location filename="../../src/settings-widget.cpp" line="354"/>
         <source>select blocked folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="353"/>
+        <location filename="../../src/settings-widget.cpp" line="355"/>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="354"/>
+        <location filename="../../src/settings-widget.cpp" line="356"/>
         <source>Position: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="355"/>
+        <location filename="../../src/settings-widget.cpp" line="357"/>
         <source>FileName: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="356"/>
+        <location filename="../../src/settings-widget.cpp" line="358"/>
         <source>FileType: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="452"/>
+        <location filename="../../src/settings-widget.cpp" line="454"/>
         <source>Choosen path is Empty!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="456"/>
+        <location filename="../../src/settings-widget.cpp" line="458"/>
         <source>Choosen path is not in &quot;home&quot;!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="460"/>
+        <location filename="../../src/settings-widget.cpp" line="462"/>
         <source>Its&apos; parent folder has been blocked!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="464"/>
+        <location filename="../../src/settings-widget.cpp" line="466"/>
         <source>Set blocked folder failed!</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/ukui-search/zh_CN.ts b/translations/ukui-search/zh_CN.ts
index 38100d3..b8f85eb 100644
--- a/translations/ukui-search/zh_CN.ts
+++ b/translations/ukui-search/zh_CN.ts
@@ -152,7 +152,7 @@
     <message>
         <location filename="../../src/settings-widget.cpp" line="69"/>
         <location filename="../../src/settings-widget.cpp" line="267"/>
-        <location filename="../../src/settings-widget.cpp" line="468"/>
+        <location filename="../../src/settings-widget.cpp" line="470"/>
         <source>Search</source>
         <translation>搜索</translation>
     </message>
@@ -218,32 +218,42 @@
         <translation>是否要删除此目录</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="357"/>
+        <location filename="../../src/settings-widget.cpp" line="268"/>
+        <source>Yes</source>
+        <translation>是(Y)</translation>
+    </message>
+    <message>
+        <location filename="../../src/settings-widget.cpp" line="269"/>
+        <source>No</source>
+        <translation>否(N)</translation>
+    </message>
+    <message>
+        <location filename="../../src/settings-widget.cpp" line="359"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="452"/>
+        <location filename="../../src/settings-widget.cpp" line="454"/>
         <source>Choosen path is Empty!</source>
         <translation>选择的路径不存在！</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="456"/>
+        <location filename="../../src/settings-widget.cpp" line="458"/>
         <source>Choosen path is not in &quot;home&quot;!</source>
         <translation>请选择家目录下的文件夹！</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="460"/>
+        <location filename="../../src/settings-widget.cpp" line="462"/>
         <source>Its&apos; parent folder has been blocked!</source>
         <translation>父文件夹已被屏蔽！</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="464"/>
+        <location filename="../../src/settings-widget.cpp" line="466"/>
         <source>Set blocked folder failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="296"/>
+        <location filename="../../src/settings-widget.cpp" line="298"/>
         <source>Creating ...</source>
         <translation>正在索引</translation>
     </message>
@@ -253,42 +263,42 @@
         <translation>搜索</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="299"/>
+        <location filename="../../src/settings-widget.cpp" line="301"/>
         <source>Done</source>
         <translation>索引完成</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="307"/>
+        <location filename="../../src/settings-widget.cpp" line="309"/>
         <source>Index Entry: %1</source>
         <translation>索引项: %1</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="351"/>
+        <location filename="../../src/settings-widget.cpp" line="353"/>
         <source>Directories</source>
         <translation>文件夹</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="352"/>
+        <location filename="../../src/settings-widget.cpp" line="354"/>
         <source>select blocked folder</source>
         <translation>选择屏蔽文件夹</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="353"/>
+        <location filename="../../src/settings-widget.cpp" line="355"/>
         <source>Select</source>
         <translation>选择</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="354"/>
+        <location filename="../../src/settings-widget.cpp" line="356"/>
         <source>Position: </source>
         <translation>位置：</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="355"/>
+        <location filename="../../src/settings-widget.cpp" line="357"/>
         <source>FileName: </source>
         <translation>名称：</translation>
     </message>
     <message>
-        <location filename="../../src/settings-widget.cpp" line="356"/>
+        <location filename="../../src/settings-widget.cpp" line="358"/>
         <source>FileType: </source>
         <translation>类型：</translation>
     </message>