SONAR-7070 Update leak label in quality gate management

diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/AppAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/AppAction.java
index 50123dd2e02e626a214e685e3b3009d93d71cf23..fcbed4cfc726a3eba23dc2aedfe4c049559eda1b 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/AppAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/AppAction.java
@@ -28,8 +28,6 @@ import org.sonar.api.utils.text.JsonWriter;
 import org.sonar.core.timemachine.Periods;
 import org.sonar.server.qualitygate.QualityGates;
 
-import static java.lang.String.format;
-
 public class AppAction implements QGateWsAction {
 
   private final QualityGates qualityGates;
@@ -64,11 +62,11 @@ public class AppAction implements QGateWsAction {
     writer.prop("edit", qualityGates.currentUserHasWritePermission());
   }
 
-  private void addPeriods(JsonWriter writer) {
+  private static void addPeriods(JsonWriter writer) {
     writer.name("periods").beginArray();
     writer.beginObject()
       .prop("key", 1L)
-      .prop("text", format("over Leak Period (%s)", periods.label(1)))
+      .prop("text", "Leak")
       .endObject();
     writer.endArray();
   }

diff --git a/server/sonar-web/src/main/js/apps/quality-gates/templates/quality-gate-detail-condition.hbs b/server/sonar-web/src/main/js/apps/quality-gates/templates/quality-gate-detail-condition.hbs
index b48a4b948cd9338bd51f45953f5e63aceb4cd9ff..206b7ceb283bf44844b1b169667882227a678949 100644 (file)
--- a/server/sonar-web/src/main/js/apps/quality-gates/templates/quality-gate-detail-condition.hbs
+++ b/server/sonar-web/src/main/js/apps/quality-gates/templates/quality-gate-detail-condition.hbs
@@ -12,11 +12,11 @@
         <option value="0" {{#eq period 0}}selected{{/eq}}>{{t 'value'}}</option>
       {{/unless}}
       {{#each periods}}
-        <option value="{{key}}" {{#eq key ../period}}selected{{/eq}}>&Delta; {{text}}</option>
+        <option value="{{key}}" {{#eq key ../period}}selected{{/eq}}>{{text}}</option>
       {{/each}}
     </select>
   {{else}}
-    &Delta; {{periodText}}
+    {{periodText}}
   {{/if}}
 </td>