Merge pull request #96 from aesraethr/bug_3192/dev/typo_archive_buttons

fixes #3192 correct typos
Normation · Jan 18, 2013 · 3b35607 · 3b35607
2 parents dfd1234 + 674eb0d
commit 3b35607
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/rudder-core/src/main/scala/com/normation/rudder/domain/reports/CleanReportsAction.scala b/rudder-core/src/main/scala/com/normation/rudder/domain/reports/CleanReportsAction.scala
@@ -34,17 +34,17 @@ abstract class CleanReportAction {
 }
 
 case class ArchiveAction(dbManager:DatabaseManager,dbCleaner : AutomaticReportsCleaning) extends CleanReportAction {
-  val name = "Archive"
-  val past = "Archived"
-  val continue = "Archiving"
+  val name = "archive"
+  val past = "archived"
+  val continue = "archiving"
   def act(date:DateTime) = dbManager.archiveEntries(date)
   val actor = dbCleaner.archiver
 }
 
 case class DeleteAction(dbManager:DatabaseManager,dbCleaner : AutomaticReportsCleaning) extends CleanReportAction {
-  val name = "Delete"
-  val past = "Deleted"
-  val continue = "Deleting"
+  val name = "delete"
+  val past = "deleted"
+  val continue = "deleting"
   def act(date:DateTime) = dbManager.deleteEntries(date)
   val actor = dbCleaner.deleter
-}
+}
diff --git a/...b/src/main/scala/com/normation/rudder/web/snippet/administration/DatabaseManagement.scala b/...b/src/main/scala/com/normation/rudder/web/snippet/administration/DatabaseManagement.scala
@@ -161,7 +161,7 @@ class DatabaseManagement extends DispatchSnippet with Loggable {
           }
       <span style="margin-left:10px">
           {
-            SHtml.ajaxButton("%se reports".format(action.name), { () => val askResult = action.ask(date)
+            SHtml.ajaxButton("%s reports".format(action.name.capitalize), { () => val askResult = action.ask(date)
              JsRaw("""$('#cleanResultText').text('%s, you can see more details in the webapp log file (/var/log/rudder/core/rudder-webapp.log)');
                  $('#cleanResult').show();""".format(askResult)) & cancel & updateValue
             } )