improve code quality

14 files changed, 26 insertions, 30 deletions

diff --git a/server/sonar-web/src/main/js/apps/coding-rules/app.js b/server/sonar-web/src/main/js/apps/coding-rules/app.js
index 61089511594..feb040c3562 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/app.js
+++ b/server/sonar-web/src/main/js/apps/coding-rules/app.js
@@ -63,7 +63,7 @@ var App = new Marionette.Application(),
 App.manualRepository = function () {
   return {
     key: 'manual',
-    name: t('coding_rules.manual_rule'),
+    name: window.t('coding_rules.manual_rule'),
     language: 'none'
   };
 };
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/bulk-change-modal-view.js b/server/sonar-web/src/main/js/apps/coding-rules/bulk-change-modal-view.js
index d816c21c219..453aa8fd107 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/bulk-change-modal-view.js
+++ b/server/sonar-web/src/main/js/apps/coding-rules/bulk-change-modal-view.js
@@ -15,14 +15,14 @@ export default ModalFormView.extend({
   showSuccessMessage: function (profile, succeeded) {
     var profileBase = _.findWhere(this.options.app.qualityProfiles, { key: profile }),
         profileName = profileBase != null ? profileBase.name : profile,
-        message = tp('coding_rules.bulk_change.success', profileName, profileBase.language, succeeded);
+        message = window.tp('coding_rules.bulk_change.success', profileName, profileBase.language, succeeded);
     this.ui.messagesContainer.append('<div class="alert alert-success">' + message + '</div>');
   },
 
   showWarnMessage: function (profile, succeeded, failed) {
     var profileBase = _.findWhere(this.options.app.qualityProfiles, { key: profile }),
         profileName = profileBase != null ? profileBase.name : profile,
-        message = tp('coding_rules.bulk_change.warning', profileName, profileBase.language, succeeded, failed);
+        message = window.tp('coding_rules.bulk_change.warning', profileName, profileBase.language, succeeded, failed);
     this.ui.messagesContainer.append('<div class="alert alert-warning">' + message + '</div>');
   },
 
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/facets/active-severity-facet.js b/server/sonar-web/src/main/js/apps/coding-rules/facets/active-severity-facet.js
index 2062e292b99..2ab853c763a 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/facets/active-severity-facet.js
+++ b/server/sonar-web/src/main/js/apps/coding-rules/facets/active-severity-facet.js
@@ -26,7 +26,7 @@ export default BaseFacet.extend({
 
   forbid: function () {
     BaseFacet.prototype.forbid.apply(this, arguments);
-    this.$el.prop('title', t('coding_rules.filters.active_severity.inactive'));
+    this.$el.prop('title', window.t('coding_rules.filters.active_severity.inactive'));
   },
 
   allow: function () {
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/facets/custom-values-facet.js b/server/sonar-web/src/main/js/apps/coding-rules/facets/custom-values-facet.js
index 9b2e01ef70a..bf3739cf70c 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/facets/custom-values-facet.js
+++ b/server/sonar-web/src/main/js/apps/coding-rules/facets/custom-values-facet.js
@@ -22,17 +22,17 @@ export default BaseFacet.extend({
 
   prepareSearch: function () {
     this.$('.js-custom-value').select2({
-      placeholder: t('search_verb'),
+      placeholder: window.t('search_verb'),
       minimumInputLength: 1,
       allowClear: false,
       formatNoMatches: function () {
-        return t('select2.noMatches');
+        return window.t('select2.noMatches');
       },
       formatSearching: function () {
-        return t('select2.searching');
+        return window.t('select2.searching');
       },
       formatInputTooShort: function () {
-        return tp('select2.tooShort', 1);
+        return window.tp('select2.tooShort', 1);
       },
       width: '100%',
       ajax: this.prepareAjaxSearch()
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/facets/inheritance-facet.js b/server/sonar-web/src/main/js/apps/coding-rules/facets/inheritance-facet.js
index d72f47e4584..490498a13cb 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/facets/inheritance-facet.js
+++ b/server/sonar-web/src/main/js/apps/coding-rules/facets/inheritance-facet.js
@@ -30,7 +30,7 @@ export default BaseFacet.extend({
 
   forbid: function () {
     BaseFacet.prototype.forbid.apply(this, arguments);
-    this.$el.prop('title', t('coding_rules.filters.inheritance.inactive'));
+    this.$el.prop('title', window.t('coding_rules.filters.inheritance.inactive'));
   },
 
   allow: function () {
@@ -42,7 +42,7 @@ export default BaseFacet.extend({
     var values = ['NONE', 'INHERITED', 'OVERRIDES'];
     return values.map(function (key) {
       return {
-        label: t('coding_rules.filters.inheritance', key.toLowerCase()),
+        label: window.t('coding_rules.filters.inheritance', key.toLowerCase()),
         val: key
       };
     });
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/facets/status-facet.js b/server/sonar-web/src/main/js/apps/coding-rules/facets/status-facet.js
index 23b0e41e089..fa453552567 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/facets/status-facet.js
+++ b/server/sonar-web/src/main/js/apps/coding-rules/facets/status-facet.js
@@ -7,7 +7,7 @@ export default BaseFacet.extend({
   getValues: function () {
     var values = this.model.getValues();
     var x = values.map(function (value) {
-      return _.extend(value, { label: t('rules.status', value.val.toLowerCase()) });
+      return _.extend(value, { label: window.t('rules.status', value.val.toLowerCase()) });
     });
     return x;
   },
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/rule-details-view.js b/server/sonar-web/src/main/js/apps/coding-rules/rule-details-view.js
index f8dee5b02cd..87ae705c660 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/rule-details-view.js
+++ b/server/sonar-web/src/main/js/apps/coding-rules/rule-details-view.js
@@ -130,8 +130,8 @@ export default Marionette.LayoutView.extend({
     var that = this,
         ruleType = this.model.has('templateKey') ? 'custom' : 'manual';
     confirmDialog({
-      title: t('delete'),
-      html: tp('coding_rules.delete.' + ruleType + '.confirm', this.model.get('name')),
+      title: window.t('delete'),
+      html: window.tp('coding_rules.delete.' + ruleType + '.confirm', this.model.get('name')),
       yesHandler: function () {
         var url = baseUrl + '/api/rules/delete',
             options = { key: that.model.id };
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/rule/custom-rule-creation-view.js b/server/sonar-web/src/main/js/apps/coding-rules/rule/custom-rule-creation-view.js
index ff0da3c7803..b4712e1c15e 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/rule/custom-rule-creation-view.js
+++ b/server/sonar-web/src/main/js/apps/coding-rules/rule/custom-rule-creation-view.js
@@ -153,7 +153,7 @@ export default ModalFormView.extend({
     }).fail(function (jqXHR) {
       if (jqXHR.status === 409) {
         that.existingRule = jqXHR.responseJSON.rule;
-        that.showErrors([], [{ msg: t('coding_rules.reactivate.help') }]);
+        that.showErrors([], [{ msg: window.t('coding_rules.reactivate.help') }]);
         that.ui.customRuleCreationCreate.addClass('hidden');
         that.ui.customRuleCreationReactivate.removeClass('hidden');
       } else {
@@ -175,7 +175,7 @@ export default ModalFormView.extend({
     var statuses = ['READY', 'BETA', 'DEPRECATED'].map(function (status) {
       return {
         id: status,
-        text: t('rules.status', status.toLowerCase())
+        text: window.t('rules.status', status.toLowerCase())
       };
     });
 
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/rule/custom-rule-view.js b/server/sonar-web/src/main/js/apps/coding-rules/rule/custom-rule-view.js
index 6e7002ba587..791334b4a0f 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/rule/custom-rule-view.js
+++ b/server/sonar-web/src/main/js/apps/coding-rules/rule/custom-rule-view.js
@@ -19,8 +19,8 @@ export default Marionette.ItemView.extend({
   deleteRule: function () {
     var that = this;
     confirmDialog({
-      title: t('delete'),
-      html: t('are_you_sure'),
+      title: window.t('delete'),
+      html: window.t('are_you_sure'),
       yesHandler: function () {
         var url = baseUrl + '/api/rules/delete',
             options = { key: that.model.id };
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/rule/manual-rule-creation-view.js b/server/sonar-web/src/main/js/apps/coding-rules/rule/manual-rule-creation-view.js
index cb0869490d0..dab19f1fb13 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/rule/manual-rule-creation-view.js
+++ b/server/sonar-web/src/main/js/apps/coding-rules/rule/manual-rule-creation-view.js
@@ -99,7 +99,7 @@ export default ModalFormView.extend({
     }).fail(function (jqXHR) {
       if (jqXHR.status === 409) {
         that.existingRule = jqXHR.responseJSON.rule;
-        that.showErrors([], [{ msg: t('coding_rules.reactivate.help') }]);
+        that.showErrors([], [{ msg: window.t('coding_rules.reactivate.help') }]);
         that.ui.manualRuleCreationCreate.addClass('hidden');
         that.ui.manualRuleCreationReactivate.removeClass('hidden');
       } else {
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-description-view.js b/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-description-view.js
index c1a2bc458e5..9b88e3267ce 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-description-view.js
+++ b/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-description-view.js
@@ -64,7 +64,7 @@ export default Marionette.ItemView.extend({
   removeExtendedDescription: function () {
     var that = this;
     confirmDialog({
-      html: t('coding_rules.remove_extended_description.confirm'),
+      html: window.t('coding_rules.remove_extended_description.confirm'),
       yesHandler: function () {
         that.ui.extendDescriptionText.val('');
         that.submitExtendDescription();
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-profile-view.js b/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-profile-view.js
index 1c74fc9dd63..6139044cbf6 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-profile-view.js
+++ b/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-profile-view.js
@@ -50,8 +50,8 @@ export default Marionette.ItemView.extend({
     var that = this,
         ruleKey = this.options.rule.get('key');
     confirmDialog({
-      title: t('coding_rules.revert_to_parent_definition'),
-      html: tp('coding_rules.revert_to_parent_definition.confirm', this.getParent().name),
+      title: window.t('coding_rules.revert_to_parent_definition'),
+      html: window.tp('coding_rules.revert_to_parent_definition.confirm', this.getParent().name),
       yesHandler: function () {
         return $.ajax({
           type: 'POST',
@@ -72,8 +72,8 @@ export default Marionette.ItemView.extend({
     var that = this,
         ruleKey = this.options.rule.get('key');
     confirmDialog({
-      title: t('coding_rules.deactivate'),
-      html: tp('coding_rules.deactivate.confirm'),
+      title: window.t('coding_rules.deactivate'),
+      html: window.tp('coding_rules.deactivate.confirm'),
       yesHandler: function () {
         return $.ajax({
           type: 'POST',
@@ -137,5 +137,3 @@ export default Marionette.ItemView.extend({
     });
   }
 });
-
-
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/workspace-list-empty-view.js b/server/sonar-web/src/main/js/apps/coding-rules/workspace-list-empty-view.js
index 6563efc2e3a..5045ff3891d 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/workspace-list-empty-view.js
+++ b/server/sonar-web/src/main/js/apps/coding-rules/workspace-list-empty-view.js
@@ -4,8 +4,6 @@ export default Marionette.ItemView.extend({
   className: 'search-navigator-no-results',
 
   template: function () {
-    return t('coding_rules.no_results');
+    return window.t('coding_rules.no_results');
   }
 });
-
-
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/workspace-list-item-view.js b/server/sonar-web/src/main/js/apps/coding-rules/workspace-list-item-view.js
index 5897372020b..05e54964103 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/workspace-list-item-view.js
+++ b/server/sonar-web/src/main/js/apps/coding-rules/workspace-list-item-view.js
@@ -62,8 +62,8 @@ export default WorkspaceListItemView.extend(RuleFilterMixin).extend({
         ruleKey = this.model.get('key'),
         activation = this.model.get('activation');
     confirmDialog({
-      title: t('coding_rules.deactivate'),
-      html: tp('coding_rules.deactivate.confirm'),
+      title: window.t('coding_rules.deactivate'),
+      html: window.tp('coding_rules.deactivate.confirm'),
       yesHandler: function () {
         return $.ajax({
           type: 'POST',