Make node/way/relation which is fed into the the 'browse.not_found.sorry' message...

diff --git a/app/views/browse/not_found.rhtml b/app/views/browse/not_found.rhtml
index 82a81afa5dddf3c83c91dbed29ed35b4cf12b537..743ab0c8e0bb6543e427a1c99065b1f63c218649 100644 (file)
--- a/app/views/browse/not_found.rhtml
+++ b/app/views/browse/not_found.rhtml
@@ -1 +1,8 @@
-<p><%= t'browse.not_found.sorry', :type=> @type , :id => params[:id] %></p>
+<%
+  browse_not_found_type = {
+    'node' => I18n.t('browse.not_found.type.node'),
+    'way' => I18n.t('browse.not_found.type.way'),
+    'relation' => I18n.t('browse.not_found.type.relation'),
+  };
+%>
+<p><%= t'browse.not_found.sorry', :type=> browse_not_found_type[@type] , :id => params[:id] %></p>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3203cd975874dd6638af6cdc1c2b71c9e09c4adb..0a7e589af0b954bd232f4ce278cfa61bb3d092a1 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -120,6 +120,10 @@ en:
       view_history: "view history"
     not_found:
       sorry: "Sorry, the {{type}} with the id {{id}}, could not be found."
       view_history: "view history"
     not_found:
       sorry: "Sorry, the {{type}} with the id {{id}}, could not be found."

+      type:
+        node: node
+        way: way
+        relation: relation

     paging_nav:
       showing_page: "Showing page"
       of: "of"
     paging_nav:
       showing_page: "Showing page"
       of: "of"

diff --git a/config/locales/is.yml b/config/locales/is.yml
index b76bd98f3cf9917a4ecd5f0e456eb74de4315712..76fc9e5390638fcdcdb736b05a3e051e536b79f2 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -119,7 +119,11 @@ is:
       download_xml: "Hala niður á XML sniði"
       view_history: "sýna breytingarsögu"
     not_found:
       download_xml: "Hala niður á XML sniði"
       view_history: "sýna breytingarsögu"
     not_found:

-      sorry: "Sorry, the {{type}} with the id {{id}}, could not be found."
+      sorry: "Því miður {{type}} með kennitöluna {{id}}."
+      type:
+        node: fannst ekki hnútur
+        way: fannst ekki vegur
+        relation: fundust ekki vensli

     paging_nav:
       showing_page: "Sýni síðu"
       of: "af"
     paging_nav:
       showing_page: "Sýni síðu"
       of: "af"