SONAR-1829: Rename the term 'Priority' by 'Severity' in quality profiles

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/edit.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/edit.html.erb
index efa5b03e238d06ef74149dd6bb568c10bd742d5e..a156e45d7270900e34d5a205fd7794048c70b055 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/edit.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/edit.html.erb
@@ -31,7 +31,7 @@
     <td><input type="text" name="rule[name]" size="80" value="<%= h @rule.name -%>"></input></td>
   </tr>
   <tr>
-    <td width="1%" nowrap>Default priority:</td>
+    <td width="1%" nowrap>Default severity:</td>
     <td class="sep"> </td>
     <td>
       <select name="rule[priority]">

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/index.html.erb
index 0cc3d9380515091f4c3fdb0b86b4146cef2d8a5e..64e9e11abc99290b49b5e96e71c4ef4d4391ff66 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/index.html.erb
@@ -52,7 +52,7 @@
          <%= select_tag "plugins", options_for_select(@select_plugins, @plugins), :id => 'search_plugin', :multiple => true, :size => 6 %>
        </td>
        <td class="left" valign="top" width="1%" nowrap>
-         <span class="note">Priority</span><br/>
+         <span class="note">Severity</span><br/>
          <%= select_tag "priorities", options_for_select(@select_priority, @priorities), :id => 'search_priority', :multiple => true, :size => 6 %>
        </td>
        <td class="left" valign="top" width="1%" nowrap>
@@ -97,7 +97,7 @@
 <table class="data width100 marginbottom10" id="result_table">
   <thead>
     <tr>
-        <th class="left" nowrap>Active/Priority</th>
+        <th class="left" nowrap>Active/Severity</th>
         <th class="left">Name <span style="font-weight: normal">[<%= link_to_function("expand/collapse", "toggle_rules()") %>]</span></th>
         <th class="right">Plugin</th>
     </tr>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/new.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/new.html.erb
index 9eacb5dfcf6435e1c6f68874e684317b0ec2df13..7fd07ac3f0d468b6da6b96bfbf136ceb26247347 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/new.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/new.html.erb
@@ -17,7 +17,7 @@
     <td><input type="text" name="rule[name]" size="80"></input></td>
   </tr>
   <tr>
-    <td width="1%" nowrap>Default priority:</td>
+    <td width="1%" nowrap>Default severity:</td>
     <td class="sep"> </td>
     <td>
       <select name="rule[priority]">