From bffcccf99de8a8f3c68cff9e39d2847f0996b67b Mon Sep 17 00:00:00 2001
From: Harshil Sharma <harshil.sharma@joshtechnologygroup.com>
Date: Wed, 10 Oct 2018 00:55:47 +0000
Subject: Refactored to rename "service terms" to "terms of service" (#9581)

* #124 renamed identififers from service terms to terms of service

* #124 renamed identififers from service terms to terms of service

* 124 renamed ServiceTerms model to TermsOfService

* 124 Renamed EnableCustomServiceTerms feature flag to EnableCustomTermsOfService

* 124 Renamed EnableCustomServiceTerms feature flag to EnableCustomTermsOfService

* #124 fixed formatting

* #124 fixed formatting

* #132 renamed table ServiceTerms to TermsOfService

* #124 renamed some missed files from 'service_terms' to 'terms_of_service'

* #124 removed fixed TODOs

* drop migrate of ServiceTerms table, since backporting

* s/ServiceTerms/TermsOfService/ in tests

* s/AcceptedServiceTermsId/AcceptedTermsOfServiceId/

Change the model attribute, even though the column name will eventually be removed.

* s/accepted_service_terms_id/accepted_terms_of_service_id/ to match redux

* s/serviceTerms/termsOfService

* rename column too, and add max size constraint

* s/EnableCustomServiceTerms/EnableCustomTermsOfService
---
 i18n/en.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'i18n')

diff --git a/i18n/en.json b/i18n/en.json
index 7d8bd4122..6bcfc603f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2371,7 +2371,7 @@
     "translation": "Bad verify email token type."
   },
   {
-    "id": "api.user.register_service_terms_action.bad_value.app_error",
+    "id": "api.user.register_terms_of_service_action.bad_value.app_error",
     "translation": "Bad accepted value"
   },
   {
@@ -2435,11 +2435,11 @@
     "translation": "Invalid {{.Name}} parameter"
   },
   {
-    "id": "api.create_service_terms.empty_text.app_error",
+    "id": "api.create_terms_of_service.empty_text.app_error",
     "translation": "Please enter text for your Custom Terms of Service."
   },
   {
-    "id": "api.create_service_terms.custom_service_terms_disabled.app_error",
+    "id": "api.create_terms_of_service.custom_terms_of_service_disabled.app_error",
     "translation": "Custom terms of service feature is disabled"
   },
   {
@@ -4811,19 +4811,19 @@
     "translation": "Unable to connect to the WebSocket server."
   },
   {
-    "id": "model.service_terms.is_valid.id.app_error",
+    "id": "model.terms_of_service.is_valid.id.app_error",
     "translation": "Invalid term of service id."
   },
   {
-    "id": "model.service_terms.is_valid.create_at.app_error",
+    "id": "model.terms_of_service.is_valid.create_at.app_error",
     "translation": "Missing required term of service property: create_at."
   },
   {
-    "id": "model.service_terms.is_valid.user_id.app_error",
+    "id": "model.terms_of_service.is_valid.user_id.app_error",
     "translation": "Missing required terms of service property: user_id."
   },
   {
-    "id": "model.service_terms.is_valid.text.app_error",
+    "id": "model.terms_of_service.is_valid.text.app_error",
     "translation": "Custom terms of service text is too long. Maximum {{.MaxLength}} characters allowed."
   },
   {
@@ -6459,19 +6459,19 @@
     "translation": "Unable to update the webhook"
   },
   {
-    "id": "store.sql_service_terms_store.save.existing.app_error",
+    "id": "store.sql_terms_of_service_store.save.existing.app_error",
     "translation": "Must not call save for existing terms of service."
   },
   {
-    "id": "store.sql_service_terms.save.app_error",
+    "id": "store.sql_terms_of_service.save.app_error",
     "translation": "Unable to save terms of service."
   },
   {
-    "id": "store.sql_service_terms_store.get.app_error",
+    "id": "store.sql_terms_of_service_store.get.app_error",
     "translation": "Unable to fetch terms of service."
   },
   {
-    "id": "store.sql_service_terms_store.get.no_rows.app_error",
+    "id": "store.sql_terms_of_service_store.get.no_rows.app_error",
     "translation": "No terms of service found."
   },
   {
-- 
cgit v1.2.3-1-g7c22