Merge pull request #861 from WouterSioen/patch-1

Be consistent by always using error(s).

Merge pull request #861 from WouterSioen/patch-1
Be consistent by always using error(s).
Stephen Crosby
2 parents 3c9449ab 94715b97
Showing 9 changed files with 17 additions and 17 deletions Show diff stats
app/controllers/problems_controller.rb
app/views/mailer/comment_notification.html.haml
app/views/mailer/comment_notification.text.erb
app/views/mailer/err_notification.html.haml
app/views/mailer/err_notification.text.erb
config/locales/en.yml
spec/controllers/problems_controller_spec.rb
spec/mailers/mailer_spec.rb
spec/views/apps/show.html.haml_spec.rb
@@ -78,7 +78,7 @@ class ProblemsController &lt; ApplicationController
   def resolve
     problem.resolve!
-    flash[:success] = 'Great news everyone! The err has been resolved.'
+    flash[:success] = 'Great news everyone! The error has been resolved.'
     redirect_to :back
   rescue ActionController::RedirectBackError
     redirect_to app_path(app)
@@ -13,7 +13,7 @@
                 %span.bold= @problem.environment
                 environment.
                 %br
-                This err has occurred #{pluralize @problem.notices_count, 'time'}.
+                This error has occurred #{pluralize @problem.notices_count, 'time'}.
               %p
                 = link_to("Click here to view the error and add a comment on Errbit", app_problem_url(@app, @problem), :class => "bold") << "."
 <%= @user.name %> has just commented on an error that occurred in <%= @notice.environment_name %>: <%= raw(@notice.message) %>
-This err has occurred <%= pluralize @notice.problem.notices_count, 'time' %>. You should really look into it here:
+This error has occurred <%= pluralize @notice.problem.notices_count, 'time' %>. You should really look into it here:
   <%= app_problem_url(@app, @notice.problem) %>
@@ -6,13 +6,13 @@
           %td.content(valign="top")
             %div
               %p
-                An err has just occurred in
+                An error has just occurred in
                 = link_to(@app.name, app_url(@app), :class => "bold") << ","
                 on the
                 %span.bold= @notice.environment_name
                 environment.
                 %br
-                This err has occurred #{pluralize @notice.problem.notices_count, 'time'}.
+                This error has occurred #{pluralize @notice.problem.notices_count, 'time'}.
               %p
                 = link_to("Click here to view the error on Errbit", app_problem_url(@app, @notice.problem), :class => "bold") << "."
 %tr
-An err has just occurred in <%= @notice.environment_name %>: <%= raw(@notice.message) %>
+An error has just occurred in <%= @notice.environment_name %>: <%= raw(@notice.message) %>
-This err has occurred <%= pluralize @notice.problem.notices_count, 'time' %>. You should really look into it here:
+This error has occurred <%= pluralize @notice.problem.notices_count, 'time' %>. You should really look into it here:
   <%= app_problem_url(@app, @notice.problem) %>
@@ -12,8 +12,8 @@ en:
         success: "'%{app_name}' was successfully destroyed."
   n_errs_have:
-    one:   "%{count} err has"
-    other: "%{count} errs have"
+    one:   "%{count} error has"
+    other: "%{count} errors have"
   layouts:
     application:
@@ -102,7 +102,7 @@ en:
       regenerate_api_key: "Regenerate API key"
     show:
       all_deploys: "All Deploys (%{count})"
-      all_errs: all errs
+      all_errs: all errors
       all_users_notified: "All users will be notified when something happens."
       api_key: "API Key:"
       are_you_sure: 'Are you sure?'
@@ -116,12 +116,12 @@ en:
       latest_deploys: Latest Deploys
       message: Message
       no_deploys:  No deploys
-      no_error_yet: "No errs have been caught yet, make sure you setup your app"
+      no_error_yet: "No errors have been caught yet, make sure you setup your app"
       no_watcher: "Sadly, no one is watching this app"
       repository: Repository
       revision: Revision
       show_hide: "(show/hide)"
-      unresolved_errs: unresolved errs
+      unresolved_errs: unresolved errors
       unwatch: unwatch
       user_or_email: User or Email
       watchers: Watchers
@@ -405,12 +405,12 @@ describe ProblemsController, type: &#39;controller&#39; do
       it "should display a message about 1 err" do
         post :resolve_several, :problems => [@problem2.id.to_s]
-        expect(flash[:success]).to match(/1 err has been resolved/)
+        expect(flash[:success]).to match(/1 error has been resolved/)
       end
       it "should display a message about 2 errs" do
         post :resolve_several, :problems => [@problem1.id.to_s, @problem2.id.to_s]
-        expect(flash[:success]).to match(/2 errs have been resolved/)
+        expect(flash[:success]).to match(/2 errors have been resolved/)
         expect(controller.selected_problems).to eq [@problem1, @problem2]
       end
     end
@@ -92,7 +92,7 @@ describe Mailer do
     end
     it "should have the notices count in the body" do
-      expect(@email).to have_body_text("This err has occurred 2 times")
+      expect(@email).to have_body_text("This error has occurred 2 times")
     end
     it "should have the comment body" do
@@ -17,14 +17,14 @@ describe &quot;apps/show.html.haml&quot;, type: &#39;view&#39; do
     it "should confirm the 'cancel' link" do
       render
-      expect(action_bar).to have_selector('a.button', :text => 'all errs')
+      expect(action_bar).to have_selector('a.button', :text => 'all errors')
     end
   end
   context "without errs" do
     it 'see no errs' do
       render
-      expect(rendered).to match(/No errs have been/)
+      expect(rendered).to match(/No errors have been/)
     end
   end
	@@ -78,7 +78,7 @@ class ProblemsController < ApplicationController		@@ -78,7 +78,7 @@ class ProblemsController < ApplicationController
78		78
79	def resolve	79	def resolve
80	problem.resolve!	80	problem.resolve!
81	- flash[:success] = 'Great news everyone! The err has been resolved.'	81	+ flash[:success] = 'Great news everyone! The error has been resolved.'
82	redirect_to :back	82	redirect_to :back
83	rescue ActionController::RedirectBackError	83	rescue ActionController::RedirectBackError
84	redirect_to app_path(app)	84	redirect_to app_path(app)
	@@ -13,7 +13,7 @@		@@ -13,7 +13,7 @@
13	%span.bold= @problem.environment	13	%span.bold= @problem.environment
14	environment.	14	environment.
15	%br	15	%br
16	- This err has occurred #{pluralize @problem.notices_count, 'time'}.	16	+ This error has occurred #{pluralize @problem.notices_count, 'time'}.
17	%p	17	%p
18	= link_to("Click here to view the error and add a comment on Errbit", app_problem_url(@app, @problem), :class => "bold") << "."	18	= link_to("Click here to view the error and add a comment on Errbit", app_problem_url(@app, @problem), :class => "bold") << "."
19		19
1	<%= @user.name %> has just commented on an error that occurred in <%= @notice.environment_name %>: <%= raw(@notice.message) %>	1	<%= @user.name %> has just commented on an error that occurred in <%= @notice.environment_name %>: <%= raw(@notice.message) %>
2		2
3	-This err has occurred <%= pluralize @notice.problem.notices_count, 'time' %>. You should really look into it here:	3	+This error has occurred <%= pluralize @notice.problem.notices_count, 'time' %>. You should really look into it here:
4		4
5	<%= app_problem_url(@app, @notice.problem) %>	5	<%= app_problem_url(@app, @notice.problem) %>
6		6
	@@ -6,13 +6,13 @@		@@ -6,13 +6,13 @@
6	%td.content(valign="top")	6	%td.content(valign="top")
7	%div	7	%div
8	%p	8	%p
9	- An err has just occurred in	9	+ An error has just occurred in
10	= link_to(@app.name, app_url(@app), :class => "bold") << ","	10	= link_to(@app.name, app_url(@app), :class => "bold") << ","
11	on the	11	on the
12	%span.bold= @notice.environment_name	12	%span.bold= @notice.environment_name
13	environment.	13	environment.
14	%br	14	%br
15	- This err has occurred #{pluralize @notice.problem.notices_count, 'time'}.	15	+ This error has occurred #{pluralize @notice.problem.notices_count, 'time'}.
16	%p	16	%p
17	= link_to("Click here to view the error on Errbit", app_problem_url(@app, @notice.problem), :class => "bold") << "."	17	= link_to("Click here to view the error on Errbit", app_problem_url(@app, @notice.problem), :class => "bold") << "."
18	%tr	18	%tr
1	-An err has just occurred in <%= @notice.environment_name %>: <%= raw(@notice.message) %>	1	+An error has just occurred in <%= @notice.environment_name %>: <%= raw(@notice.message) %>
2		2
3	-This err has occurred <%= pluralize @notice.problem.notices_count, 'time' %>. You should really look into it here:	3	+This error has occurred <%= pluralize @notice.problem.notices_count, 'time' %>. You should really look into it here:
4		4
5	<%= app_problem_url(@app, @notice.problem) %>	5	<%= app_problem_url(@app, @notice.problem) %>
6		6
	@@ -12,8 +12,8 @@ en:		@@ -12,8 +12,8 @@ en:
12	success: "'%{app_name}' was successfully destroyed."	12	success: "'%{app_name}' was successfully destroyed."
13		13
14	n_errs_have:	14	n_errs_have:
15	- one: "%{count} err has"
16	- other: "%{count} errs have"	15	+ one: "%{count} error has"
		16	+ other: "%{count} errors have"
17		17
18	layouts:	18	layouts:
19	application:	19	application:
	@@ -102,7 +102,7 @@ en:		@@ -102,7 +102,7 @@ en:
102	regenerate_api_key: "Regenerate API key"	102	regenerate_api_key: "Regenerate API key"
103	show:	103	show:
104	all_deploys: "All Deploys (%{count})"	104	all_deploys: "All Deploys (%{count})"
105	- all_errs: all errs	105	+ all_errs: all errors
106	all_users_notified: "All users will be notified when something happens."	106	all_users_notified: "All users will be notified when something happens."
107	api_key: "API Key:"	107	api_key: "API Key:"
108	are_you_sure: 'Are you sure?'	108	are_you_sure: 'Are you sure?'
	@@ -116,12 +116,12 @@ en:		@@ -116,12 +116,12 @@ en:
116	latest_deploys: Latest Deploys	116	latest_deploys: Latest Deploys
117	message: Message	117	message: Message
118	no_deploys: No deploys	118	no_deploys: No deploys
119	- no_error_yet: "No errs have been caught yet, make sure you setup your app"	119	+ no_error_yet: "No errors have been caught yet, make sure you setup your app"
120	no_watcher: "Sadly, no one is watching this app"	120	no_watcher: "Sadly, no one is watching this app"
121	repository: Repository	121	repository: Repository
122	revision: Revision	122	revision: Revision
123	show_hide: "(show/hide)"	123	show_hide: "(show/hide)"
124	- unresolved_errs: unresolved errs	124	+ unresolved_errs: unresolved errors
125	unwatch: unwatch	125	unwatch: unwatch
126	user_or_email: User or Email	126	user_or_email: User or Email
127	watchers: Watchers	127	watchers: Watchers
	@@ -405,12 +405,12 @@ describe ProblemsController, type: 'controller' do		@@ -405,12 +405,12 @@ describe ProblemsController, type: 'controller' do
405		405
406	it "should display a message about 1 err" do	406	it "should display a message about 1 err" do
407	post :resolve_several, :problems => [@problem2.id.to_s]	407	post :resolve_several, :problems => [@problem2.id.to_s]
408	- expect(flash[:success]).to match(/1 err has been resolved/)	408	+ expect(flash[:success]).to match(/1 error has been resolved/)
409	end	409	end
410		410
411	it "should display a message about 2 errs" do	411	it "should display a message about 2 errs" do
412	post :resolve_several, :problems => [@problem1.id.to_s, @problem2.id.to_s]	412	post :resolve_several, :problems => [@problem1.id.to_s, @problem2.id.to_s]
413	- expect(flash[:success]).to match(/2 errs have been resolved/)	413	+ expect(flash[:success]).to match(/2 errors have been resolved/)
414	expect(controller.selected_problems).to eq [@problem1, @problem2]	414	expect(controller.selected_problems).to eq [@problem1, @problem2]
415	end	415	end
416	end	416	end
	@@ -92,7 +92,7 @@ describe Mailer do		@@ -92,7 +92,7 @@ describe Mailer do
92	end	92	end
93		93
94	it "should have the notices count in the body" do	94	it "should have the notices count in the body" do
95	- expect(@email).to have_body_text("This err has occurred 2 times")	95	+ expect(@email).to have_body_text("This error has occurred 2 times")
96	end	96	end
97		97
98	it "should have the comment body" do	98	it "should have the comment body" do
	@@ -17,14 +17,14 @@ describe "apps/show.html.haml", type: 'view' do		@@ -17,14 +17,14 @@ describe "apps/show.html.haml", type: 'view' do
17	it "should confirm the 'cancel' link" do	17	it "should confirm the 'cancel' link" do
18	render	18	render
19		19
20	- expect(action_bar).to have_selector('a.button', :text => 'all errs')	20	+ expect(action_bar).to have_selector('a.button', :text => 'all errors')
21	end	21	end
22	end	22	end
23		23
24	context "without errs" do	24	context "without errs" do
25	it 'see no errs' do	25	it 'see no errs' do
26	render	26	render
27	- expect(rendered).to match(/No errs have been/)	27	+ expect(rendered).to match(/No errors have been/)
28	end	28	end
29	end	29	end
30		30