SONAR-75 continue i18n

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/i18n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/i18n/core.properties
index 7a4d7af6d2330cda456d6cce66ab5f6ec06e5d9e..07894df7373d6ea8505a6aa7b757e708183d211c 100755 (executable)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/i18n/core.properties
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/i18n/core.properties
@@ -1,36 +1,43 @@
-web.layouts.login=Log in
-web.layouts.logout=Log out
-web.layouts.configuration=Configuration
-web.layouts.filters=Filters
-web.layouts.reviews=Reviews
-web.layouts.dependencies=Dependencies
-web.layouts.components=Components
-web.layouts.violations_drilldown=Violations drilldown
-web.layouts.time_machine=Time machine
-web.layouts.settings=Settings
-web.layouts.project_roles=Project roles
-web.layouts.quality_profiles=Quality profiles
-web.layouts.event_categories=Event categories
-web.layouts.manual_metrics=Manual metrics
-web.layouts.default_filters=Default filters
-web.layouts.default_dashboards=Default dashboards
-web.layouts.my_profile=My profile
-web.layouts.security=Security
-web.layouts.users=Users
-web.layouts.groups=Groups
-web.layouts.global_roles=Global roles
-web.layouts.system=System
-web.layouts.backup=Backup
-web.layouts.system_info=System Info
-web.layouts.update_center=Update Center
-
-web.components.size=Size
-web.components.color=Color
-web.filters.size=Size
-web.filters.color=Color
-
-view.org.sonar.plugins.core.clouds.GwtClouds.title=Clouds
-view.org.sonar.plugins.core.hotspots.GwtHotspots.title=Hotspots
+layout.home=Home
+layout.login=Log in
+layout.logout=Log out
+layout.configuration=Configuration
+layout.print=Print
+
+sidebar.project_system=System
+sidebar.security=Security
+sidebar.system=System
+
+clouds.page=Clouds
+
+components.page=Components
+components.size=Size
+components.color=Color
+
+backup.page=Backup
+default_dashboards.page=Default dashboards
+default_filters.page=Default filters
+dependencies.page=Dependencies
+event_categories.page=Event categories
+filters.page=Filters
+filters.size=Size
+filters.color=Color
+global_roles.page=Global roles
+manual_metrics.page=Manual metrics
+my_profile.page=My profile
+project_roles.page=Project roles
+project_settings.page=Settings
+quality_profiles.page=Quality profiles
+reviews.page=Reviews
+settings.page=Settings
+timemachine.page=Time Machine
+user_groups.page=Groups
+users.page=Users
+violations_drilldown.page=Violations drilldown
+system_info.page=System Info
+update_center.page=Update Center
+
+org.sonar.plugins.core.hotspots.GwtHotspots.page=Hotspots
 view.coverage.title=Coverage
 view.org.sonar.plugins.core.duplicationsviewer.DuplicationsViewer.title=Duplications
 view.source.title=Source
@@ -57,6 +64,12 @@ general_columns.date=Build date
 general_columns.key=Key
 general_columns.name=Name
 
+#------------------------------------------------------------------------------
+#
+# METRIC DOMAINS
+#
+#------------------------------------------------------------------------------
+
 domain.Size=Size
 domain.Tests=Tests
 domain.Complexity=Complexity
@@ -68,59 +81,66 @@ domain.Design=Design
 domain.SCM=SCM
 domain.Management=Management
 
-metric.lines.name=Lines
-metric.lines.description=Lines
 
-metric.generated_lines.name=Generated Lines
-metric.generated_lines.description=Number of generated lines
+#------------------------------------------------------------------------------
+#
+# METRICS
+#
+#------------------------------------------------------------------------------
 
-metric.ncloc.name=Lines of code
-metric.ncloc.description=Non Commenting Lines of Code
+metric.accessors.name=Accessors
+metric.accessors.description=Accessors
 
-metric.generated_ncloc.name=Generated lines of code
-metric.generated_ncloc.description=Generated non Commenting Lines of Code
+metric.alert_status.name=Alert
+metric.alert_status.description=Alert
 
 metric.classes.name=Classes
 metric.classes.description=Classes
 
-metric.files.name=Files
-metric.files.description=Number of files
+metric.comment_blank_lines.name=Blank comments
+metric.comment_blank_lines.description=Comments that do not contain comments
+
+metric.comment_lines.name=Comment lines
+metric.comment_lines.description=Number of comment lines
+
+metric.comment_lines_density.name=Comments (%)
+metric.comment_lines_density.description=Comments balanced by ncloc + comment lines
+
+metric.commented_out_code_lines.name=Commented LOCs
+metric.commented_out_code_lines.description=Commented lines of code
+
+metric.complexity.name=Complexity
+metric.complexity.description=Cyclomatic complexity
 
 metric.directories.name=Directories
 metric.directories.description=Directories
 
-metric.packages.name=Packages
-metric.packages.description=Packages
+metric.files.name=Files
+metric.files.description=Number of files
 
 metric.functions.name=Methods
 metric.functions.description=Methods
 
-metric.accessors.name=Accessors
-metric.accessors.description=Accessors
-
-metric.paragraphs.name=Paragraphs
-metric.paragraphs.description=Number of paragraphs
+metric.generated_lines.name=Generated Lines
+metric.generated_lines.description=Number of generated lines
 
-metric.statements.name=Statements
-metric.statements.description=Number of statements
+metric.generated_ncloc.name=Generated lines of code
+metric.generated_ncloc.description=Generated non Commenting Lines of Code
 
-metric.public_api.name=Public API
-metric.public_api.description=Public API
+metric.lines.name=Lines
+metric.lines.description=Lines
 
-#--------------------------------------------------------------------------------------------------------------------
-#
-# DOCUMENTATION
-#
-#--------------------------------------------------------------------------------------------------------------------
+metric.ncloc.name=Lines of code
+metric.ncloc.description=Non Commenting Lines of Code
 
-metric.comment_lines.name=Comment lines
-metric.comment_lines.description=Number of comment lines
+metric.packages.name=Packages
+metric.packages.description=Packages
 
-metric.comment_lines_density.name=Comments (%)
-metric.comment_lines_density.description=Comments balanced by ncloc + comment lines
+metric.paragraphs.name=Paragraphs
+metric.paragraphs.description=Number of paragraphs
 
-metric.comment_blank_lines.name=Blank comments
-metric.comment_blank_lines.description=Comments that do not contain comments
+metric.public_api.name=Public API
+metric.public_api.description=Public API
 
 metric.public_documented_api_density.name=Public documented API (%)
 metric.public_documented_api_density.description=Public documented classes and methods balanced by ncloc
@@ -128,17 +148,10 @@ metric.public_documented_api_density.description=Public documented classes and m
 metric.public_undocumented_api.name=Public undocumented API
 metric.public_undocumented_api.description=Public undocumented classes, methods and variables
 
-metric.commented_out_code_lines.name=Commented LOCs
-metric.commented_out_code_lines.description=Commented lines of code
+metric.statements.name=Statements
+metric.statements.description=Number of statements
 
-#--------------------------------------------------------------------------------------------------------------------
-#
-# COMPLEXITY
-#
-#--------------------------------------------------------------------------------------------------------------------
 
-metric.complexity.name=Complexity
-metric.complexity.description=Cyclomatic complexity
 
 metric.class_complexity.name=Complexity /class
 metric.class_complexity.description=Complexity average by class
@@ -425,12 +438,8 @@ metric.revisions_by_line.description=Revisions by line
 metric.last_commit_datetimes_by_line.name=Last commit dates by line
 metric.last_commit_datetimes_by_line.description=Last commit dates by line
 
-metric.alert_status.name=Alert
-metric.alert_status.description=Alert
-
 metric.profile.name=Profile
 metric.profile.description=Selected quality profile
 
 metric.profile_version.name=Profile version
-metric.profile_version.description=Selected quality profile version
-
+metric.profile_version.description=Selected quality profile version
\ No newline at end of file

diff --git a/pom.xml b/pom.xml
index c6cae3d1d7d33486c9f858606d3b0e19bba90a55..d402ff79199cd2ee85f03cc2233162c9c91b635d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -819,7 +819,7 @@
       <dependency>
         <groupId>org.jruby</groupId>
         <artifactId>jruby-complete</artifactId>
-        <version>1.6.3</version>
+        <version>1.6.1</version>
       </dependency>
       <dependency>
         <groupId>geronimo-spec</groupId>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb
index 66344364c10dd794efd302f136fcfc12ff7f75fe..59c9aa6eee1bc3845f88bbc96c451ff62020de74 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb
@@ -1,5 +1,5 @@
 <ol id="crumbs">
-  <li><a href="<%= ApplicationController.root_context -%>/">Home</a></li>
+  <li><a href="<%= ApplicationController.root_context -%>/"><%= message('layout.home') -%></a></li>
   <%
 if @snapshot
   resources=[]

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
index f9e160f2c3ecae910af0e4d60befbf70c2ae1641..2e783e9193a9aa34ba9662b111b84d270323cea7 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
@@ -5,18 +5,18 @@
     <ol id="nav">
       <li><input type="text" autocomplete="off" size="15" name="search" id="projectSearch" onFocus="this.size=30;this.value='';autocompleteProjects('<%= ApplicationController.root_context -%>/api/resources?scopes=<%= Project::SCOPE_SET -%>&qualifiers=<%= Project::QUALIFIER_VIEW-%>,<%= Project::QUALIFIER_SUBVIEW-%>,<%= Project::QUALIFIER_PROJECT-%>', '<%= ApplicationController.root_context -%>/dashboard/index/', this, $('projectResults'));return true;" onBlur="javacript:this.size=15" value="Search"/><div id="projectResults" style="display:none"></div></li>
       <li>
-        <a href="javascript:window.print()"><img src="<%= ApplicationController.root_context -%>/images/print.gif" alt="Print" title="Print" /></a>
+        <a href="javascript:window.print()"><img src="<%= ApplicationController.root_context -%>/images/print.gif" alt="<%= message('layout.print') -%>" title="<%=message('layout.print')-%>" /></a>
         <% if @project %><a href="<%= url_for :overwrite_params => {:id => @project.key}-%>" id="permalink"><img src="<%= ApplicationController.root_context -%>/images/permalink.gif" alt="Permalink" title="Permalink" /></a><% end %>
       </li>
       <% if logged_in? %>
       <li>
       <img src="<%= ApplicationController.root_context -%>/images/user.gif"/><a href="<%= ApplicationController.root_context -%>/account/index"><%= current_user.name(true) -%></a>
-      &raquo; <a href="<%= ApplicationController.root_context -%>/sessions/logout">Log out</a>
+      &raquo; <a href="<%= ApplicationController.root_context -%>/sessions/logout"><%= message('layout.logout') -%></a>
       </li>
       <% else %>
-      <li><a href="<%= ApplicationController.root_context -%>/sessions/new"><%= message('web.layouts.login', :default => 'Log {0}', :params => ['in']) -%></a></li>
+      <li><a href="<%= ApplicationController.root_context -%>/sessions/new"><%= message('layout.login') -%></a></li>
       <% end %>
-      <li><a href="<%= ApplicationController.root_context -%>/profiles">Configuration</a></li>
+      <li><a href="<%= ApplicationController.root_context -%>/profiles"><%= message('layout.configuration') -%></a></li>
     </ol>
 
   </div>
@@ -25,9 +25,9 @@
        <div id="sidebar">
         <ul>
         <% if selected_section==Navigation::SECTION_HOME %>
-          <li class="<%= 'selected' if controller.controller_path=='filters' -%>"><a href="<%= ApplicationController.root_context -%>/filters/index">Filters</a></li>
-          <li class="<%= 'selected' if controller.controller_path=='reviews' -%>"><a href="<%= ApplicationController.root_context -%>/reviews/index">Reviews</a></li>
-          <li class="<%= 'selected' if controller.controller_path=='dependencies' -%>"><a href="<%= ApplicationController.root_context -%>/dependencies/index">Dependencies</a></li>
+          <li class="<%= 'selected' if controller.controller_path=='filters' -%>"><a href="<%= ApplicationController.root_context -%>/filters/index"><%= message('filters.page') -%></a></li>
+          <li class="<%= 'selected' if controller.controller_path=='reviews' -%>"><a href="<%= ApplicationController.root_context -%>/reviews/index"><%= message('reviews.page') -%></a></li>
+          <li class="<%= 'selected' if controller.controller_path=='dependencies' -%>"><a href="<%= ApplicationController.root_context -%>/dependencies/index"><%= message('dependencies.page') -%></a></li>
 
           <% controller.java_facade.getPages(Navigation::SECTION_HOME, nil, nil, nil).each do |page|
                selected=request.request_uri.include?("/plugins/home/#{page.getId()}") %>
@@ -38,49 +38,49 @@
           <% ActiveDashboard.user_dashboards(current_user).each do |active_dashboard| %>
             <li class="<%= 'selected' if @dashboard && controller.controller_path=='dashboard' &&  active_dashboard.dashboard_id==@dashboard.id -%>"><a href="<%= ApplicationController.root_context -%>/dashboard/index/<%= @project.id -%>?did=<%= active_dashboard.dashboard_id -%>"><%= active_dashboard.dashboard.name -%></a></li>
           <% end %>
-          <li class="<%= 'selected' if request.request_uri.include?('/components/index') -%>"><a href="<%= ApplicationController.root_context -%>/components/index/<%= @project.id -%>">Components</a></li>
-          <li class="<%= 'selected' if request.request_uri.include?('/drilldown/violations') -%>"><a href="<%= ApplicationController.root_context -%>/drilldown/violations/<%= @project.id -%>">Violations drilldown</a></li>
-          <li class="<%= 'selected' if controller.controller_path=='timemachine' -%>"><a href="<%= ApplicationController.root_context -%>/timemachine/index/<%= @project.id -%>">Time machine</a></li>
-          <li class="<%= 'selected' if request.request_uri.include?('/cloud/index') -%>"><a href="<%= ApplicationController.root_context -%>/cloud/index/<%= @project.id -%>">Clouds</a></li>
+          <li class="<%= 'selected' if request.request_uri.include?('/components/index') -%>"><a href="<%= ApplicationController.root_context -%>/components/index/<%= @project.id -%>"><%= message('components.page') -%></a></li>
+          <li class="<%= 'selected' if request.request_uri.include?('/drilldown/violations') -%>"><a href="<%= ApplicationController.root_context -%>/drilldown/violations/<%= @project.id -%>"><%= message('violations_drilldown.page') -%></a></li>
+          <li class="<%= 'selected' if controller.controller_path=='timemachine' -%>"><a href="<%= ApplicationController.root_context -%>/timemachine/index/<%= @project.id -%>"><%= message('timemachine.page') -%></a></li>
+          <li class="<%= 'selected' if request.request_uri.include?('/cloud/index') -%>"><a href="<%= ApplicationController.root_context -%>/cloud/index/<%= @project.id -%>"><%= message('clouds.page') -%></a></li>
           <% controller.java_facade.getPages(Navigation::SECTION_RESOURCE, @project.scope, @project.qualifier, @project.language).each do |page| %>
           <li class="<%= 'selected' if request.request_uri.include?("page=#{page.getId()}") -%>"><a href="<%= ApplicationController.root_context -%>/plugins/resource/<%= @project.id-%>?page=<%= page.getId() -%>"><%= page.getTitle() %></a></li>
           <% end %>
           <% if has_role?(:admin, @project) && @project.set? %>
-            <li class="h2">System</li>
+            <li class="h2"><%= message('sidebar.project_system') -%></li>
             <% if (@project.project? || @project.module?) %>
-              <li class="<%= 'selected' if request.request_uri.include?('/project/settings') -%>"><a href="<%= ApplicationController.root_context -%>/project/settings/<%= @project.id -%>">Settings</a></li>
+              <li class="<%= 'selected' if request.request_uri.include?('/project/settings') -%>"><a href="<%= ApplicationController.root_context -%>/project/settings/<%= @project.id -%>"><%= message('project_settings.page') -%></a></li>
             <% end %>
             <% if (@project.project? || @project.view? || @project.subview?) %>
-              <li class="<%= 'selected' if request.request_uri.include?('/project_roles') -%>"><a href="<%= ApplicationController.root_context -%>/project_roles/index?resource=<%= @project.id -%>">Project roles</a></li>
+              <li class="<%= 'selected' if request.request_uri.include?('/project_roles') -%>"><a href="<%= ApplicationController.root_context -%>/project_roles/index?resource=<%= @project.id -%>"><%= message('project_roles.page') -%></a></li>
             <% end %>
           <% end %>
 
         <% elsif selected_section==Navigation::SECTION_CONFIGURATION %>
 
-          <li class="<%= 'selected' if request.request_uri.include?('/profiles') || request.request_uri.include?('/rules_configuration') -%>"><a href="<%= ApplicationController.root_context -%>/profiles">Quality profiles</a></li>
+          <li class="<%= 'selected' if request.request_uri.include?('/profiles') || request.request_uri.include?('/rules_configuration') -%>"><a href="<%= ApplicationController.root_context -%>/profiles"><%= message('quality_profiles.page') -%></a></li>
             <% if is_admin? %>
-              <li class="<%= 'selected' if controller.controller_path=='event_categories' -%>"><a href="<%= ApplicationController.root_context -%>/event_categories/index">Event categories</a></li>
-              <li class="<%= 'selected' if controller.controller_path=='metrics' -%>"><a href="<%= ApplicationController.root_context -%>/metrics/index">Manual metrics</a></li>
-              <li class="<%= 'selected' if controller.controller_path=='admin_filters' -%>"><a href="<%= ApplicationController.root_context -%>/admin_filters/index">Default filters</a></li>
-              <li class="<%= 'selected' if controller.controller_path=='admin_dashboards' -%>"><a href="<%= ApplicationController.root_context -%>/admin_dashboards/index">Default dashboards</a></li>                  
-              <li class="<%= 'selected' if controller.controller_path=='account' -%>"><a href="<%= ApplicationController.root_context -%>/account/index">My profile</a></li>
+              <li class="<%= 'selected' if controller.controller_path=='event_categories' -%>"><a href="<%= ApplicationController.root_context -%>/event_categories/index"><%= message('event_categories.page') -%></a></li>
+              <li class="<%= 'selected' if controller.controller_path=='metrics' -%>"><a href="<%= ApplicationController.root_context -%>/metrics/index"><%= message('manual_metrics.page') -%></a></li>
+              <li class="<%= 'selected' if controller.controller_path=='admin_filters' -%>"><a href="<%= ApplicationController.root_context -%>/admin_filters/index"><%= message('default_filters.page') -%></a></li>
+              <li class="<%= 'selected' if controller.controller_path=='admin_dashboards' -%>"><a href="<%= ApplicationController.root_context -%>/admin_dashboards/index"><%= message('default_dashboards.page') -%></a></li>
+              <li class="<%= 'selected' if controller.controller_path=='account' -%>"><a href="<%= ApplicationController.root_context -%>/account/index"><%= message('my_profile.page') -%></a></li>
               <% controller.java_facade.getPages(Navigation::SECTION_CONFIGURATION, nil,nil, nil).each do |page| %>
                 <li class="<%= 'selected' if request.request_uri.include?("plugins/configuration/#{page.getId()}") -%>"><a href="<%= ApplicationController.root_context -%>/plugins/configuration/<%= page.getId() -%>"><%= page.getTitle() %></a></li>
               <% end %>
 
-              <li class="h2">Security</li>
-              <li class="<%= 'selected' if request.request_uri.include?('/users') -%>"><a href="<%= ApplicationController.root_context -%>/users">Users</a></li>
-              <li class="<%= 'selected' if request.request_uri.include?('/groups') -%>"><a href="<%= ApplicationController.root_context -%>/groups/index">Groups</a></li>
-              <li class="<%= 'selected' if request.request_uri.include?('/roles/global') -%>"><a href="<%= ApplicationController.root_context -%>/roles/global">Global roles</a></li>
-              <li class="<%= 'selected' if request.request_uri.include?('/roles/projects') -%>"><a href="<%= ApplicationController.root_context -%>/roles/projects">Project roles</a></li>
+              <li class="h2"><%= message('sidebar.security') -%></li>
+              <li class="<%= 'selected' if request.request_uri.include?('/users') -%>"><a href="<%= ApplicationController.root_context -%>/users"><%= message('users.page') -%></a></li>
+              <li class="<%= 'selected' if request.request_uri.include?('/groups') -%>"><a href="<%= ApplicationController.root_context -%>/groups/index"><%= message('user_groups.page') -%></a></li>
+              <li class="<%= 'selected' if request.request_uri.include?('/roles/global') -%>"><a href="<%= ApplicationController.root_context -%>/roles/global"><%= message('global_roles.page') -%></a></li>
+              <li class="<%= 'selected' if request.request_uri.include?('/roles/projects') -%>"><a href="<%= ApplicationController.root_context -%>/roles/projects"><%= message('project_roles.page') -%></a></li>
 
-              <li class="h2">System</li>
-              <li class="<%= 'selected' if request.request_uri.include?('/settings') -%>"><a href="<%= ApplicationController.root_context -%>/settings/index">Settings</a></li>
-              <li class="<%= 'selected' if controller.controller_path=='backup' -%>"><a href="<%= ApplicationController.root_context -%>/backup">Backup</a></li>
-              <li class="<%= 'selected' if controller.controller_path=='system' -%>"><a href="<%= ApplicationController.root_context -%>/system">System Info</a></li>
+              <li class="h2"><%= message('sidebar.system') -%></li>
+              <li class="<%= 'selected' if request.request_uri.include?('/settings') -%>"><a href="<%= ApplicationController.root_context -%>/settings/index"><%= message('settings.page') -%></a></li>
+              <li class="<%= 'selected' if controller.controller_path=='backup' -%>"><a href="<%= ApplicationController.root_context -%>/backup"><%= message('backup.page') -%></a></li>
+              <li class="<%= 'selected' if controller.controller_path=='system' -%>"><a href="<%= ApplicationController.root_context -%>/system"><%= message('system_info.page') -%></a></li>
               <% update_center_activated = controller.java_facade.getConfigurationValue('sonar.updatecenter.activate') || 'true';
               if update_center_activated=='true' %>
-                <li class="<%= 'selected' if controller.controller_path=='updatecenter' -%>"><a href="<%= ApplicationController.root_context -%>/updatecenter">Update Center</a></li>
+                <li class="<%= 'selected' if controller.controller_path=='updatecenter' -%>"><a href="<%= ApplicationController.root_context -%>/updatecenter"><%= message('update_center.page') -%></a></li>
               <% end %>
             <% end %>