Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate translations

This commit is contained in:
Gerhard Schlager 2019-05-22 15:29:15 +02:00
parent 40c903ec23
commit 58f72cd439
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/static/show.html.erb
View File

@ -2,16 +2,16 @@
<meta itemprop='lastReviewed' content='<%= @topic.first_post.updated_at.to_date.to_formatted_s(:iso_8601) %>'> <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'> <ul class='nav-pills' role='navigation' itemscope itemtype='http://schema.org/SiteNavigationElement'>
<% unless SiteSetting.login_required? && current_user.nil? %> <% 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 %> <% 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> <li class='nav-item-faq'><a href='<%= faq_path %>'><%= t 'js.faq' %></a></li>
<% else %> <% else %>
<li class='nav-item-faq'><a class='<%= @page == 'faq' ? 'active' : '' %>' href='<%=faq_path%>'><%= t 'js.faq' %></a></li> <li class='nav-item-faq'><a class='<%= @page == 'faq' ? 'active' : '' %>' href='<%=faq_path%>'><%= t 'js.faq' %></a></li>
<% end %> <% end %>
<% 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-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 'privacy' %></a></li> <li class='nav-item-privacy'><a href='<%= privacy_path %>' class='<%= @page == 'privacy' ? 'active' : '' %>'><%= t 'js.privacy' %></a></li>
</ul> </ul>
<% if staff? %> <% if staff? %>

4
config/locales/server.en.yml
View File

@ -3570,10 +3570,6 @@ en:
summer_theme_name: "Summer" summer_theme_name: "Summer"
dark_rose_theme_name: "Dark Rose" dark_rose_theme_name: "Dark Rose"
about: "About"
guidelines: "Guidelines"
privacy: "Privacy"
edit_this_page: "Edit this page" edit_this_page: "Edit this page"
csv_export: csv_export:

6
spec/requests/static_controller_spec.rb
View File

@ -135,8 +135,8 @@ describe StaticController do
end end
[ [
['tos', :tos_url, I18n.t('terms_of_service.title')], ['tos', :tos_url, I18n.t('js.tos')],
['privacy', :privacy_policy_url, I18n.t('privacy')] ['privacy', :privacy_policy_url, I18n.t('js.privacy')]
].each do |id, setting_name, text| ].each do |id, setting_name, text|
context "#{id}" do context "#{id}" do
@ -222,7 +222,7 @@ describe StaticController do
get "/#{page_name}" get "/#{page_name}"
expect(response.status).to eq(200) 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 end
end end