FEATURE: /guidelines route will always show our FAQ, ignoring the faq_url site setting

app/assets/javascripts/discourse/controllers/static_controller.js

@@ -11,7 +11,7 @@ Discourse.StaticController = Em.ObjectController.extend({
 });
 
 Discourse.StaticController.reopenClass({
-  PAGES: ['faq', 'tos', 'privacy', 'login'],
+  PAGES: ['faq', 'tos', 'privacy', 'login', 'guidelines'],
   CONFIGS: {
     'faq': 'faq_url',
     'tos': 'tos_url',

app/controllers/static_controller.rb

@@ -20,6 +20,9 @@ class StaticController < ApplicationController
       return redirect_to(url) unless url.blank?
     end
 
+    # The /guidelines route ALWAYS shows our FAQ, ignoring the faq_url site setting.
+    page = 'faq' if page == 'guidelines'
+
     # Don't allow paths like ".." or "/" or anything hacky like that
     page.gsub!(/[^a-z0-9\_\-]/, '')
 
@@ -35,6 +38,7 @@ class StaticController < ApplicationController
     end
 
     if lookup_context.find_all("#{file}.html").any?
+      @faq_overriden = !SiteSetting.faq_url.blank?
       render file, layout: !request.xhr?, formats: [:html]
       return
     end

app/views/static/faq.cs.html.erb

@@ -1,5 +1,10 @@
 <ul class="nav-pills">
-  <li><a class="active" href="<%=faq_path%>">FAQ</a></li>
+  <% if @faq_overriden %>
+    <li><a class="active" href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
+    <li><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
+  <% else %>
+    <li><a class="active" href="<%=faq_path%>"><%=t "js.faq" %></a></li>
+  <% end %>
   <li><a href="<%=tos_path%>">Podmínky používání</a></li>
   <li><a href="<%=privacy_path%>">Ochrana soukromí</a></li>
 </ul>

app/views/static/faq.en.html.erb

@@ -1,5 +1,10 @@
 <ul class="nav-pills">
-  <li><a class="active" href="<%=faq_path%>">FAQ</a></li>
+  <% if @faq_overriden %>
+    <li><a class="active" href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
+    <li><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
+  <% else %>
+    <li><a class="active" href="<%=faq_path%>"><%=t "js.faq" %></a></li>
+  <% end %>
   <li><a href="<%=tos_path%>">Terms of Service</a></li>
   <li><a href="<%=privacy_path%>">Privacy</a></li>
 </ul>

app/views/static/faq.fr.html.erb

@@ -1,5 +1,10 @@
 <ul class="nav-pills">
-  <li><a class="active" href="<%=faq_path%>">FAQ</a></li>
+  <% if @faq_overriden %>
+    <li><a class="active" href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
+    <li><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
+  <% else %>
+    <li><a class="active" href="<%=faq_path%>"><%=t "js.faq" %></a></li>
+  <% end %>
   <li><a href="<%=tos_path%>">Conditions générales d'utilisation</a></li>
   <li><a href="<%=privacy_path%>">Protection des données</a></li>
 </ul>

app/views/static/faq.ko.html.erb

@@ -1,5 +1,10 @@
 <ul class="nav-pills">
-  <li><a class="active" href="<%=faq_path%>">자주하는 질문</a></li>
+  <% if @faq_overriden %>
+    <li><a class="active" href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
+    <li><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
+  <% else %>
+    <li><a class="active" href="<%=faq_path%>"><%=t "js.faq" %></a></li>
+  <% end %>
   <li><a href="<%=tos_path%>">서비스 이용약관</a></li>
   <li><a href="<%=privacy_path%>">개인정보 취급방침</a></li>
 </ul>

app/views/static/faq.pl_PL.html.erb

@@ -1,6 +1,11 @@
 <div>
 <ul class="nav-pills">
-<li><a class="active" href="&quot;FAQ&lt;/a"></a></li>
+  <% if @faq_overriden %>
+    <li><a class="active" href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
+    <li><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
+  <% else %>
+    <li><a class="active" href="<%=faq_path%>"><%=t "js.faq" %></a></li>
+  <% end %>
   <li><a href="tos">Warunki Korzystania</a></li>
   <li><a href="&quot;Polityka" prywatno></a></li>
 </ul>

app/views/static/faq.pt_BR.html.erb

@@ -1,5 +1,10 @@
 <ul class="nav-pills">
-  <li><a class="active" href="<%=faq_path%>">FAQ</a></li>
+  <% if @faq_overriden %>
+    <li><a class="active" href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
+    <li><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
+  <% else %>
+    <li><a class="active" href="<%=faq_path%>"><%=t "js.faq" %></a></li>
+  <% end %>
   <li><a href="<%=tos_path%>">Termos de Serviço</a></li>
   <li><a href="<%=privacy_path%>">Privacidade</a></li>
 </ul>

app/views/static/faq.ru.html.erb

@@ -1,5 +1,10 @@
 <ul class="nav-pills">
-  <li><a class="active" href="<%=faq_path%>">FAQ</a></li>
+  <% if @faq_overriden %>
+    <li><a class="active" href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
+    <li><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
+  <% else %>
+    <li><a class="active" href="<%=faq_path%>"><%=t "js.faq" %></a></li>
+  <% end %>
   <li><a href="<%=tos_path%>">Условия предоставления услуг</a></li>
   <li><a href="<%=privacy_path%>">Конфиденциальность</a></li>
 </ul>

app/views/static/faq.uk.html.erb

@@ -1,5 +1,10 @@
 <ul class="nav-pills">
-  <li><a class="active" href="<%=faq_path%>">Часті запитання</a></li>
+  <% if @faq_overriden %>
+    <li><a class="active" href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
+    <li><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
+  <% else %>
+    <li><a class="active" href="<%=faq_path%>"><%=t "js.faq" %></a></li>
+  <% end %>
   <li><a href="<%=tos_path%>">Умови Використання</a></li>
   <li><a href="<%=privacy_path%>">Приватність</a></li>
 </ul>

app/views/static/faq.zh_CN.html.erb

@@ -1,5 +1,10 @@
 <ul class="nav-pills">
-  <li><a class="active" href="/faq">常见问答（FAQ）</a></li>
+  <% if @faq_overriden %>
+    <li><a class="active" href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
+    <li><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
+  <% else %>
+    <li><a class="active" href="<%=faq_path%>"><%=t "js.faq" %></a></li>
+  <% end %>
   <li><a href="/tos">服务条款</a></li>
   <li><a href="/privacy">隐私条款</a></li>
 </ul>

app/views/static/privacy.cs.html.erb

@@ -1,5 +1,8 @@
 <ul class="nav-pills">
-  <li><a href="<%=faq_path%>">FAQ</a></li>
+  <% if @faq_overriden %>
+    <li><a href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
+  <% end %>
+  <li><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
   <li><a href="<%=tos_path%>">Podmínky používání</a></li>
   <li><a class="active" href="<%=privacy_path%>">Ochrana soukromí</a></li>
 </ul>

app/views/static/privacy.en.html.erb

@@ -1,5 +1,8 @@
 <ul class="nav-pills">
-  <li><a href="<%=faq_path%>">FAQ</a></li>
+  <% if @faq_overriden %>
+    <li><a href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
+  <% end %>
+  <li><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
   <li><a href="<%=tos_path%>">Terms of Service</a></li>
   <li><a class="active" href="<%=privacy_path%>">Privacy</a></li>
 </ul>

app/views/static/privacy.fr.html.erb

@@ -1,5 +1,8 @@
 <ul class="nav-pills">
-  <li><a href="<%=faq_path%>">FAQ</a></li>
+  <% if @faq_overriden %>
+    <li><a href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
+  <% end %>
+  <li><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
   <li><a href="<%=tos_path%>">Conditions générales d'utilisation</a></li>
   <li><a class="active" href="<%=privacy_path%>">Protection des données</a></li>
 </ul>

app/views/static/privacy.ko.html.erb

@@ -1,5 +1,8 @@
 <ul class="nav-pills">
-  <li><a href="<%=faq_path%>">자주하는 질문</a></li>
+  <% if @faq_overriden %>
+    <li><a href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
+  <% end %>
+  <li><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
   <li><a href="<%=tos_path%>">서비스 이용약관</a></li>
   <li><a class="active" href="<%=privacy_path%>">개인정보 취급방침</a></li>
 </ul>

app/views/static/privacy.pl_PL.html.erb

@@ -1,6 +1,9 @@
 <div>
 <ul class="nav-pills">
-<li><a href="&quot;FAQ&lt;/a"></a></li>
+  <% if @faq_overriden %>
+    <li><a href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
+  <% end %>
+  <li><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
   <li><a href="tos">Warunki Korzystania</a></li>
   <li><a class="active" href="&quot;Privacy&lt;/a"></a></li>
 </ul>

app/views/static/privacy.pt_BR.html.erb

@@ -1,5 +1,8 @@
 <ul class="nav-pills">
-  <li><a href="<%=faq_path%>">FAQ</a></li>
+  <% if @faq_overriden %>
+    <li><a href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
+  <% end %>
+  <li><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
   <li><a href="<%=tos_path%>">Termos de Serviço</a></li>
   <li><a class="active" href="<%=privacy_path%>">Privacidade</a></li>
 </ul>

app/views/static/privacy.ru.html.erb

@@ -1,5 +1,8 @@
 <ul class="nav-pills">
-  <li><a href="<%=faq_path%>">FAQ</a></li>
+  <% if @faq_overriden %>
+    <li><a href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
+  <% end %>
+  <li><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
   <li><a href="<%=tos_path%>">Условия предоставления услуг</a></li>
   <li><a class="active" href="<%=privacy_path%>">Конфиденциальность</a></li>
 </ul>

app/views/static/privacy.uk.html.erb

@@ -1,5 +1,8 @@
 <ul class="nav-pills">
-  <li><a href="<%=faq_path%>">Часті запитання</a></li>
+  <% if @faq_overriden %>
+    <li><a href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
+  <% end %>
+  <li><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
   <li><a href="<%=tos_path%>">Умови Використання</a></li>
   <li><a class="active" href="<%=privacy_path%>">Приватність</a></li>
 </ul>

app/views/static/privacy.zh_CN.html.erb

@@ -1,5 +1,8 @@
 <ul class="nav-pills">
-  <li><a href="/faq">常见问答（FAQ）</a></li>
+  <% if @faq_overriden %>
+    <li><a href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
+  <% end %>
+  <li><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
   <li><a href="/tos">服务条款</a></li>
   <li><a class="active" href="/privacy">隐私条款</a></li>
 </ul>

app/views/static/tos.cs.html.erb

@@ -1,5 +1,8 @@
 <ul class="nav-pills">
-  <li><a href="<%=faq_path%>">FAQ</a></li>
+  <% if @faq_overriden %>
+    <li><a href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
+  <% end %>
+  <li><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
   <li><a class="active" href="<%=tos_path%>">Podmínky používání</a></li>
   <li><a href="<%=privacy_path%>">Ochrana soukromí</a></li>
 </ul>

app/views/static/tos.en.html.erb

@@ -1,5 +1,8 @@
 <ul class="nav-pills">
-  <li><a href="<%=faq_path%>">FAQ</a></li>
+  <% if @faq_overriden %>
+    <li><a href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
+  <% end %>
+  <li><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
   <li><a class="active" href="<%=tos_path%>">Terms of Service</a></li>
   <li><a href="<%=privacy_path%>">Privacy</a></li>
 </ul>

app/views/static/tos.fr.html.erb

@@ -1,5 +1,8 @@
 <ul class="nav-pills">
-  <li><a href="<%=faq_path%>">FAQ</a></li>
+  <% if @faq_overriden %>
+    <li><a href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
+  <% end %>
+  <li><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
   <li><a class="active" href="<%=tos_path%>">Conditions générales d'utilisation</a></li>
   <li><a href="<%=privacy_path%>">Protection des données</a></li>
 </ul>

app/views/static/tos.ko.html.erb

@@ -1,5 +1,8 @@
 <ul class="nav-pills">
-  <li><a href="<%=faq_path%>">자주하는 질문</a></li>
+  <% if @faq_overriden %>
+    <li><a href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
+  <% end %>
+  <li><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
   <li><a class="active" href="<%=tos_path%>">서비스 이용약관</a></li>
   <li><a href="<%=privacy_path%>">개인정보 취급방침</a></li>
 </ul>

app/views/static/tos.pl_PL.html.erb

@@ -1,6 +1,9 @@
 <div>
 <ul class="tx_dqsymbolnav-pillstx_dqsymbol">
-<li><a href="&quot;FAQ&lt;/a"></a></li>
+  <% if @faq_overriden %>
+    <li><a href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
+  <% end %>
+  <li><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
   <li><a class="active" href="&quot;Terms" of service></a></li>
   <li><a href="&quot;Privacy&lt;/a"></a></li>
 </ul>

app/views/static/tos.pt_BR.html.erb

@@ -1,5 +1,8 @@
 <ul class="nav-pills">
-  <li><a href="<%=faq_path%>">FAQ</a></li>
+  <% if @faq_overriden %>
+    <li><a href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
+  <% end %>
+  <li><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
   <li><a class="active" href="<%=tos_path%>">Terms of Service</a></li>
   <li><a href="<%=privacy_path%>">Privacy</a></li>
 </ul>

app/views/static/tos.ru.html.erb

@@ -1,5 +1,8 @@
 <ul class="nav-pills">
-  <li><a href="<%=faq_path%>">FAQ</a></li>
+  <% if @faq_overriden %>
+    <li><a href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
+  <% end %>
+  <li><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
   <li><a class="active" href="<%=tos_path%>">Условия предоставления услуг</a></li>
   <li><a href="<%=privacy_path%>">Конфиденциальность</a></li>
 </ul>

app/views/static/tos.uk.html.erb

@@ -1,5 +1,8 @@
 <ul class="nav-pills">
-  <li><a href="<%=faq_path%>">Часті Питання</a></li>
+  <% if @faq_overriden %>
+    <li><a href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
+  <% end %>
+  <li><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
   <li><a class="active" href="<%=tos_path%>">Умови використання</a></li>
   <li><a href="<%=privacy_path%>">Приватність</a></li>
 </ul>

app/views/static/tos.zh_CN.html.erb

@@ -1,5 +1,8 @@
 <ul class="nav-pills">
-  <li><a href="/faq">常见问答（FAQ）</a></li>
+  <% if @faq_overriden %>
+    <li><a href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
+  <% end %>
+  <li><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
   <li><a class="active" href="/tos">服务条款</a></li>
   <li><a href="/privacy">隐私条款</a></li>
 </ul>

config/locales/client.en.yml

@@ -107,6 +107,8 @@ en:
     links: Links
     faq: "FAQ"
     privacy_policy: "Privacy Policy"
+    privacy: "Privacy"
+    terms_of_service: "Terms of Service"
     mobile_view: "Mobile View"
     desktop_view: "Desktop View"
     you: "You"

config/locales/server.en.yml

@@ -1631,3 +1631,5 @@ en:
 
   color_schemes:
     base_theme_name: "Base"
+
+  guidelines: "Guidelines"

config/routes.rb

@@ -176,7 +176,7 @@ Discourse::Application.routes.draw do
   post "login" => "static#enter"
   get "login" => "static#show", id: "login"
   get "faq" => "static#show", id: "faq"
-  get "guidelines" => "static#show", id: "faq"
+  get "guidelines" => "static#show", id: "guidelines"
   get "tos" => "static#show", id: "tos"
   get "privacy" => "static#show", id: "privacy"
   get "signup" => "list#latest"