diff options
author | Harshil Sharma <harshil.sharma@joshtechnologygroup.com> | 2018-09-26 20:49:22 +0000 |
---|---|---|
committer | Jesse Hallam <jesse.hallam@gmail.com> | 2018-09-26 16:49:22 -0400 |
commit | af275fe9242303581192258ef4f6457fa45a58e4 (patch) | |
tree | df05afdb0894d577574cbee5d056ffddeec3a93e /i18n | |
parent | 4e59a27293394b6d5529efd13ad711daebbc0eb3 (diff) | |
download | chat-af275fe9242303581192258ef4f6457fa45a58e4.tar.gz chat-af275fe9242303581192258ef4f6457fa45a58e4.tar.bz2 chat-af275fe9242303581192258ef4f6457fa45a58e4.zip |
#MM-12130 changes for custom service terms (#9450)
* #MM-12130 changes for custom service terms
* Fixed styling
* Added getServiceTerms API
* removed unnecessary panic
* removed custom service terms text from flat config
* reverted user sql store as those changes are no longer needed
* added tests
* Updated a config key to be more standard
* Added copyright info
* Loading service terms only if the feature is enabled
* Loading service terms only if the feature is enabled
* removed unused index
* added createservice termns API
* made a param to bool instead of string
* added createservice termns API
* review fixes
* fixed styling
* Minor refactoring
* removed saveConfig and loadConfig magic
* added empty service terms text check to createServiceTerms API
* refactoed some urls to be terms_of_service instead of service_terms
* removed check for support settings
* changed URLs in tests
* removed unused code
* fixed a bug
* added service termd id in conif
* fixed a test
* review fixes
* minor fixes
* Fixed TestCreateServiceTerms
Diffstat (limited to 'i18n')
-rw-r--r-- | i18n/en.json | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/i18n/en.json b/i18n/en.json index 4fd2fa128..4558501d8 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -2355,6 +2355,10 @@ "translation": "Bad verify email token type." }, { + "id": "api.user.register_service_terms_action.bad_value.app_error", + "translation": "Bad accepted value" + }, + { "id": "api.web_socket.connect.upgrade.app_error", "translation": "Failed to upgrade websocket connection" }, @@ -2415,6 +2419,14 @@ "translation": "Invalid {{.Name}} parameter" }, { + "id": "api.create_service_terms.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", + "translation": "Custom terms of service feature is disabled" + }, + { "id": "app.admin.test_email.failure", "translation": "Connection unsuccessful: {{.Error}}" }, @@ -3203,6 +3215,10 @@ "translation": "System Console is set to read-only when High Availability is enabled unless ReadOnlyConfig is disabled in the configuration file." }, { + "id": "ent.cluster.save_config.update_custom_service_terms_no_user.error", + "translation": "Custom service terms can only be changed if provided with exactly one user id" + }, + { "id": "ent.compliance.bad_export_type.appError", "translation": "Unknown output format {{.ExportType}}" }, @@ -4723,6 +4739,22 @@ "translation": "Unable to connect to the WebSocket server." }, { + "id": "model.service_terms.is_valid.id.app_error", + "translation": "Invalid term of service id." + }, + { + "id": "model.service_terms.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", + "translation": "Missing required terms of service property: user_id." + }, + { + "id": "model.service_terms.is_valid.text.app_error", + "translation": "Invalid terms of service text." + }, + { "id": "oauth.gitlab.tos.error", "translation": "GitLab's Terms of Service have updated. Please go to gitlab.com to accept them and then try logging into Mattermost again." }, @@ -6351,6 +6383,22 @@ "translation": "Unable to update the webhook" }, { + "id": "store.sql_service_terms_store.save.existing.app_error", + "translation": "Must not call save for existing service terms" + }, + { + "id": "store.sql_service_terms.save.app_error", + "translation": "Unable to save service terms" + }, + { + "id": "store.sql_service_terms_store.get.app_error", + "translation": "Unable to fetch service terms" + }, + { + "id": "store.sql_service_terms_store.get.no_rows.app_error", + "translation": "No service terms found" + }, + { "id": "system.message.name", "translation": "System" }, |