Commit b2c6ba97 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets 🌴

Merge pull request #1230 from tsigo/hooray_apostrophes

Correct usage of "Can't"
parents 05da3801 66399d55
......@@ -66,7 +66,7 @@ class Project < ActiveRecord::Base
project
rescue => ex
project.error_code = :db
project.errors.add(:base, "Cant save project. Please try again later")
project.errors.add(:base, "Can't save project. Please try again later")
project
end
......@@ -112,7 +112,7 @@ class Project < ActiveRecord::Base
errors[:base] << ("Your own projects limit is #{owner.projects_limit}! Please contact administrator to increase it")
end
rescue
errors[:base] << ("Cant check your ability to create project")
errors[:base] << ("Can't check your ability to create project")
end
def repo_name
......
%h1 Access Denied
%hr
%h2 You are not allowed to access this page
%h2 You are not allowed to access this page.
%p Read more about project permissions #{link_to "here", help_permissions_path, class: "vlink"}
......@@ -2,5 +2,4 @@
%h3 Encoding Error
%hr
%p
Page cant be loaded cause of encoding error
Page can't be loaded because of an encoding error.
......@@ -2,4 +2,5 @@
%hr
%h2 Git Resource Not found
%p
Application cant get access to some branch or commit in your repository. Maybe it was removed
Application can't get access to some branch or commit in your repository. It
may have been moved.
%h1 Git Error
%hr
%h2 Application cant get access to your gitolite system.
%h2 Gitlab was unable to access your Gitolite system.
.git_error_tips
%h4 Tips for Administrator:
......
%h1 404
%hr
%h2 Resource you were looking for doesn't exist.
%h2 The resource you were looking for doesn't exist.
%p You may have mistyped the address or the page may have moved.
......@@ -28,7 +28,7 @@
%span
= link_to "Show how to merge", "#", class: "how_to_merge_link btn small padded", title: "How To Merge"
&nbsp;
%strong This request cant be merged with GitLab. You should do it manually
%strong This request can't be merged with GitLab. You should do it manually
.automerge_widget.unchecked
.alert-message
......
......@@ -4,7 +4,7 @@
.alert-message.block-message
= link_to new_project_snippet_path(@project), class: "btn small add_new right", title: "New Snippet" do
Add new snippet
Share code pastes with others if it cant be in a git repository
Share code pastes with others if it can't be in a git repository
%br
To add new snippet - click on button.
......
......@@ -137,7 +137,7 @@ module Gitlab
owner_name = repo.permissions[0]["RW+"][""][0]
raise StandardError if owner_name.blank?
rescue => ex
puts "Cant determine gitolite-admin owner".red
puts "Can't determine gitolite-admin owner".red
raise StandardError
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment