Change path of privacy policy page (#19249)

config/locales/en.yml

@@ -28,7 +28,7 @@ en:
     learn_more: Learn more
     logged_in_as_html: You are currently logged in as %{username}.
     logout_before_registering: You are already logged in.
-    privacy_policy: Privacy policy
+    privacy_policy: Privacy Policy
     rules: Server rules
     rules_html: 'Below is a summary of rules you need to follow if you want to have an account on this server of Mastodon:'
     see_whats_happening: See what's happening
@@ -39,7 +39,6 @@ en:
       other: posts
     status_count_before: Who published
     tagline: Decentralized social network
-    terms: Terms of service
     unavailable_content: Moderated servers
     unavailable_content_description:
       domain: Server
@@ -797,8 +796,8 @@ en:
         desc_html: Displayed in sidebar and meta tags. Describe what Mastodon is and what makes this server special in a single paragraph.
         title: Short server description
       site_terms:
-        desc_html: You can write your own privacy policy, terms of service or other legalese. You can use HTML tags
-        title: Custom terms of service
+        desc_html: You can write your own privacy policy. You can use HTML tags
+        title: Custom privacy policy
       site_title: Server name
       thumbnail:
         desc_html: Used for previews via OpenGraph and API. 1200x630px recommended
@@ -1720,7 +1719,7 @@ en:
       <p>This document is CC-BY-SA. It was last updated May 26, 2022.</p>
 
       <p>Originally adapted from the <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
-    title: "%{instance} Terms of Service and Privacy Policy"
+    title: "%{instance} Privacy Policy"
   themes:
     contrast: Mastodon (High contrast)
     default: Mastodon (Dark)

config/routes.rb

@@ -640,7 +640,9 @@ Rails.application.routes.draw do
 
   get '/about',        to: 'about#show'
   get '/about/more',   to: 'about#more'
-  get '/terms',        to: 'about#terms'
+
+  get '/privacy-policy', to: 'privacy#show', as: :privacy_policy
+  get '/terms',          to: redirect('/privacy-policy')
 
   match '/', via: [:post, :put, :patch, :delete], to: 'application#raise_not_found', format: false
   match '*unmatched_route', via: :all, to: 'application#raise_not_found', format: false