Download as
Browse Code »

Commit b2c6ba97a25d299e83c51493d7bc770c13b8ed1a

Authored by Dmitriy Zaporozhets
2 parents 05da3801 66399d55
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #1230 from tsigo/hooray_apostrophes 

Correct usage of "Can't"
Showing 9 changed files with 11 additions and 12 deletions   Show diff stats
app/models/project.rb
  Diff comments   View file @b2c6ba9
... ... @@ -66,7 +66,7 @@ class Project < ActiveRecord::Base
66 66 project
67 67 rescue => ex
68 68 project.error_code = :db
69   - project.errors.add(:base, "Cant save project. Please try again later")
  69 + project.errors.add(:base, "Can't save project. Please try again later")
70 70 project
71 71 end
72 72  
... ... @@ -112,7 +112,7 @@ class Project < ActiveRecord::Base
112 112 errors[:base] << ("Your own projects limit is #{owner.projects_limit}! Please contact administrator to increase it")
113 113 end
114 114 rescue
115   - errors[:base] << ("Cant check your ability to create project")
  115 + errors[:base] << ("Can't check your ability to create project")
116 116 end
117 117  
118 118 def repo_name
... ...
app/views/errors/access_denied.html.haml
  Diff comments   View file @b2c6ba9
1 1 %h1 Access Denied
2 2 %hr
3   -%h2 You are not allowed to access this page
  3 +%h2 You are not allowed to access this page.
4 4 %p Read more about project permissions #{link_to "here", help_permissions_path, class: "vlink"}
... ...
app/views/errors/encoding.html.haml
  Diff comments   View file @b2c6ba9
... ... @@ -2,5 +2,4 @@
2 2 %h3 Encoding Error
3 3 %hr
4 4 %p
5   - Page cant be loaded cause of encoding error
6   -
  5 + Page can't be loaded because of an encoding error.
... ...
app/views/errors/git_not_found.html.haml
  Diff comments   View file @b2c6ba9
... ... @@ -2,4 +2,5 @@
2 2 %hr
3 3 %h2 Git Resource Not found
4 4 %p
5   - Application cant get access to some branch or commit in your repository. Maybe it was removed
  5 + Application can't get access to some branch or commit in your repository. It
  6 + may have been moved.
... ...
app/views/errors/gitolite.html.haml
  Diff comments   View file @b2c6ba9
1 1 %h1 Git Error
2 2 %hr
3   -%h2 Application cant get access to your gitolite system.
4   -
  3 +%h2 Gitlab was unable to access your Gitolite system.
5 4  
6 5 .git_error_tips
7 6 %h4 Tips for Administrator:
... ...
app/views/errors/not_found.html.haml
  Diff comments   View file @b2c6ba9
1 1 %h1 404
2 2 %hr
3   -%h2 Resource you were looking for doesn't exist.
  3 +%h2 The resource you were looking for doesn't exist.
4 4 %p You may have mistyped the address or the page may have moved.
... ...
app/views/merge_requests/show/_mr_accept.html.haml
  Diff comments   View file @b2c6ba9
... ... @@ -28,7 +28,7 @@
28 28 %span
29 29 = link_to "Show how to merge", "#", class: "how_to_merge_link btn small padded", title: "How To Merge"
30 30 &nbsp;
31   - %strong This request cant be merged with GitLab. You should do it manually
  31 + %strong This request can't be merged with GitLab. You should do it manually
32 32  
33 33 .automerge_widget.unchecked
34 34 .alert-message
... ...
app/views/snippets/index.html.haml
  Diff comments   View file @b2c6ba9
... ... @@ -4,7 +4,7 @@
4 4 .alert-message.block-message
5 5 = link_to new_project_snippet_path(@project), class: "btn small add_new right", title: "New Snippet" do
6 6 Add new snippet
7   - Share code pastes with others if it cant be in a git repository
  7 + Share code pastes with others if it can't be in a git repository
8 8 %br
9 9 To add new snippet - click on button.
10 10  
... ...
lib/gitlab/gitolite.rb
  Diff comments   View file @b2c6ba9
... ... @@ -137,7 +137,7 @@ module Gitlab
137 137 owner_name = repo.permissions[0]["RW+"][""][0]
138 138 raise StandardError if owner_name.blank?
139 139 rescue => ex
140   - puts "Cant determine gitolite-admin owner".red
  140 + puts "Can't determine gitolite-admin owner".red
141 141 raise StandardError
142 142 end
143 143  
... ...