Make tab labels into nouns that describe what's on the tab

I think that works better with tabs, whereas actions (verbs) work better with buttons.

diff --git a/app/views/traces/index.html.erb b/app/views/traces/index.html.erb
index 7668532aa32b14380ecc6ef9e757284089f0ff98..fa4e57f4751d9d1217c4b1e57ca152547fa1ad74 100644 (file)
--- a/app/views/traces/index.html.erb
+++ b/app/views/traces/index.html.erb
@@ -12,33 +12,33 @@
       <% if @target_user.blank? %>
         <!-- public traces -->
         <li class="nav-item">
       <% if @target_user.blank? %>
         <!-- public traces -->
         <li class="nav-item">

-          <%= link_to t(".see_all_traces"), { :controller => "traces", :action => "index", :display_name => nil, :page => nil }, { :class => "nav-link active" } %>
+          <%= link_to t(".all_traces"), { :controller => "traces", :action => "index", :display_name => nil, :page => nil }, { :class => "nav-link active" } %>

         </li>
         <% if current_user %>
           <li class="nav-item">
         </li>
         <% if current_user %>
           <li class="nav-item">

-            <%= link_to t(".see_my_traces"), { :action => "mine", :page => nil }, { :class => "nav-link" } %>
+            <%= link_to t(".my_traces"), { :action => "mine", :page => nil }, { :class => "nav-link" } %>

           </li>
         <% end %>
       <% elsif current_user && current_user == @target_user %>
         <li class="nav-item">
           </li>
         <% end %>
       <% elsif current_user && current_user == @target_user %>
         <li class="nav-item">

-          <%= link_to t(".see_all_traces"), { :controller => "traces", :action => "index", :display_name => nil, :page => nil }, { :class => "nav-link" } %>
+          <%= link_to t(".all_traces"), { :controller => "traces", :action => "index", :display_name => nil, :page => nil }, { :class => "nav-link" } %>

         </li>
         <!-- my traces -->
         <li class="nav-item">
         </li>
         <!-- my traces -->
         <li class="nav-item">

-          <%= link_to t(".see_my_traces"), { :action => "mine", :page => nil }, { :class => "nav-link active" } %>
+          <%= link_to t(".my_traces"), { :action => "mine", :page => nil }, { :class => "nav-link active" } %>

         </li>
       <% else %>
         <!-- public_traces_from @target_user -->
         <li class="nav-item">
         </li>
       <% else %>
         <!-- public_traces_from @target_user -->
         <li class="nav-item">

-          <%= link_to t(".see_all_traces"), { :controller => "traces", :action => "index", :display_name => nil, :page => nil }, { :class => "nav-link" } %>
+          <%= link_to t(".all_traces"), { :controller => "traces", :action => "index", :display_name => nil, :page => nil }, { :class => "nav-link" } %>

         </li>
         <% if current_user && current_user != @target_user %>
           <li class="nav-item">
         </li>
         <% if current_user && current_user != @target_user %>
           <li class="nav-item">

-            <%= link_to t(".see_my_traces"), { :action => "mine", :page => nil }, { :class => "nav-link" } %>
+            <%= link_to t(".my_traces"), { :action => "mine", :page => nil }, { :class => "nav-link" } %>

           </li>
         <% end %>
         <li class="nav-item">
           </li>
         <% end %>
         <li class="nav-item">

-          <%= link_to t(".see_public_traces_from", :user => @target_user&.display_name), { :action => "mine", :page => nil }, { :class => "nav-link active" } %>
+          <%= link_to t(".public_traces_from", :user => @target_user&.display_name), { :action => "mine", :page => nil }, { :class => "nav-link active" } %>

         </li>
       <% end %>
     </li>
         </li>
       <% end %>
     </li>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 919a786c8f01f07a09964c91d11070fa41909500..93d9fb61dcd2933863e5389462de3c7406a0edb0 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2221,9 +2221,9 @@ en:
       tagged_with: " tagged with %{tags}"
       empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
       upload_trace: "Upload a trace"
       tagged_with: " tagged with %{tags}"
       empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
       upload_trace: "Upload a trace"

-      see_all_traces: "See all traces"
-      see_my_traces: "See my traces"
-      see_public_traces_from: "See Public Traces From"
+      all_traces: "All Traces"
+      my_traces: "My Traces"
+      traces_from: "Public Traces from %{user}"

       remove_tag_filter: "Remove Tag Filter"
     destroy:
       scheduled_for_deletion: "Trace scheduled for deletion"
       remove_tag_filter: "Remove Tag Filter"
     destroy:
       scheduled_for_deletion: "Trace scheduled for deletion"