Commit e9f1eae6

@@ -34,7 +34,7 @@
               <i class="fa fa-cog"></i> Settings
             <% end %>
             <%= link_to logout_path, method: :delete, class: 'dropdown-item' do %>
-              <i class="fa fa-sign-out"></i> Sign Out
+              <i class="fa fa-sign-out"></i> <%= t('logout') %>
             <% end %>
           </div>
         </li>

@@ -2,26 +2,26 @@
   <%= avatar_for(current_user) %>
 <% end %>
 <div class="nav flex-column nav-pills" id="v-pills-tab" role="tablist">
-  <%= link_to "Dashboard", my_dashboard_path, class: "nav-link #{"active" if controller?(:dashboard)}" %>
+  <%= link_to t('.dashboard'), my_dashboard_path, class: "nav-link #{"active" if controller?(:dashboard)}" %>
   <%= link_to my_root_path(anchor: 'cakes/new'), class: "nav-link" do %>
-    <i class="fa fa-upload"></i> Cake
+    <i class="fa fa-upload"></i> <%= t(".new_cake") %>
   <% end %>
   <%= link_to my_root_path(anchor: 'tutorials/new'), class: "nav-link" do %>
-    <i class="fa fa-pencil-square"></i> Tutorial
+    <i class="fa fa-pencil-square"></i> <%= t('.new_tutorial') %>
   <% end %>
-  <%= link_to "My Profile", my_root_path(anchor: 'profile/me'), class: "nav-link" %>
-  <%= link_to "My Favorites", my_favorites_path, class: "nav-link #{"active" if controller?(:favorites)}" %>
-  <%= link_to "My Photo", new_my_avatar_path, class: "nav-link #{"active" if controller?(:avatars)}" %>
+  <%= link_to t(".my_profile"), my_root_path(anchor: 'profile/me'), class: "nav-link" %>
+  <%= link_to t(".favorites"), my_favorites_path, class: "nav-link #{"active" if controller?(:favorites)}" %>
+  <%= link_to t('.avatar'), new_my_avatar_path, class: "nav-link #{"active" if controller?(:avatars)}" %>
   <%= link_to t('.change_password'), my_passwords_path, class: "nav-link #{"active" if controller?(:passwords)}" %>
 
   <% if current_user.admin? %>
-    <h5>Admin</h5>
-    <%= link_to "Users", admin_users_path, class: "nav-link" %>
-    <%= link_to "Jobs", admin_jobs_path, class: "nav-link" %>
-    <%= link_to "Activity", admin_activities_path, class: "nav-link" %>
-    <%= link_to "Photos", admin_photos_path, class: "nav-link" %>
-    <%= link_to "Sessions", admin_sessions_path, class: "nav-link" %>
-    <%= link_to "Products", admin_products_path, class: "nav-link" %>
+    <h5><%= t(".admin") %></h5>
+    <%= link_to t(".users"), admin_users_path, class: "nav-link" %>
+    <%= link_to t(".jobs"), admin_jobs_path, class: "nav-link" %>
+    <%= link_to t(".activity"), admin_activities_path, class: "nav-link" %>
+    <%= link_to t(".photos"), admin_photos_path, class: "nav-link" %>
+    <%= link_to t(".sessions"), admin_sessions_path, class: "nav-link" %>
+    <%= link_to t(".products"), admin_products_path, class: "nav-link" %>
   <% end %>
 
   <%= link_to t('.logout'), logout_path, method: :delete, class: "nav-link" %>

@@ -1,27 +0,0 @@
-<div class="row">
-  <div class="col">
-    <ul class="nav nav-tabs">
-      <li class="pull-right"><%= link_to t('.logout'), logout_path, method: :delete, class: "btn btn-inverse" %></li>
-      <% if current_user.admin? %>
-      <li class="pull-right"><%= link_to t('.admin'), admin_root_path %></li>
-      <% end %>
-      <li class="dropdown pull-right">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#"> 
-          <i class="icon-plus"></i> <b class="caret"></b>
-        </a>
-        <ul class="dropdown-menu">
-          <li>
-            <%= link_to my_root_path(anchor: 'cakes/new') do %>
-              <i class="icon-camera"></i> New Cake
-            <% end %>
-          </li>
-          <li>
-            <%= link_to my_root_path(anchor: 'tutorials/new') do %>
-              <i class="icon-edit"></i> New Tutorial
-            <% end %>
-          </li>
-        </ul>
-      </li>
-    </ul>
-  </div>
-</div>

@@ -1,6 +0,0 @@
----
-en:
-  my:
-    shared:
-      my_nav:
-        change_password: "Change My Password"

@@ -1,12 +1,22 @@
 ---
 en:
   avatar_uploaded: Your avatar has been updated.
+  logout: Sign Out
   my:
     shared:
       my_nav:
-        logout: Log Out
+        activity: "Activity"
+        admin: "Admin"
+        avatar: "My Photo"
+        change_password: "Change My Password"
+        dashboard: "Dashboard"
+        favorites: "My Favorites"
+        jobs: "Jobs"
+        my_profile: "My Profile"
+        new_cake: "Cake"
+        new_tutorial: "Tutorial"
+        photos: "Photos"
+        products: "Products"
+        sessions: "Sessions"
+        users: "Users"
   profile_saved: Your settings have been updated successfully!
-  shared:
-    account_nav:
-      admin: Admin
-      logout: Logout

@@ -17,7 +17,7 @@ describe "Logins" do
       end
 
       it "logs the user in" do
-        expect(page).to have_content("Log Out")
+        expect(page).to have_content(I18n.t("logout"))
       end
 
       it "has no errors" do

@@ -6,6 +6,6 @@ class DashboardPage < WebPage
   end
 
   def logout
-    click_link("Sign Out")
+    click_link(I18n.t("logout"))
   end
 end