Remove duplicate translations

Remove duplicate translations

diff --git a/app/views/static/show.html.erb b/app/views/static/show.html.erb
index 0f71b30..d406979 100644
--- a/app/views/static/show.html.erb
+++ b/app/views/static/show.html.erb
@@ -2,16 +2,16 @@
   <meta itemprop='lastReviewed' content='<%= @topic.first_post.updated_at.to_date.to_formatted_s(:iso_8601) %>'>
   <ul class='nav-pills' role='navigation' itemscope itemtype='http://schema.org/SiteNavigationElement'>
     <% unless SiteSetting.login_required? && current_user.nil? %>
-      <li class="nav-item-about"><%= link_to t('about'), about_index_path %></a></li>
+      <li class="nav-item-about"><%= link_to t('js.about.simple_title'), about_index_path %></a></li>
       <% if @faq_overriden %>
-        <li class='nav-item-guidelines'><a class='<%= @page == 'faq' ? 'active' : '' %>' href='<%= guidelines_path %>'><%= t 'guidelines' %></a></li>
+        <li class='nav-item-guidelines'><a class='<%= @page == 'faq' ? 'active' : '' %>' href='<%= guidelines_path %>'><%= t 'js.guidelines' %></a></li>
         <li class='nav-item-faq'><a href='<%= faq_path %>'><%= t 'js.faq' %></a></li>
       <% else %>
         <li class='nav-item-faq'><a class='<%= @page == 'faq' ? 'active' : '' %>' href='<%=faq_path%>'><%= t 'js.faq' %></a></li>
       <% end %>
     <% end %>
-    <li class='nav-item-tos'><a href='<%= tos_path %>' class='<%= @page == 'tos' ? 'active' : '' %>'><%= t 'terms_of_service.title' %></a></li>
-    <li class='nav-item-privacy'><a href='<%= privacy_path %>' class='<%= @page == 'privacy' ? 'active' : '' %>'><%= t 'privacy' %></a></li>
+    <li class='nav-item-tos'><a href='<%= tos_path %>' class='<%= @page == 'tos' ? 'active' : '' %>'><%= t 'js.tos' %></a></li>
+    <li class='nav-item-privacy'><a href='<%= privacy_path %>' class='<%= @page == 'privacy' ? 'active' : '' %>'><%= t 'js.privacy' %></a></li>
   </ul>
 
   <% if staff? %>
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 0772cbb..b92d635 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -3570,10 +3570,6 @@ en:
     summer_theme_name: "Summer"
     dark_rose_theme_name: "Dark Rose"
 
-  about: "About"
-  guidelines: "Guidelines"
-  privacy: "Privacy"
-
   edit_this_page: "Edit this page"
 
   csv_export:
diff --git a/spec/requests/static_controller_spec.rb b/spec/requests/static_controller_spec.rb
index 0f41218..6c542a1 100644
--- a/spec/requests/static_controller_spec.rb
+++ b/spec/requests/static_controller_spec.rb
@@ -135,8 +135,8 @@ describe StaticController do
     end
 
     [
-      ['tos', :tos_url, I18n.t('terms_of_service.title')],
-      ['privacy', :privacy_policy_url, I18n.t('privacy')]
+      ['tos', :tos_url, I18n.t('js.tos')],
+      ['privacy', :privacy_policy_url, I18n.t('js.privacy')]
     ].each do |id, setting_name, text|
 
       context "#{id}" do
@@ -222,7 +222,7 @@ describe StaticController do
           get "/#{page_name}"
 
           expect(response.status).to eq(200)
-          expect(response.body).to include(I18n.t('guidelines'))
+          expect(response.body).to include(I18n.t('js.guidelines'))
         end
       end
     end

GitHub sha: 58f72cd4

1 Like

This commit has been mentioned on Discourse Meta. There might be relevant details there:

This commit has been mentioned on Discourse Meta. There might be relevant details there: