Download as
Browse Code »

Commit 5717304098ae81285a5a616fb066e9ae7ea88f54

Authored by Jacob Vosmaer
2 parents 85be902e 873bd3ad
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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

Minor grammatical updates in some of the labels.
Showing 8 changed files with 11 additions and 11 deletions   Show diff stats
app/views/admin/groups/edit.html.haml
  Diff comments   View file @5717304
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 %span= @group.errors.full_messages.first 6 %span= @group.errors.full_messages.first
7 .control-group.group_name_holder 7 .control-group.group_name_holder
8 = f.label :name do 8 = f.label :name do
9 - Group name is 9 + Group name
10 .controls 10 .controls
11 = f.text_field :name, placeholder: "Example Group", class: "input-xxlarge" 11 = f.text_field :name, placeholder: "Example Group", class: "input-xxlarge"
12 12
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 17
18 .control-group.group_name_holder 18 .control-group.group_name_holder
19 = f.label :path do 19 = f.label :path do
20 - %span.cred Group path is 20 + %span.cred Group path
21 .controls 21 .controls
22 = f.text_field :path, placeholder: "example-group", class: "input-xxlarge danger" 22 = f.text_field :path, placeholder: "example-group", class: "input-xxlarge danger"
23 %ul.cred 23 %ul.cred
app/views/admin/groups/new.html.haml
  Diff comments   View file @5717304
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 %span= @group.errors.full_messages.first 6 %span= @group.errors.full_messages.first
7 .control-group 7 .control-group
8 = f.label :name do 8 = f.label :name do
9 - Group name is 9 + Group name
10 .controls 10 .controls
11 = f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left" 11 = f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left"
12 .control-group.group-description-holder 12 .control-group.group-description-holder
app/views/admin/projects/show.html.haml
  Diff comments   View file @5717304
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 = @project.creator.try(:name) || '(deleted)' 35 = @project.creator.try(:name) || '(deleted)'
36 36
37 %li 37 %li
38 - %span.light Created at: 38 + %span.light Created on:
39 %strong 39 %strong
40 = @project.created_at.stamp("March 1, 1999") 40 = @project.created_at.stamp("March 1, 1999")
41 41
app/views/groups/edit.html.haml
  Diff comments   View file @5717304
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 %span= @group.errors.full_messages.first 26 %span= @group.errors.full_messages.first
27 .control-group 27 .control-group
28 = f.label :name do 28 = f.label :name do
29 - Group name is 29 + Group name
30 .controls 30 .controls
31 = f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left" 31 = f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left"
32 32
app/views/groups/new.html.haml
  Diff comments   View file @5717304
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 %span= @group.errors.full_messages.first 4 %span= @group.errors.full_messages.first
5 .control-group 5 .control-group
6 = f.label :name do 6 = f.label :name do
7 - Group name is 7 + Group name
8 .controls 8 .controls
9 = f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left" 9 = f.text_field :name, placeholder: "Ex. OpenSource", class: "input-xxlarge left"
10 10
app/views/projects/edit.html.haml
  Diff comments   View file @5717304
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 %fieldset 11 %fieldset
12 .control-group.project_name_holder 12 .control-group.project_name_holder
13 = f.label :name do 13 = f.label :name do
14 - Project name is 14 + Project name
15 .controls 15 .controls
16 = f.text_field :name, placeholder: "Example Project", class: "span5" 16 = f.text_field :name, placeholder: "Example Project", class: "span5"
17 17
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 Project description 21 Project description
22 %span.light (optional) 22 %span.light (optional)
23 .controls 23 .controls
24 - = f.text_area :description, placeholder: "awesome project", class: "span5", rows: 3, maxlength: 250 24 + = f.text_area :description, placeholder: "Awesome project", class: "span5", rows: 3, maxlength: 250
25 25
26 - if @project.repository.exists? && @project.repository.branch_names.any? 26 - if @project.repository.exists? && @project.repository.branch_names.any?
27 .control-group 27 .control-group
app/views/projects/new.html.haml
  Diff comments   View file @5717304
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 = form_for @project, remote: true do |f| 6 = form_for @project, remote: true do |f|
7 .control-group.project-name-holder 7 .control-group.project-name-holder
8 = f.label :name do 8 = f.label :name do
9 - %strong Project name is 9 + %strong Project name
10 .controls 10 .controls
11 = f.text_field :name, placeholder: "Example Project", class: "input-xlarge", tabindex: 1, autofocus: true 11 = f.text_field :name, placeholder: "Example Project", class: "input-xlarge", tabindex: 1, autofocus: true
12 %span.help-inline 12 %span.help-inline
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 Description 46 Description
47 %span.light (optional) 47 %span.light (optional)
48 .controls 48 .controls
49 - = f.text_area :description, placeholder: "awesome project", class: "input-xlarge", rows: 3, maxlength: 250, tabindex: 3 49 + = f.text_area :description, placeholder: "Awesome project", class: "input-xlarge", rows: 3, maxlength: 250, tabindex: 3
50 .control-group.project-public-holder 50 .control-group.project-public-holder
51 = f.label :public do 51 = f.label :public do
52 %span Public project 52 %span Public project
features/steps/shared/project.rb
  Diff comments   View file @5717304
@@ -47,7 +47,7 @@ module SharedProject @@ -47,7 +47,7 @@ module SharedProject
47 47
48 Then 'I should see project settings' do 48 Then 'I should see project settings' do
49 current_path.should == edit_project_path(@project) 49 current_path.should == edit_project_path(@project)
50 - page.should have_content("Project name is") 50 + page.should have_content("Project name")
51 page.should have_content("Features:") 51 page.should have_content("Features:")
52 end 52 end
53 53