From: Stas Vilchik <vilchiks@gmail.com>
Date: Fri, 11 Apr 2014 10:56:30 +0000 (+0600)
Subject: Update confirmation labels
X-Git-Tag: 4.3~45
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6edb8903b75cdf24ccc69a94701d2432fd8c6925;p=sonarqube.git

Update confirmation labels
---

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
index 2aedcd44299..3f3064a19e9 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -1644,7 +1644,6 @@ quality_gates.conditions=Conditions
 quality_gates.projects=Projects
 quality_gates.add_condition=Add Condition
 quality_gates.no_conditions=No Conditions
-quality_gates.delete_condition=Delete Condition
 quality_gates.introduction=Only project measures are checked against thresholds. Sub-projects, directories and files are ignored.
 quality_gates.health_icons=Project health icons represent:
 quality_gates.projects_for_default=Every project not specifically associated to a quality gate will be associated to this one by default.
@@ -1659,9 +1658,10 @@ quality_gates.operator.LT=is less than
 quality_gates.operator.GT=is greater than
 quality_gates.operator.EQ=equals
 quality_gates.operator.NE=is not
-quality_gates.delete.confirm.message=Are you sure that you want to delete the quality gate "{0}"?
-quality_gates.delete.confirm.default=Are you sure that you want to delete the quality gate "{0}", which is the default quality gate?
-quality_gates.delete_condition.confirm.message=Are you sure that you want to delete this condition?
+quality_gates.delete.confirm.message=Are you sure that you want to delete the "{0}" quality gate?
+quality_gates.delete.confirm.default=Are you sure that you want to delete the "{0}" quality gate, which is the default quality gate?
+quality_gates.delete_condition=Delete Condition
+quality_gates.delete_condition.confirm.message=Are you sure you want to delete the "{0}" condition?
 
 
 #------------------------------------------------------------------------------
diff --git a/sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-condition-view.coffee b/sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-condition-view.coffee
index 6535003e0fc..e73343ac80b 100644
--- a/sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-condition-view.coffee
+++ b/sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-condition-view.coffee
@@ -97,7 +97,9 @@ define [
     deleteCondition: ->
       confirmDialog
         title: t 'quality_gates.delete_condition'
-        html: t('quality_gates.delete_condition.confirm.message')
+        html: tp 'quality_gates.delete_condition.confirm.message', @model.get('metric').name
+        yesLabel: t 'delete'
+        noLabel: t 'cancel'
         yesHandler: =>
           @showSpinner()
           @model.delete().done =>
diff --git a/sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-header-view.coffee b/sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-header-view.coffee
index 24fbf33f657..5575f63b1b6 100644
--- a/sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-header-view.coffee
+++ b/sonar-server/src/main/coffee/quality-gate/views/quality-gate-detail-header-view.coffee
@@ -49,6 +49,8 @@ define [
       confirmDialog
         title: t 'quality_gates.delete'
         html: message
+        yesLabel: t 'delete'
+        noLabel: t 'cancel'
         yesHandler: =>
           @showSpinner()
           jQuery.ajax