From 6e4c9b1db2155f479919e12c84f91fa89334d8a7 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Tue, 20 Mar 2018 12:55:26 +0200 Subject: translations PR 20180319 (#8479) --- i18n/en.json | 152 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 76 insertions(+), 76 deletions(-) (limited to 'i18n/en.json') diff --git a/i18n/en.json b/i18n/en.json index 900b55170..42650a868 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -111,14 +111,14 @@ "id": "api.admin.test_s3.missing_s3_bucket", "translation": "S3 Bucket is required" }, - { - "id": "api.admin.test_s3.missing_s3_region", - "translation": "S3 Region is required" - }, { "id": "api.admin.test_s3.missing_s3_endpoint", "translation": "S3 Endpoint is required" }, + { + "id": "api.admin.test_s3.missing_s3_region", + "translation": "S3 Region is required" + }, { "id": "api.admin.upload_brand_image.array.app_error", "translation": "Empty array under 'image' in request" @@ -2198,50 +2198,6 @@ "id": "api.system.go_routines", "translation": "The number of running goroutines is over the health threshold %v of %v" }, - { - "id": "api.team.set_team_icon.get_team.app_error", - "translation": "An error occurred getting the team" - }, - { - "id": "api.team.set_team_icon.storage.app_error", - "translation": "Unable to upload team icon. Image storage is not configured." - }, - { - "id": "api.team.set_team_icon.too_large.app_error", - "translation": "Unable to upload team icon. File is too large." - }, - { - "id": "api.team.set_team_icon.parse.app_error", - "translation": "Could not parse multipart form" - }, - { - "id": "api.team.set_team_icon.no_file.app_error", - "translation": "No file under 'image' in request" - }, - { - "id": "api.team.set_team_icon.array.app_error", - "translation": "Empty array under 'image' in request" - }, - { - "id": "api.team.set_team_icon.open.app_error", - "translation": "Could not open image file" - }, - { - "id": "api.team.set_team_icon.decode_config.app_error", - "translation": "Could not decode team icon metadata" - }, - { - "id": "api.team.set_team_icon.decode.app_error", - "translation": "Could not decode team icon" - }, - { - "id": "api.team.set_team_icon.encode.app_error", - "translation": "Could not encode team icon" - }, - { - "id": "api.team.set_team_icon.write_file.app_error", - "translation": "Could not save team icon" - }, { "id": "api.team.add_user_to_team.added", "translation": "%v added to the team by %v." @@ -2386,6 +2342,50 @@ "id": "api.team.remove_user_from_team.removed", "translation": "%v removed from the team." }, + { + "id": "api.team.set_team_icon.array.app_error", + "translation": "Empty array under 'image' in request" + }, + { + "id": "api.team.set_team_icon.decode.app_error", + "translation": "Could not decode team icon" + }, + { + "id": "api.team.set_team_icon.decode_config.app_error", + "translation": "Could not decode team icon metadata" + }, + { + "id": "api.team.set_team_icon.encode.app_error", + "translation": "Could not encode team icon" + }, + { + "id": "api.team.set_team_icon.get_team.app_error", + "translation": "An error occurred getting the team" + }, + { + "id": "api.team.set_team_icon.no_file.app_error", + "translation": "No file under 'image' in request" + }, + { + "id": "api.team.set_team_icon.open.app_error", + "translation": "Could not open image file" + }, + { + "id": "api.team.set_team_icon.parse.app_error", + "translation": "Could not parse multipart form" + }, + { + "id": "api.team.set_team_icon.storage.app_error", + "translation": "Unable to upload team icon. Image storage is not configured." + }, + { + "id": "api.team.set_team_icon.too_large.app_error", + "translation": "Unable to upload team icon. File is too large." + }, + { + "id": "api.team.set_team_icon.write_file.app_error", + "translation": "Could not save team icon" + }, { "id": "api.team.signup_team.email_disabled.app_error", "translation": "Team sign-up with email is disabled." @@ -3702,14 +3702,14 @@ "id": "app.plugin.activate.app_error", "translation": "Unable to activate extracted plugin. Plugin may already exist and be activated." }, - { - "id": "app.plugin.config.app_error", - "translation": "Error saving plugin state in config" - }, { "id": "app.plugin.cluster.save_config.app_error", "translation": "The plugin configuration in your config.json file must be updated manually when using ReadOnlyConfig with clustering enabled." }, + { + "id": "app.plugin.config.app_error", + "translation": "Error saving plugin state in config" + }, { "id": "app.plugin.deactivate.app_error", "translation": "Unable to deactivate plugin" @@ -4950,30 +4950,6 @@ "id": "model.config.is_valid.message_export.batch_size.app_error", "translation": "Message export job BatchSize must be a positive integer" }, - { - "id": "model.config.is_valid.message_export.export_type.app_error", - "translation": "Message export job ExportFormat must be one of either 'actiance' or 'globalrelay'" - }, - { - "id": "model.config.is_valid.message_export.global_relay.config_missing.app_error", - "translation": "Message export job ExportFormat is set to 'globalrelay', but GlobalRelaySettings are missing" - }, - { - "id": "model.config.is_valid.message_export.global_relay.customer_type.app_error", - "translation": "Message export GlobalRelaySettings.CustomerType must be set to one of either 'A9' or 'A10'" - }, - { - "id": "model.config.is_valid.message_export.global_relay.email_address.app_error", - "translation": "Message export job GlobalRelaySettings.EmailAddress must be set to a valid email address" - }, - { - "id": "model.config.is_valid.message_export.global_relay.smtp_username.app_error", - "translation": "Message export job GlobalRelaySettings.SmtpUsername must be set" - }, - { - "id": "model.config.is_valid.message_export.global_relay.smtp_password.app_error", - "translation": "Message export job GlobalRelaySettings.SmtpPassword must be set" - }, { "id": "model.config.is_valid.message_export.daily_runtime.app_error", "translation": "Message export job DailyRuntime must be a 24-hour time stamp in the form HH:MM." @@ -4990,6 +4966,10 @@ "id": "model.config.is_valid.message_export.export_type.app_error", "translation": "Message export job ExportFormat must be one of either 'actiance' or 'globalrelay'" }, + { + "id": "model.config.is_valid.message_export.export_type.app_error", + "translation": "Message export job ExportFormat must be one of either 'actiance' or 'globalrelay'" + }, { "id": "model.config.is_valid.message_export.file_location.app_error", "translation": "Message export job FileLocation must be a writable directory that export data will be written to" @@ -4998,6 +4978,26 @@ "id": "model.config.is_valid.message_export.file_location.relative", "translation": "Message export job FileLocation must be a sub-directory of FileSettings.Directory" }, + { + "id": "model.config.is_valid.message_export.global_relay.config_missing.app_error", + "translation": "Message export job ExportFormat is set to 'globalrelay', but GlobalRelaySettings are missing" + }, + { + "id": "model.config.is_valid.message_export.global_relay.customer_type.app_error", + "translation": "Message export GlobalRelaySettings.CustomerType must be set to one of either 'A9' or 'A10'" + }, + { + "id": "model.config.is_valid.message_export.global_relay.email_address.app_error", + "translation": "Message export job GlobalRelaySettings.EmailAddress must be set to a valid email address" + }, + { + "id": "model.config.is_valid.message_export.global_relay.smtp_password.app_error", + "translation": "Message export job GlobalRelaySettings.SmtpPassword must be set" + }, + { + "id": "model.config.is_valid.message_export.global_relay.smtp_username.app_error", + "translation": "Message export job GlobalRelaySettings.SmtpUsername must be set" + }, { "id": "model.config.is_valid.message_export.global_relay_email_address.app_error", "translation": "Message export job GlobalRelayEmailAddress must be set to a valid email address" -- cgit v1.2.3-1-g7c22 From 74e703f58daff2aded07a969410f988cff9ada9b Mon Sep 17 00:00:00 2001 From: Chris Duarte Date: Thu, 22 Mar 2018 06:53:43 -0700 Subject: Timezone feature (#8185) * Add supported timezones into config Remove Timezone list creation in favor of timezone from configs Add Timezone field to Users table Clean up format of SupportedTimezones in config * Remove unwanted change * Add test for updating user timezone * Add empty map[string]string if Timezone is null * Add EnableTimezoneSelection config * Revert back to map[string]string for ClientConfig * Refactor SupportedTimezones into timezones.json * Include timezones.json in TestConfigFlag * Add timezone api endpoint * Bump varchar size to 256 and setMaxSize in user_store * Refactor LoadConfig to LoadConfig and LoadTimezoneConfig * Remove unnecessary argument in LoadConfig, mail_test * Add test for timezone endpoint * Add license header * Refactor timezones endpoint to system.go * Add system base route to timezone endpoint * db timezone upgrade in db v4.9 * Avoid saving SupportedTimezones to config.json * Add timezonePath support in config * Remove EnableTimezoneSelection from config * Use return statement without return parameter * Refactor test for SupportedTimezones * Check for supportedTimezone != nil instead of using len * Decouple SupportedTimezones out of Config * Fix failing test * Add LastTeamIconUpdate back in upgrade.go * Write timezone config in config_flag_test * Add code fallback for default timezone support --- i18n/en.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'i18n/en.json') diff --git a/i18n/en.json b/i18n/en.json index 42650a868..974334d85 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3770,6 +3770,18 @@ "id": "app.team.join_user_to_team.max_accounts.app_error", "translation": "This team has reached the maximum number of allowed accounts. Contact your systems administrator to set a higher limit." }, + { + "id": "app.timezones.failed_deserialize.app_error", + "translation": "Failed to deserialize Timezone config file={{.Filename}}, err={{.Error}}" + }, + { + "id": "app.timezones.load_config.app_error", + "translation": "Timezone config file does not exists file={{.Filename}}" + }, + { + "id": "app.timezones.read_config.app_error", + "translation": "Failed to read Timezone config file={{.Filename}}, err={{.Error}}" + }, { "id": "app.user_access_token.disabled", "translation": "Personal access tokens are disabled on this server. Please contact your system administrator for details." -- cgit v1.2.3-1-g7c22