Go back to using < and > for navigation instead of the nasty looking

unicode arrows which aren't at all consistent with the use of | as the
separator.

Also remove some of the translations - there is no reason that I can
see to allow translations to completely change how the navigation control
is laid out.

diff --git a/app/views/browse/_navigation.html.erb b/app/views/browse/_navigation.html.erb
index b125ac75fceb92a6e2414ed832cb155c66147a83..88812c2bb6e29b63eafe225d832a2614f7cec37c 100644 (file)
--- a/app/views/browse/_navigation.html.erb
+++ b/app/views/browse/_navigation.html.erb
@@ -1,27 +1,30 @@
 <div style="float:right; text-align:center; width: 250px;">
   <% if @next_by_user or @prev_by_user %>
     <% if @prev_by_user %>
 <div style="float:right; text-align:center; width: 250px;">
   <% if @next_by_user or @prev_by_user %>
     <% if @prev_by_user %>

-       <%= link_to t('browse.changeset_navigation.user.prev', :id => @prev_by_user.id.to_s),
-           { :id => @prev_by_user.id },
-           { :title => t('browse.changeset_navigation.user.prev_tooltip', :user => @prev_by_user.user.display_name) } %>
-    |
+      &lt;
+      <%= link_to @prev_by_user.id.to_s,
+                  { :id => @prev_by_user.id },
+                  { :title => t('browse.changeset_navigation.user.prev_tooltip', :user => @prev_by_user.user.display_name) } %>
+      |

     <% end %>
     <%=
     user = (@prev_by_user || @next_by_user).user.display_name
     <% end %>
     <%=
     user = (@prev_by_user || @next_by_user).user.display_name

-    link_to(t('browse.changeset_navigation.user.name', :user => h(user)),
+    link_to h(user),

             { :controller => "changeset", :action => "list", :display_name => user },
             { :controller => "changeset", :action => "list", :display_name => user },

-            { :title => t('browse.changeset_navigation.user.name_tooltip', :user => h(user)) })
+            { :title => t('browse.changeset_navigation.user.name_tooltip', :user => h(user)) }

     %>
     <% if @next_by_user %>
     %>
     <% if @next_by_user %>

-    |
-      <%= link_to t('browse.changeset_navigation.user.next', :id => @next_by_user.id.to_s),
-         { :id => @next_by_user.id },
-         { :title => t('browse.changeset_navigation.user.next_tooltip', :user => @next_by_user.user.display_name) } %>
+      |
+      <%= link_to @next_by_user.id.to_s,
+                  { :id => @next_by_user.id },
+                  { :title => t('browse.changeset_navigation.user.next_tooltip', :user => @next_by_user.user.display_name) } %>
+      &gt;

     <% end %>
     <br/>
   <% end %>
   <% if @prev %>
     <% end %>
     <br/>
   <% end %>
   <% if @prev %>

-    <%= link_to t('browse.changeset_navigation.all.prev', :id => @prev.id.to_s),
+    &lt;
+    <%= link_to @prev.id.to_s,

                 { :id => @prev.id },
                 { :title => t('browse.changeset_navigation.all.prev_tooltip') } %>
   <% end %>
                 { :id => @prev.id },
                 { :title => t('browse.changeset_navigation.all.prev_tooltip') } %>
   <% end %>


@@ -29,8 +32,9 @@
     | 
   <% end %>
   <% if @next %>
     | 
   <% end %>
   <% if @next %>

-    <%= link_to t('browse.changeset_navigation.all.next', :id => @next.id.to_s),
+    <%= link_to @next.id.to_s,

                 { :id => @next.id },
                 { :title => t('browse.changeset_navigation.all.next_tooltip') } %>
                 { :id => @next.id },
                 { :title => t('browse.changeset_navigation.all.next_tooltip') } %>

+    &gt;

   <% end %>
 </div>
   <% end %>
 </div>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e0a89f93ccc5f419ca47702d7a5ff2d18e942f35..1bb1b5c4bc3ff3ac029bfbb786f1f92a4a35f46a 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -89,15 +89,10 @@ en:
       osmchangexml: "osmChange XML"
     changeset_navigation:
       user:
       osmchangexml: "osmChange XML"
     changeset_navigation:
       user:

-        name: "{{user}}"

         name_tooltip: "View edits by {{user}}"
         name_tooltip: "View edits by {{user}}"

-        prev: "← {{id}}"

         prev_tooltip: "Previous edit by {{user}}"
         prev_tooltip: "Previous edit by {{user}}"

-        next: "{{id}} →"

         next_tooltip: "Next edit by {{user}}"
       all:
         next_tooltip: "Next edit by {{user}}"
       all:

-        prev: "← {{id}}"
-        next: "{{id}} →"

         prev_tooltip: "Previous changeset"
         next_tooltip: "Next changeset"
     changeset_details:
         prev_tooltip: "Previous changeset"
         next_tooltip: "Next changeset"
     changeset_details:

diff --git a/config/locales/is.yml b/config/locales/is.yml
index a0919446113be9060fa9b567d0d06afbce8831f7..3f4e68fe24397fd01ebad015e18ac8a265eb3597 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -89,15 +89,10 @@ is:
       osmchangexml: "osmChange XML sniði"
     changeset_navigation:
       user:
       osmchangexml: "osmChange XML sniði"
     changeset_navigation:
       user:

-        name: "{{user}}"

         name_tooltip: "Skoða breytingarsett eftir {{user}}"
         name_tooltip: "Skoða breytingarsett eftir {{user}}"

-        prev: "← {{id}}"

         prev_tooltip: "Fyrri breytingarsett eftir {{user}}"
         prev_tooltip: "Fyrri breytingarsett eftir {{user}}"

-        next: "{{id}} →"

         next_tooltip: "Næsta breytingarsett eftir {{user}}"
       all:
         next_tooltip: "Næsta breytingarsett eftir {{user}}"
       all:

-        prev: "← {{id}}"
-        next: "{{id}} →"

         prev_tooltip: "Fyrra breytingarsett"
         next_tooltip: "Næsta breytingarsett"
     changeset_details:
         prev_tooltip: "Fyrra breytingarsett"
         next_tooltip: "Næsta breytingarsett"
     changeset_details: