Improve labels of filter wizard

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 6c6f94d43bb1707b39f05d62f6703a50da4162d2..e25d3ddb315ece9d24d091b3c256de857b530042 100644 (file)
--- 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
@@ -383,9 +383,9 @@ filters.advanced_search=Advanced search
 filters.default_period=Differential period
 filters.when_no_language_no_filter_apply=When no language is selected, no filter will apply
 filters.favourite_only=Favourites only
-filters.resource_key_like=Resource key like
-filters.use_star_to_match=Use '*' to match zero or more characters and '?' to match any single character.
-filters.resource_name_like=Resource name like
+filters.key_like=Key like
+filters.use_star_to_match=Use * to match zero or more characters and ? to match any single character.
+filters.name_contains=Name contains
 filters.do_you_want_to_delete=Do you want to delete this filter ?
 filters.during_last=During last
 filters.prior_to_last=Prior to last

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/filters/new.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/filters/new.html.erb
index 7dc8a4e50e25c0015dc0ede207e7a6fa588b3d0b..de825e1e59e636c2e4b77402bce9dfe624a09004 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/filters/new.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/filters/new.html.erb
@@ -123,7 +123,7 @@
         </td>
       </tr>
       <tr>
-        <td class="keyCell"><label for="key_regexp"><%= message('filters.resource_key_like') -%>:</label></td>
+        <td class="keyCell"><label for="key_regexp"><%= message('filters.key_like') -%>:</label></td>
         <td>
           <% key_regexp_criterion=@filter.criterion('key') %>
           <input type="text" name="key_regexp" id="key_regexp" value="<%= key_regexp_criterion.text_value if key_regexp_criterion -%>"/>
@@ -131,7 +131,7 @@
         </td>
       </tr>
       <tr>
-        <td class="keyCell"><label for="name_regexp"><%= message('filters.resource_name_like') -%>:</label></td>
+        <td class="keyCell"><label for="name_regexp"><%= message('filters.name_contains') -%>:</label></td>
         <td>
           <% name_regexp_criterion=@filter.criterion('name') %>
           <input type="text" name="name_regexp" id="name_regexp" value="<%= name_regexp_criterion.text_value if name_regexp_criterion -%>"/>