diff options
3 files changed, 70 insertions, 35 deletions
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 07894df7373..e21f847aa1e 100755 --- 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,13 +1,60 @@ +view.coverage.title=Coverage +view.org.sonar.plugins.core.duplicationsviewer.DuplicationsViewer.title=Duplications +view.source.title=Source +view.violations.title=Violations + +view.size.lines_of_code=Lines of code +view.size.classes=Classes +view.size.files=Files +view.size.generated_suffix=\ generated +view.size.lines_suffix=\ lines +view.size.statements_suffix=\ statements +view.size.files_suffix=\ files +view.size.packages_suffix=\ packages +view.size.directories_suffix=\ directories +view.size.methods_suffix=\ methods +view.size.accessors_suffix=\ accessors +view.size.paragraphs_suffix=\ paragraphs + +general_columns.links=Links +general_columns.build_time=Build time +general_columns.language=Language +general_columns.version=Version +general_columns.date=Build date +general_columns.key=Key +general_columns.name=Name + + +#------------------------------------------------------------------------------ +# +# LAYOUT +# +#------------------------------------------------------------------------------ + layout.home=Home layout.login=Log in layout.logout=Log out layout.configuration=Configuration layout.print=Print +layout.permalink=Permalink +layout.sonar.slogan=Embrace Quality +layout.powered_by=Powered by +layout.plugins=Plugins +layout.documentation=Documentation +layout.ask_a_questions=Ask a question +layout.bug_feature_request=Bug/feature request sidebar.project_system=System sidebar.security=Security sidebar.system=System + +#------------------------------------------------------------------------------ +# +# PAGES +# +#------------------------------------------------------------------------------ + clouds.page=Clouds components.page=Components @@ -36,33 +83,8 @@ 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 -view.violations.title=Violations -view.size.lines_of_code=Lines of code -view.size.classes=Classes -view.size.files=Files -view.size.generated_suffix=\ generated -view.size.lines_suffix=\ lines -view.size.statements_suffix=\ statements -view.size.files_suffix=\ files -view.size.packages_suffix=\ packages -view.size.directories_suffix=\ directories -view.size.methods_suffix=\ methods -view.size.accessors_suffix=\ accessors -view.size.paragraphs_suffix=\ paragraphs - -general_columns.links=Links -general_columns.build_time=Build time -general_columns.language=Language -general_columns.version=Version -general_columns.date=Build date -general_columns.key=Key -general_columns.name=Name #------------------------------------------------------------------------------ # diff --git a/plugins/sonar-design-plugin/src/main/resources/org/sonar/i18n/design.properties b/plugins/sonar-design-plugin/src/main/resources/org/sonar/i18n/design.properties index c3af9b66e32..e6356b6e141 100755 --- a/plugins/sonar-design-plugin/src/main/resources/org/sonar/i18n/design.properties +++ b/plugins/sonar-design-plugin/src/main/resources/org/sonar/i18n/design.properties @@ -1,4 +1,4 @@ -view.org.sonar.plugins.design.ui.page.DesignPage.title=Design -view.org.sonar.plugins.design.ui.libraries.LibrariesPage.title=Libraries -view.org.sonar.plugins.design.ui.dependencies.DependenciesTab.title=Dependencies -view.org.sonar.plugins.design.ui.lcom4.Lcom4Tab.title=LCOM4 +org.sonar.plugins.design.ui.page.DesignPage.page=Design +org.sonar.plugins.design.ui.libraries.LibrariesPage.page=Libraries +org.sonar.plugins.design.ui.dependencies.DependenciesTab.page=Dependencies +org.sonar.plugins.design.ui.lcom4.Lcom4Tab.page=LCOM4 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 2e783e9193a..659f24ad4e6 100644 --- 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 @@ -6,7 +6,7 @@ <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="<%= 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 %> + <% if @project %><a href="<%= url_for :overwrite_params => {:id => @project.key}-%>" id="permalink"><img src="<%= ApplicationController.root_context -%>/images/permalink.gif" alt="<%=message('layout.permalink')-%>" title="<%=message('layout.permalink')-%>" /></a><% end %> </li> <% if logged_in? %> <li> @@ -31,7 +31,7 @@ <% controller.java_facade.getPages(Navigation::SECTION_HOME, nil, nil, nil).each do |page| selected=request.request_uri.include?("/plugins/home/#{page.getId()}") %> - <li class="<%= 'selected' if selected -%>"><a href="<%= ApplicationController.root_context -%>/plugins/home/<%= page.getId() -%>"><%= page.getTitle()-%></a></li> + <li class="<%= 'selected' if selected -%>"><a href="<%= ApplicationController.root_context -%>/plugins/home/<%= page.getId() -%>"><%= message(page.getId() + '.page', :default => page.getTitle()) -%></a></li> <% end %> <% elsif (selected_section==Navigation::SECTION_RESOURCE) %> @@ -43,7 +43,7 @@ <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> + <li class="<%= 'selected' if request.request_uri.include?("page=#{page.getId()}") -%>"><a href="<%= ApplicationController.root_context -%>/plugins/resource/<%= @project.id-%>?page=<%= page.getId() -%>"><%= message(page.getId() + '.page', :default => page.getTitle()) %></a></li> <% end %> <% if has_role?(:admin, @project) && @project.set? %> <li class="h2"><%= message('sidebar.project_system') -%></li> @@ -65,7 +65,7 @@ <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> + <li class="<%= 'selected' if request.request_uri.include?("plugins/configuration/#{page.getId()}") -%>"><a href="<%= ApplicationController.root_context -%>/plugins/configuration/<%= page.getId() -%>"><%= message(page.getId() + '.page', :default => page.getTitle()) %></a></li> <% end %> <li class="h2"><%= message('sidebar.security') -%></li> @@ -86,7 +86,7 @@ <% end %> </ul> - <div id="logo"><center><a href="http://www.sonarsource.org/"><%= image_tag('sonar.png', :alt => 'Embrace Quality', :class => 'png') -%></a></center></div> + <div id="logo"><center><a href="http://www.sonarsource.org/"><%= image_tag('sonar.png', :alt => message('layout.sonar.slogan'), :class => 'png') -%></a></center></div> </div> <% if @sidebar %><div id="sidebarconf"><%= render :partial => @sidebar %></div><% else %><div id="sidebarconf" class="hidden"> </div><% end %> @@ -107,6 +107,19 @@ <% controller.java_facade.getWebFooters().each do |footer| %> <% if footer.getHtml() %><div><%= footer.getHtml().to_s %></div><% end %> <% end %> -<div id="ftlinks">Powered by <a href="http://www.sonarsource.com" target="SonarSource" class="external">SonarSource</a> - Open Source <a href="http://www.sonarsource.org/documentation/license/" target="license" class="external">LGPL</a> - v.<%= sonar_version -%> - <a href="http://sonar-plugins.codehaus.org" class="external" target="plugins">Plugins</a> - <a href="http://sonar.codehaus.org/documentation" class="external" target="sonar_doc" class="external">Documentation</a> - <a href="http://sonar.codehaus.org/support/" target="support" class="external">Ask a question</a> - <a href="http://jira.codehaus.org/browse/SONAR" target="issuetracker" class="external">Bug/feature request</a></div> +<div id="ftlinks"> + <%= message('layout.powered_by') -%> <a href="http://www.sonarsource.com" target="SonarSource" class="external">SonarSource</a> + - + Open Source <a href="http://www.sonarsource.org/documentation/license/" target="license" class="external">LGPL</a> + - + v.<%= sonar_version -%> + - + <a href="http://sonar-plugins.codehaus.org" class="external" target="plugins"><%= message('layout.plugins') -%></a> + - + <a href="http://sonar.codehaus.org/documentation" class="external" target="sonar_doc" class="external"><%= message('layout.documentation') -%></a> + - + <a href="http://sonar.codehaus.org/support/" target="support" class="external"><%= message('layout.ask_a_questions') -%></a> + - + <a href="http://jira.codehaus.org/browse/SONAR" target="issuetracker" class="external"><%= message('layout.bug_feature_request') -%></a></div> </div> <% end %> |