Merge pull request #5359 from dpursehouse/update-some-labels

Minor grammatical updates in some of the labels.

app/views/admin/groups/edit.html.haml

@@ -6,7 +6,7 @@
       %span= @group.errors.full_messages.first
   .control-group.group_name_holder
     = f.label :name do
-      Group name is
+      Group name
     .controls
       = f.text_field :name, placeholder: "Example Group", class: "input-xxlarge"
 
@@ -17,7 +17,7 @@
 
   .control-group.group_name_holder
     = f.label :path do
-      %span.cred Group path is
+      %span.cred Group path
     .controls
       = f.text_field :path, placeholder: "example-group", class: "input-xxlarge danger"
       %ul.cred

app/views/admin/groups/new.html.haml

@@ -6,7 +6,7 @@
       %span= @group.errors.full_messages.first
   .control-group
     = f.label :name do
-      Group name is
+      Group name
     .controls
       = f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left"
   .control-group.group-description-holder

app/views/admin/projects/show.html.haml

@@ -35,7 +35,7 @@
             = @project.creator.try(:name) || '(deleted)'
 
         %li
-          %span.light Created at:
+          %span.light Created on:
           %strong
             = @project.created_at.stamp("March 1, 1999")
 

app/views/groups/edit.html.haml

@@ -26,7 +26,7 @@
                   %span= @group.errors.full_messages.first
               .control-group
                 = f.label :name do
-                  Group name is
+                  Group name
                 .controls
                   = f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left"
 

app/views/groups/new.html.haml

@@ -4,7 +4,7 @@
       %span= @group.errors.full_messages.first
   .control-group
     = f.label :name do
-      Group name is
+      Group name
     .controls
       = f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left"
 

app/views/projects/edit.html.haml

@@ -11,7 +11,7 @@
           %fieldset
             .control-group.project_name_holder
               = f.label :name do
-                Project name is
+                Project name
               .controls
                 = f.text_field :name, placeholder: "Example Project", class: "span5"
 
@@ -21,7 +21,7 @@
                 Project description
                 %span.light (optional)
               .controls
-                = f.text_area :description, placeholder: "awesome project", class: "span5", rows: 3, maxlength: 250
+                = f.text_area :description, placeholder: "Awesome project", class: "span5", rows: 3, maxlength: 250
 
             - if @project.repository.exists? && @project.repository.branch_names.any?
               .control-group

app/views/projects/new.html.haml

@@ -6,7 +6,7 @@
     = form_for @project, remote: true do |f|
       .control-group.project-name-holder
         = f.label :name do
-          %strong Project name is
+          %strong Project name
         .controls
           = f.text_field :name, placeholder: "Example Project", class: "input-xlarge", tabindex: 1, autofocus: true
           %span.help-inline
@@ -46,7 +46,7 @@
           Description
           %span.light (optional)
         .controls
-          = f.text_area :description, placeholder: "awesome project", class: "input-xlarge", rows: 3, maxlength: 250, tabindex: 3
+          = f.text_area :description, placeholder: "Awesome project", class: "input-xlarge", rows: 3, maxlength: 250, tabindex: 3
       .control-group.project-public-holder
         = f.label :public do
           %span Public project

features/steps/shared/project.rb

@@ -47,7 +47,7 @@ module SharedProject
 
   Then 'I should see project settings' do
     current_path.should == edit_project_path(@project)
-    page.should have_content("Project name is")
+    page.should have_content("Project name")
     page.should have_content("Features:")
   end