From: Fabrice Bellingard Date: Thu, 1 Sep 2011 14:02:31 +0000 (+0200) Subject: SONAR-893 Improve style and text X-Git-Tag: 2.11^2~105 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=da984a8349a5d847b9dace6a6d5c8b4f1b3f7dc1;p=sonarqube.git SONAR-893 Improve style and text --- diff --git a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties index 5cc94c9fa92..6f5b7f63e5a 100644 --- a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties +++ b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties @@ -602,7 +602,7 @@ manual_measures.pending_message=Pending measures are marked with orange box. The project_history.page_title=Delete quality snapshots from project history project_history.note=Note on snapshot deletion -project_history.note_detail=A snapshot may be deleted from the database only if it was created more that 6 hours ago. +project_history.note_detail=After deleting a snapshot, it is still possible to recover it as long as a new project analysis is not running or as long as the deleted snapshot has not been created more than 6 hours ago. project_history.col.year=Year project_history.col.month=Month project_history.col.time=Time diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/history.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/project/history.html.erb index a4126970bd7..e411332d50a 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/project/history.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/project/history.html.erb @@ -31,8 +31,8 @@ time = snapshot.created_at %> - <%= time.year unless time.year == current_year -%> - <%= l(time, :format => '%B').capitalize unless time.month == current_month -%> + <%= time.year unless time.year == current_year -%> + <%= l(time, :format => '%B').capitalize unless time.month == current_month -%> <%= snapshot.events.map{|e| e.name}.join(', ') -%>