Make error pages translatable

Fixes #3877

diff --git a/app/views/errors/_contact.html.erb b/app/views/errors/_contact.html.erb
new file mode 100644 (file)
index 0000000..4fe4e79
--- /dev/null
+++ b/app/views/errors/_contact.html.erb
@@ -0,0 +1,3 @@
+<p><%= t ".contact_the_community_html",
+         :contact_link => link_to(t(".contact"), t(".contact_url"),
+                                  :title => t(".contact_url_title")) %></p>

diff --git a/app/views/errors/forbidden.html.erb b/app/views/errors/forbidden.html.erb
index 6901ec1d59fe2716693d60ae5e938f3f217a5df6..036517bddc65d90d570fefc4ba4df62f5af80391 100644 (file)
--- a/app/views/errors/forbidden.html.erb
+++ b/app/views/errors/forbidden.html.erb
@@ -1,3 +1,3 @@
-<h1>Forbidden</h1>
-<p>The operation you requested on the OpenStreetMap server is only available to administrators (HTTP 403)</p>
-<p>Feel free to <a href="http://wiki.openstreetmap.org/wiki/Contact" title="Various contact channels explained">contact</a> the OpenStreetMap community if you have found a broken link / bug. Make a note of the exact URL of your request.</p>
+<h1><%= t ".title" %></h1>
+<p><%= t ".description" %></p>
+<%= render :partial => "contact" %>

diff --git a/app/views/errors/internal_server_error.html.erb b/app/views/errors/internal_server_error.html.erb
index a2b1ba6f7d0f1fa198d7e5b24c8a9091824ce11e..036517bddc65d90d570fefc4ba4df62f5af80391 100644 (file)
--- a/app/views/errors/internal_server_error.html.erb
+++ b/app/views/errors/internal_server_error.html.erb
@@ -1,4 +1,3 @@
-<h1>Application error</h1>
-<p>The OpenStreetMap server encountered an unexpected condition that prevented it from fulfilling the request (HTTP 500)</p>
-<p>Feel free to <a href="http://wiki.openstreetmap.org/wiki/Contact" title="Various contact channels explained">contact</a> the OpenStreetMap community if your problem persists. Make a note of the exact URL / post data of your request.</p>
-<p>This may be a problem in our Ruby On Rails code. 500 occurs with exceptions thrown outside of an action (like in Dispatcher setups or broken Ruby code)</p>
+<h1><%= t ".title" %></h1>
+<p><%= t ".description" %></p>
+<%= render :partial => "contact" %>

diff --git a/app/views/errors/not_found.html.erb b/app/views/errors/not_found.html.erb
index bf4744b5aa88757461cced075df4061f84ab9d92..036517bddc65d90d570fefc4ba4df62f5af80391 100644 (file)
--- a/app/views/errors/not_found.html.erb
+++ b/app/views/errors/not_found.html.erb
@@ -1,3 +1,3 @@
-<h1>File not found</h1>
-<p>Couldn't find a file/directory/API operation by that name on the OpenStreetMap server (HTTP 404)</p>
-<p>Feel free to <a href="http://wiki.openstreetmap.org/wiki/Contact" title="Various contact channels explained">contact</a> the OpenStreetMap community if you have found a broken link / bug. Make a note of the exact URL of your request.</p>
+<h1><%= t ".title" %></h1>
+<p><%= t ".description" %></p>
+<%= render :partial => "contact" %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index dbc5272c52dae3f4335193a53ae3064e7235ad10..6b65a5cf4e0d8402e44880159d7a5e14a14ce039 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -573,6 +573,21 @@ en:
       applications:
         create:
           notice: Application Registered.
+  errors:
+    contact:
+      contact_url: https://wiki.openstreetmap.org/wiki/Contact
+      contact_url_title: Various contact channels explained
+      contact: contact
+      contact_the_community_html: Feel free to %{contact_link} the OpenStreetMap community if you have found a broken link / bug. Make a note of the exact URL of your request.
+    forbidden:
+      title: Forbidden
+      description: The operation you requested on the OpenStreetMap server is only available to administrators (HTTP 403)
+    internal_server_error:
+      title: Application error
+      description: The OpenStreetMap server encountered an unexpected condition that prevented it from fulfilling the request (HTTP 500)
+    not_found:
+      title: File not found
+      description: Couldn't find a file/directory/API operation by that name on the OpenStreetMap server (HTTP 404)
   friendships:
     make_friend:
       heading: "Add %{user} as a friend?"