BZ-1116104: Changed deletion confirm message literal

kiegroup · Dec 5, 2014 · d074276 · d074276
1 parent 760a83a
commit d074276
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 11 deletions.
diff --git a/...board-displayer-core/src/main/resources/org/jboss/dashboard/displayer/messages.properties b/...board-displayer-core/src/main/resources/org/jboss/dashboard/displayer/messages.properties
@@ -57,7 +57,7 @@ abstractChartDisplayer.range=Range (Y Axis)
 dataProviderComponent.error=Error
 dataProviderComponent.warning=Warning
 dataProviderComponent.cancel=Cancel
-dataProviderComponent.cannotDelete=Cannot delete the data provider because it is being used by {0} KPI(s)
+dataProviderComponent.cannotDelete=This data provider is used in {0} KPI(s). If you delete it, those KPIs will be deleted as well. Are you sure you want to proceed?
 dataProviderComponent.chooseDataProviderType=- Select type -
 dataProviderComponent.codeInvalid=Invalid code or code does exist
 dataProviderComponent.confirmDelete=Are you sure you want to delete this data provider?

diff --git a/...rd-displayer-core/src/main/resources/org/jboss/dashboard/displayer/messages_de.properties b/...rd-displayer-core/src/main/resources/org/jboss/dashboard/displayer/messages_de.properties
@@ -41,7 +41,7 @@ abstractChartDisplayer.range=Bereich (Y-Achse)
 dataProviderComponent.error=Fehler
 dataProviderComponent.warning=Warnung
 dataProviderComponent.cancel=Abbrechen
-dataProviderComponent.cannotDelete=Kann den Daten-Anbieter nicht löschen, da dieser von {0} KPI(s) verwendet wird
+dataProviderComponent.cannotDelete=Dieser Datenanbieter ist in {0} KPI (n) verwendet. Wenn Sie es löschen, werden diese Kennzahlen als auch gelöscht werden. Sind Sie sicher, dass Sie fortfahren möchten?
 dataProviderComponent.chooseDataProviderType=- Typ auswählen -
 dataProviderComponent.codeInvalid=Ungültiger Code oder Code existiert nicht
 dataProviderComponent.confirmDelete=Sind Sie sicher, dass Sie diesen Daten-Anbieter löschen möchten?

diff --git a/...rd-displayer-core/src/main/resources/org/jboss/dashboard/displayer/messages_es.properties b/...rd-displayer-core/src/main/resources/org/jboss/dashboard/displayer/messages_es.properties
@@ -55,7 +55,7 @@ abstractChartDisplayer.range=Rango (Eje Y)
 dataProviderComponent.error=Error
 dataProviderComponent.warning=Aviso
 dataProviderComponent.cancel=Cancelar
-dataProviderComponent.cannotDelete=No se puede borrar el proveedor de datos porque está siendo usado por {0} KPI(s)
+dataProviderComponent.cannotDelete=Este proveedor de datos se utiliza en {0} KPI (s). Si lo elimina, los KPIs se eliminarán también. ¿Seguro que desea continuar?
 dataProviderComponent.chooseDataProviderType=- Escoger tipo -
 dataProviderComponent.codeInvalid=Código inválido o ya existente en el sistema
 dataProviderComponent.confirmDelete=¿Seguro que desea eliminar este proveedor de datos?

diff --git a/...rd-displayer-core/src/main/resources/org/jboss/dashboard/displayer/messages_fr.properties b/...rd-displayer-core/src/main/resources/org/jboss/dashboard/displayer/messages_fr.properties
@@ -45,7 +45,7 @@ abstractChartDisplayer.range=Portée (Axe Y)
 dataProviderComponent.error=Erreur
 dataProviderComponent.warning=Avertissement
 dataProviderComponent.cancel=Annuler
-dataProviderComponent.cannotDelete=Impossible d'effacer le fournisseur de données car il est utilisé par {0} KPI(s)
+dataProviderComponent.cannotDelete=Ce fournisseur de données est utilisé dans {1} KPI (s). Si vous le supprimez, ces KPI seront supprimés. Etes-vous sûr de vouloir continuer?
 dataProviderComponent.chooseDataProviderType=- Sélectionner le type -
 dataProviderComponent.codeInvalid=Code non valide ou code non existant
 dataProviderComponent.confirmDelete=Êtes-vous certain de vouloir effacer ce fournisseur de données ?

diff --git a/...rd-displayer-core/src/main/resources/org/jboss/dashboard/displayer/messages_ja.properties b/...rd-displayer-core/src/main/resources/org/jboss/dashboard/displayer/messages_ja.properties
@@ -48,7 +48,7 @@ dataProviderComponent.cancel=キャンセル
 dataProviderComponent.cannotDelete={0} 個の KPI によって使用されているため、データプロバイダーを削除できません
 dataProviderComponent.chooseDataProviderType=- タイプの選択 -
 dataProviderComponent.codeInvalid=無効なコードまたは存在しないコード
-dataProviderComponent.confirmDelete=このデータプロバイダーを削除してもよろしいですか？
+dataProviderComponent.confirmDelete=このデータプロバイダは、{0} KPI（複数可）で使用されている。あなたがそれを削除すると、それらのKPIは、同様に削除されます。あなたが続行してもよろしいですか？
 dataProviderComponent.createNewDataProvider=新しいデータプロバイダーを作成
 dataProviderComponent.creatingDataProvider=新しいデータプロバイダーの作成
 dataProviderComponent.deleteDataProvider=データプロバイダーを削除

diff --git a/...rd-displayer-core/src/main/resources/org/jboss/dashboard/displayer/messages_pt.properties b/...rd-displayer-core/src/main/resources/org/jboss/dashboard/displayer/messages_pt.properties
@@ -41,7 +41,7 @@ abstractChartDisplayer.range=Intervalo (eixo Y)
 dataProviderComponent.error=Erro
 dataProviderComponent.warning=Aviso
 dataProviderComponent.cancel=Cancelar
-dataProviderComponent.cannotDelete=Não foi possível excluir o provedor de dados uma vez que ele está sendo usado por {0} KPI(s)
+dataProviderComponent.cannotDelete=Este provedor de dados é utilizado em {0} KPI (s). Se você apagá-lo, esses KPIs serão excluídos também. Tem certeza de que deseja continuar?
 dataProviderComponent.chooseDataProviderType=- Selecione o tipo -
 dataProviderComponent.codeInvalid=Código inválido ou código inexistente
 dataProviderComponent.confirmDelete=Você tem certeza que deseja excluir este provedor de dados?

diff --git a/...rd-displayer-core/src/main/resources/org/jboss/dashboard/displayer/messages_zh.properties b/...rd-displayer-core/src/main/resources/org/jboss/dashboard/displayer/messages_zh.properties
@@ -41,7 +41,7 @@ abstractChartDisplayer.range=范围（Y 轴）
 dataProviderComponent.error=错误
 dataProviderComponent.warning=警告
 dataProviderComponent.cancel=取消
-dataProviderComponent.cannotDelete=无法删除这个数据供应商，因为它正被{0} 个 KPI 使用。
+dataProviderComponent.cannotDelete=該數據提供者採用的是{0} KPI（S）。如果你刪除它，這些關鍵績效指標也將被刪除。你確定要繼續嗎？
 dataProviderComponent.chooseDataProviderType=- 选择类型 -
 dataProviderComponent.codeInvalid=无效代码或代码已存在
 dataProviderComponent.confirmDelete=你确定要删除这个数据供应商吗？

diff --git a/...hboard-ui-core/src/main/java/org/jboss/dashboard/ui/formatters/DataProviderFormatter.java b/...hboard-ui-core/src/main/java/org/jboss/dashboard/ui/formatters/DataProviderFormatter.java
@@ -307,7 +307,9 @@ private void renderRemove(HttpServletRequest httpServletRequest, HttpServletResp
                     String deleteMessage = i18n.getString(DataProviderHandler.I18N_PREFFIX + "cannotDelete");
                     deleteMessage = MessageFormat.format(deleteMessage, kpiCount);
                     setAttribute("message", deleteMessage);
-                    renderFragment("outputMessage");
+                    renderFragment("outputKPIMessage");
+                } else {
+                    renderFragment("outputNO_KPIMessage");
                 }
             }
 

diff --git a/...ashboard-ui-core/src/main/webapp/components/bam/provider/manager/data_provider_remove.jsp b/...ashboard-ui-core/src/main/webapp/components/bam/provider/manager/data_provider_remove.jsp
@@ -96,7 +96,7 @@
         </tr>
     </mvc:fragment>
 
-    <mvc:fragment name="outputMessage">
+    <mvc:fragment name="outputKPIMessage">
         <mvc:fragmentValue name="message" id="message">
             <tr style="height: 10px;">
                 <td>
@@ -110,13 +110,21 @@
             </tr>
         </mvc:fragmentValue>
     </mvc:fragment>
-
-    <mvc:fragment name="outputButtons">
+
+    <mvc:fragment name="outputNO_KPIMessage">
+        <tr style="height: 10px;">
+            <td>
+                &nbsp;
+            </td>
+        </tr>
         <tr>
             <td>
                 <i18n:message bundleRef="bundle"  key='<%=DataProviderHandler.I18N_PREFFIX + "confirmDelete"%>'>!!!Seguro que desea eliminar el proveedor de datos</i18n:message>
             </td>
         </tr>
+    </mvc:fragment>
+
+    <mvc:fragment name="outputButtons">
         <tr>
             <td width="100%" align="center" style="padding-top: 10px;">
                 <input class="skn-button" type="button" value="<i18n:message bundleRef="bundleUI" key='ui.admin.workarea.envelopes.delete'>!!!Borrar</i18n:message>"