Skip to content

Commit faa6a2a

Browse files
GaneshSPatilzabil
authored andcommitted
Removed the url from the not found page (#2584)
* Removed the url from the not found page * Changed the URL_NOT_FOUND error message
1 parent 4a8fbd8 commit faa6a2a

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

common/src/com/thoughtworks/go/i18n/LocalizedMessage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ public static Localizable X_of_Y(Object x, Object y) {
9292
return new LocalizedKeyValueMessage(LocalizedKeyValueMessage.X_OF_Y, x, y);
9393
}
9494

95-
public static Localizable urlNotKnown(String url) {
96-
return new LocalizedKeyValueMessage(LocalizedKeyValueMessage.URL_NOT_KNOWN, url);
95+
public static Localizable urlNotKnown() {
96+
return new LocalizedKeyValueMessage(LocalizedKeyValueMessage.URL_NOT_KNOWN);
9797
}
9898

9999
public static Localizable stageNotFound(StageIdentifier stageLocator) {

server/webapp/WEB-INF/rails.new/app/controllers/application_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def request_from_localhost?
9898
end
9999

100100
def unresolved
101-
render_error_response l.urlNotKnown(url_for), 404, false
101+
render_error_response l.urlNotKnown, 404, false
102102
end
103103

104104
def error_template_for_request

server/webapp/WEB-INF/rails.new/spec/controllers/application_controller_view_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
it "should render a pretty payload with message" do
136136
@controller.stub(:url_for).and_return("foo/bar")
137137
get :unresolved
138-
expect(response.body).to have_selector("h3", :text=>"The url [ foo/bar ] you are trying to reach doesn't appear to be correct.")
138+
expect(response.body).to have_selector("h3", :text=>"The url you are trying to reach appears to be incorrect.")
139139
end
140140

141141
it "should render a 404" do

server/webapp/localize.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
<entry key="FAILED_JOBS">Failed: {0}</entry>
120120
<entry key="IN_PROGRESS_JOBS">In Progress: {0}</entry>
121121
<entry key="UNABLE_TO_RETRIEVE_FAILURE_RESULTS">Unable to retrieve failure results.</entry>
122-
<entry key="URL_NOT_KNOWN">The url [ {0} ] you are trying to reach doesn''t appear to be correct.</entry>
122+
<entry key="URL_NOT_KNOWN">The url you are trying to reach appears to be incorrect.</entry>
123123
<entry key="ELAPSED">Elapsed</entry>
124124
<entry key="CURRENT_FAILURES_BY_PIPELINE_HISTORY">Current Failures by Pipeline History</entry>
125125
<entry key="TOTAL:">Total:</entry>

server/webapp/localize_ja.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
<entry key="FAILED_JOBS">Failed: {0}</entry>
117117
<entry key="IN_PROGRESS_JOBS">In Progress: {0}</entry>
118118
<entry key="UNABLE_TO_RETRIEVE_FAILURE_RESULTS">Unable to retrieve failure results.</entry>
119-
<entry key="URL_NOT_KNOWN">The url [ {0} ] you are trying to reach doesn''t appear to be correct.</entry>
119+
<entry key="URL_NOT_KNOWN">The url you are trying to reach appears to be incorrect.</entry>
120120
<entry key="ELAPSED">Elapsed</entry>
121121
<entry key="CURRENT_FAILURES_BY_PIPELINE_HISTORY">Current Failures by Pipeline History</entry>
122122
<entry key="TOTAL:">Total:</entry>

0 commit comments

Comments
 (0)