Download as
Browse Code »

Commit c2f74de4c04cb6f23f9b8be86df5852b37b0df55

Authored by Jacob Vosmaer
2 parents 88519e90 03dec79c
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #5395 from dpursehouse/more-label-fixes 

More label fixes
Showing 6 changed files with 6 additions and 6 deletions   Show diff stats
app/views/admin/groups/show.html.haml
  Diff comments   View file @c2f74de
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 = @group.description 25 = @group.description
26 26
27 %li 27 %li
28 - %span.light Created at: 28 + %span.light Created on:
29 %strong 29 %strong
30 = @group.created_at.stamp("March 1, 1999") 30 = @group.created_at.stamp("March 1, 1999")
31 31
app/views/groups/edit.html.haml
  Diff comments   View file @c2f74de
@@ -68,7 +68,7 @@ @@ -68,7 +68,7 @@
68 .title Remove group 68 .title Remove group
69 .ui-box-body 69 .ui-box-body
70 %p 70 %p
71 - Remove of group will cause removing all child projects and resources. 71 + Removing group will cause all child projects and resources to be removed.
72 %p 72 %p
73 %strong Removed group can not be restored! 73 %strong Removed group can not be restored!
74 74
app/views/profiles/accounts/show.html.haml
  Diff comments   View file @c2f74de
@@ -68,6 +68,6 @@ @@ -68,6 +68,6 @@
68 %li #{pluralize rp, 'personal project'} will be removed and cannot be restored 68 %li #{pluralize rp, 'personal project'} will be removed and cannot be restored
69 - if current_user.solo_owned_groups.present? 69 - if current_user.solo_owned_groups.present?
70 %li 70 %li
71 - Next groups will be abandoned. You should transfer or remove them: 71 + The following groups will be abandoned. You should transfer or remove them:
72 %strong #{current_user.solo_owned_groups.map(&:name).join(', ')} 72 %strong #{current_user.solo_owned_groups.map(&:name).join(', ')}
73 = link_to 'Delete account', user_registration_path, confirm: "REMOVE #{current_user.name}? Are you sure?", method: :delete, class: "btn btn-remove" 73 = link_to 'Delete account', user_registration_path, confirm: "REMOVE #{current_user.name}? Are you sure?", method: :delete, class: "btn btn-remove"
app/views/profiles/keys/show.html.haml
  Diff comments   View file @c2f74de
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 %span.light Title: 8 %span.light Title:
9 %strong= @key.title 9 %strong= @key.title
10 %li 10 %li
11 - %span.light Created at: 11 + %span.light Created on:
12 %strong= @key.created_at.stamp("Aug 21, 2011") 12 %strong= @key.created_at.stamp("Aug 21, 2011")
13 13
14 .span8 14 .span8
app/views/projects/merge_requests/show/_mr_box.html.haml
  Diff comments   View file @c2f74de
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 .ui-box-body 13 .ui-box-body
14 %div 14 %div
15 %cite.cgray 15 %cite.cgray
16 - Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by #{link_to_member(@project, @merge_request.author)} 16 + Created on #{@merge_request.created_at.stamp("Aug 21, 2011")} by #{link_to_member(@project, @merge_request.author)}
17 - if @merge_request.assignee 17 - if @merge_request.assignee
18 \, currently assigned to #{link_to_member(@project, @merge_request.assignee)} 18 \, currently assigned to #{link_to_member(@project, @merge_request.assignee)}
19 - if @merge_request.milestone 19 - if @merge_request.milestone
app/views/projects/show.html.haml
  Diff comments   View file @c2f74de
@@ -59,7 +59,7 @@ @@ -59,7 +59,7 @@
59 %br 59 %br
60 .light-well 60 .light-well
61 %p 61 %p
62 - %span.light Created at 62 + %span.light Created on
63 #{@project.created_at.stamp('Aug 22, 2013')} 63 #{@project.created_at.stamp('Aug 22, 2013')}
64 %p 64 %p
65 %span.light Owned by 65 %span.light Owned by