I18n of issues and measure filters

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 bee71e463c12cc4ab73fa1e26ce60216d38558e7..9b2a8dc8f36f0008ed40199232eadd45a1d83f0b 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
@@ -85,7 +85,6 @@ me=Me
 min=Min
 minor=Minor
 more_actions=More actions
-more_criteria=More Criteria
 name=Name
 name_too_long_x=Name is too long (maximum is {0} characters)
 none=None
@@ -424,12 +423,15 @@ measure_filter.shared_with_all_users=Shared with all users
 measure_filter.private=Private
 measure_filter.manage.shared_filters=Shared Measures Filters
 measure_filter.manage.my_filters=My Measures Filters
-measure_filter.criteria.what=Components
+measure_filter.criteria.what=What? Projects, files...
+measure_filter.criteria.components=Components
 measure_filter.criteria.age=Age
 measure_filter.criteria.date=Date
-measure_filter.criteria.only_favorites=Favorites only
-measure_filter.criteria.key=Key contains
-measure_filter.criteria.name=Name contains
+measure_filter.criteria.only_favourites=Favourites only
+measure_filter.criteria.key=Key
+measure_filter.criteria.name=Name
+measure_filter.criteria.key_contains=Key contains
+measure_filter.criteria.name_contains=Name contains
 measure_filter.criteria.language=Language
 measure_filter.criteria.metric=Metric
 measure_filter.criteria.project=Project
@@ -448,9 +450,10 @@ measure_filter.criteria.components_of=Components of
 measure_filter.criteria.components_of_project=Components of project
 measure_filter.new_search=New search
 measure_filter.favourite_filters=Favourite Filters
-measure_filter.more_criteria=More Criteria
+measure_filter.more_criteria=+ More Criteria
 measure_filter.languages=Languages
 measure_filter.alert_levels=Alert levels
+measure_filter.filter_list=Measures Filters
 measure_filter.col.date=Last Analysis
 measure_filter.col.description=Description
 measure_filter.col.key=Key
@@ -581,6 +584,7 @@ issue_filter.criteria.reporter=Reporter
 issue_filter.criteria.resolution=Resolution
 issue_filter.criteria.severity=Severity
 issue_filter.criteria.status=Status
+issue_filter.filter_list=Issues Filters
 issue_filter.max_results_reached=Only the first {0} issues matching the search criteria have been retrieved. Add some additional criteria to get fewer results to be able to sort this list.
 issue_filter.widget.max_results_reached=Only the first {0} issues matching the search criteria have been retrieved.
 issue_filter.no_result=No matching issues found.
@@ -592,6 +596,7 @@ issue_filter.form.name=Name
 issue_filter.form.description=Description
 issue_filter.form.share=Shared with all users
 issue_filter.form.owner=Owner
+issue_filter.more_criteria=+ More Criteria
 issue_filter.favourite_filters=Favourite Filters
 issue_filter.manage.my_filters=My Issues Filters
 issue_filter.manage.shared_filters=Shared Issues Filters

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
index be9aa6eb36bd41eeca12a76c880fc2adc6818d09..5e76ae28b09206c456d2f1c52a72c397950d6ded 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
@@ -54,35 +54,38 @@
       'any':           '<%= escape_javascript message('any') -%>',
       'anytime':       '<%= escape_javascript message('anytime') -%>',
       'all':           '<%= escape_javascript message('all') -%>',
+      'manage':        '<%= escape_javascript message('manage') -%>',
+      'to':            '<%= escape_javascript message('to') -%>',
       'project':       '<%= escape_javascript message('issue_filter.criteria.project') -%>',
       'severity':      '<%= escape_javascript message('issue_filter.criteria.severity') -%>',
       'severities': {
-        blocker:       '<%= escape_javascript message('blocker') -%>',
-        critical:      '<%= escape_javascript message('critical') -%>',
-        major:         '<%= escape_javascript message('major') -%>',
-        minor:         '<%= escape_javascript message('minor') -%>',
-        info:          '<%= escape_javascript message('info') -%>',
+        blocker:       '<%= escape_javascript message('severity.BLOCKER') -%>',
+        critical:      '<%= escape_javascript message('severity.CRITICAL') -%>',
+        major:         '<%= escape_javascript message('severity.MAJOR') -%>',
+        minor:         '<%= escape_javascript message('severity.MINOR') -%>',
+        info:          '<%= escape_javascript message('severity.INFO') -%>'
       },
       'status':        '<%= escape_javascript message('issue_filter.criteria.status') -%>',
       'statuses': {
-        open:          '<%= escape_javascript message('open') -%>',
-        confirmed:     'Confirmed',
-        reopened:      'Reopened',
-        resolved:      'Resolved',
-        closed:        '<%= escape_javascript message('closed') -%>',
+        open:          '<%= escape_javascript message('issue.status.OPEN') -%>',
+        confirmed:     '<%= escape_javascript message('issue.status.CONFIRMED') -%>',
+        reopened:      '<%= escape_javascript message('issue.status.REOPENED') -%>',
+        resolved:      '<%= escape_javascript message('issue.status.RESOLVED') -%>',
+        closed:        '<%= escape_javascript message('issue.status.CLOSED') -%>'
       },
       assignee:        '<%= escape_javascript message('issue_filter.criteria.assignee') -%>',
       resolution:      '<%= escape_javascript message('issue_filter.criteria.resolution') -%>',
       resolutions: {
-        falsePositive: 'False positive',
-        fixed:         'Fixed',
-        removed:       'Removed'
+        falsePositive: '<%= escape_javascript message('issue.resolution.FALSE-POSITIVE') -%>',
+        fixed:         '<%= escape_javascript message('issue.resolution.FIXED') -%>',
+        removed:       '<%= escape_javascript message('issue.resolution.REMOVED') -%>'
       },
       reporter:        '<%= escape_javascript message('issue_filter.criteria.reporter') -%>',
       created:         '<%= escape_javascript message('issue_filter.criteria.created') -%>',
 
-      moreCriteria:    '<%= escape_javascript message('more_criteria') -%>',
-      unassigned:      '<%= escape_javascript message('unassigned') -%>'
+      moreCriteria:    '<%= escape_javascript message('issue_filter.more_criteria') -%>',
+      unassigned:      '<%= escape_javascript message('unassigned') -%>',
+      filtersList:     '<%= escape_javascript message('issue_filter.filter_list') -%>'
     }
   });
 

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb
index c76207b4926d13734c6549e833c7cf0e97901395..b41fd289ed608244fe2a2a6e06d786e6d9fd04a1 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb
@@ -64,21 +64,25 @@
       'any':            '<%= escape_javascript message('any') -%>',
       'anytime':        '<%= escape_javascript message('anytime') -%>',
       'all':            '<%= escape_javascript message('all') -%>',
-      'components':     '<%= escape_javascript message('measure_filter.criteria.what') -%>',
+      'manage':         '<%= escape_javascript message('manage') -%>',
+      'to':             '<%= escape_javascript message('to') -%>',
+      'value':          '<%= escape_javascript message('value') -%>',
+      'components':     '<%= escape_javascript message('measure_filter.criteria.components') -%>',
       'age':            '<%= escape_javascript message('measure_filter.criteria.age') -%>',
       'alert':          '<%= escape_javascript message('measure_filter.criteria.alert') -%>',
       'componentsOf':   '<%= escape_javascript message('measure_filter.criteria.components_of') -%>',
       'date':           '<%= escape_javascript message('measure_filter.criteria.date') -%>',
-      'favoritesOnly':  '<%= escape_javascript message('measure_filter.criteria.only_favorites') -%>',
-      'keyContains':    '<%= escape_javascript message('measure_filter.criteria.key') -%>',
+      'favoritesOnly':  '<%= escape_javascript message('measure_filter.criteria.only_favourites') -%>',
+      'keyContains':    '<%= escape_javascript message('measure_filter.criteria.key_contains') -%>',
       'language':       '<%= escape_javascript message('measure_filter.criteria.language') -%>',
       'metric':         '<%= escape_javascript message('measure_filter.criteria.metric') -%>',
-      'nameContains':   '<%= escape_javascript message('measure_filter.criteria.name') -%>',
-      'moreCriteria':   '<%= escape_javascript message('more_criteria') -%>',
+      'nameContains':   '<%= escape_javascript message('measure_filter.criteria.name_contains') -%>',
+      'moreCriteria':   '<%= escape_javascript message('measure_filter.more_criteria') -%>',
       'error':          '<%= escape_javascript message('measure_filter.criteria.alert.error') -%>',
       'warning':        '<%= escape_javascript message('measure_filter.criteria.alert.warn') -%>',
       'ok':             '<%= escape_javascript message('measure_filter.criteria.alert.ok') -%>',
-      'days':           '<%= escape_javascript message('measure_filter.criteria.age.days') -%>'
+      'days':           '<%= escape_javascript message('measure_filter.criteria.age.days') -%>',
+      'filtersList':    '<%= escape_javascript message('measure_filter.filter_list') -%>'
     }
   });
 

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/_filter_templates.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/_filter_templates.html.erb
index 83a4f609423b23e51db5fde0ea700c9addadfc36..501e1713a82ca4498f1ff67e369ace831dc4f60a 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/_filter_templates.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/navigator/_filter_templates.html.erb
@@ -42,7 +42,7 @@
   <div class="navigator-filter-details-inner">
     <input class="navigator-filter-range-input" type="text"
            name="{{ propertyFrom }}" placeholder="{{ placeholder }}">
-    <label>to</label>
+    <label>{[ print(window.SS.phrases.to); ]}</label>
     <input class="navigator-filter-range-input" type="text"
            name="{{ propertyTo }}" placeholder="{{ placeholder }}">
   </div>
@@ -75,7 +75,7 @@
     </select>
 
     <select name="period">
-      <option value="0">Value</option>
+      <option value="0">{[ print(window.SS.phrases.value); ]}</option>
       {[ _.each(periods, function(period, key) { ]}
       <option value="{{ key }}">{{ period }}</option>
       {[ }); ]}
@@ -92,7 +92,7 @@
 </script>
 
 <script id="favoriteFilterTemplate" type="text/template">
-  <div class="navigator-filter-favorite-toggle" title="Issues Filters"></div>
+  <div class="navigator-filter-favorite-toggle" title="{[ print(window.SS.phrases.filtersList); ]}"></div>
 </script>
 
 <script id="detailsFavoriteFilterTemplate" type="text/template">
@@ -106,13 +106,13 @@
     <li class="line"></li>
     {[ } ]}
     <li class="manage">
-      <label id="manage-favorites">Manage</label>
+      <label id="manage-favorites">{[ print(window.SS.phrases.manage); ]}</label>
     </li>
   </ul>
 </script>
 
 <script id="moreCriteriaFilterTemplate" type="text/template">
-  <strong>+</strong> {[ print(window.SS.phrases.moreCriteria); ]}
+  {[ print(window.SS.phrases.moreCriteria); ]}
 </script>
 
 <script id="detailsMoreCriteriaFilterTemplate" type="text/template">