Automatic merge from branch-5.2

* origin/branch-5.2:
  fix reset of TreeRootHolderRule + reduce duplication
  reduce polling time of Compute Engine scheduler from 10s to 2
  add name to thread used by NotificationService
  fix duplicated SqlSessionFactory in memory
  minor fix in MutableAnalysisMetadataHolder#setAnalysisDate javadoc
  do not reload profile details when selecting a project, fix tooltips
  improve readability of language selection on the profiles page
  fix capitalization inconsistency of the notification dispatcher names
  fix error in JsonWriter usage description in javadoc of WebService

2 files changed, 11 insertions, 4 deletions

diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/profile-details-view.js b/server/sonar-web/src/main/js/apps/quality-profiles/profile-details-view.js
index 7ea7ef2dc96..b5f9167033d 100644
--- a/server/sonar-web/src/main/js/apps/quality-profiles/profile-details-view.js
+++ b/server/sonar-web/src/main/js/apps/quality-profiles/profile-details-view.js
@@ -17,7 +17,7 @@ export default Marionette.LayoutView.extend({
   },
 
   modelEvents: {
-    'change': 'render',
+    'change': 'onChange',
     'flashChangelog': 'flashChangelog'
   },
 
@@ -47,6 +47,13 @@ export default Marionette.LayoutView.extend({
         });
   },
 
+  onChange: function () {
+    var changed = Object.keys(this.model.changedAttributes());
+    if (!(changed.length === 1 && changed[0] === 'projectCount')) {
+      this.render();
+    }
+  },
+
   initProjectsSelect: function () {
     var key = this.model.get('key');
     this.projectsSelectList = new window.SelectList({
@@ -73,8 +80,8 @@ export default Marionette.LayoutView.extend({
         noResults: t('quality_gates.projects.noResults')
       },
       tooltips: {
-        select: t('quality_gates.projects.select_hint'),
-        deselect: t('quality_gates.projects.deselect_hint')
+        select: t('quality_profiles.projects.select_hint'),
+        deselect: t('quality_profiles.projects.deselect_hint')
       }
     });
     this.listenTo(this.projectsSelectList.collection, 'change:selected', this.onProjectsChange);
diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/templates/quality-profiles-actions.hbs b/server/sonar-web/src/main/js/apps/quality-profiles/templates/quality-profiles-actions.hbs
index 17700533484..672a7a6ec17 100644
--- a/server/sonar-web/src/main/js/apps/quality-profiles/templates/quality-profiles-actions.hbs
+++ b/server/sonar-web/src/main/js/apps/quality-profiles/templates/quality-profiles-actions.hbs
@@ -34,7 +34,7 @@
   <ul class="dropdown-menu">
     <li><a class="js-filter-by-language" href="#">{{t 'quality_profiles.all_profiles'}}</a></li>
     {{#each languages}}
-      <li><a class="js-filter-by-language" href="#" data-language="{{key}}">{{tp 'quality_profiles.x_profiles' name}}</a></li>
+      <li><a class="js-filter-by-language" href="#" data-language="{{key}}">{{name}}</a></li>
     {{/each}}
   </ul>
 </div>