Merge pull request #1230 from tsigo/hooray_apostrophes

Correct usage of "Can't"

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