From 9a9729f22fea7275637eafb4046900c9f372ec56 Mon Sep 17 00:00:00 2001 From: Yusuke Nemoto Date: Fri, 31 Mar 2017 00:20:55 +0900 Subject: fix typo and missing messages (#5902) --- app/email_batching.go | 2 +- i18n/en.json | 2 +- store/sql_reaction_store.go | 4 ++-- .../components/admin_console/webserver_mode_dropdown_setting.jsx | 2 +- webapp/components/backstage/components/backstage_list.jsx | 2 +- webapp/components/edit_channel_purpose_modal.jsx | 2 +- webapp/components/signup/components/signup_ldap.jsx | 2 +- webapp/i18n/en.json | 8 ++++++-- 8 files changed, 14 insertions(+), 10 deletions(-) diff --git a/app/email_batching.go b/app/email_batching.go index 055656f30..ac91aae08 100644 --- a/app/email_batching.go +++ b/app/email_batching.go @@ -208,7 +208,7 @@ func sendBatchedEmailNotification(userId string, notifications []*batchedNotific body.Props["BodyText"] = translateFunc("api.email_batching.send_batched_email_notification.body_text", len(notifications)) if err := utils.SendMail(user.Email, subject, body.Render()); err != nil { - l4g.Warn(utils.T("api.email_batchings.send_batched_email_notification.send.app_error"), user.Email, err) + l4g.Warn(utils.T("api.email_batching.send_batched_email_notification.send.app_error"), user.Email, err) } } diff --git a/i18n/en.json b/i18n/en.json index 2a24de825..0082f7768 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -416,7 +416,7 @@ "translation": "Tried to perform an invalid update of the default channel {{.Channel}}" }, { - "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.errord", + "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.error", "translation": "Unable to get the unread count for user_id=%v and channel_id=%v, err=%v" }, { diff --git a/store/sql_reaction_store.go b/store/sql_reaction_store.go index 076710efc..cfc7ac944 100644 --- a/store/sql_reaction_store.go +++ b/store/sql_reaction_store.go @@ -70,7 +70,7 @@ func (s SqlReactionStore) Save(reaction *model.Reaction) StoreChannel { } else { if err := transaction.Commit(); err != nil { // don't need to rollback here since the transaction is already closed - result.Err = model.NewLocAppError("SqlPreferenceStore.Save", "store.sql_preference.save.commit.app_error", nil, err.Error()) + result.Err = model.NewLocAppError("SqlPreferenceStore.Save", "store.sql_reaction.save.commit.app_error", nil, err.Error()) } } @@ -103,7 +103,7 @@ func (s SqlReactionStore) Delete(reaction *model.Reaction) StoreChannel { result.Err = model.NewLocAppError("SqlPreferenceStore.Delete", "store.sql_reaction.delete.app_error", nil, err.Error()) } else if err := transaction.Commit(); err != nil { // don't need to rollback here since the transaction is already closed - result.Err = model.NewLocAppError("SqlPreferenceStore.Delete", "store.sql_preference.delete.commit.app_error", nil, err.Error()) + result.Err = model.NewLocAppError("SqlPreferenceStore.Delete", "store.sql_reaction.delete.commit.app_error", nil, err.Error()) } else { result.Data = reaction } diff --git a/webapp/components/admin_console/webserver_mode_dropdown_setting.jsx b/webapp/components/admin_console/webserver_mode_dropdown_setting.jsx index 2c2b81e72..e86e01a01 100644 --- a/webapp/components/admin_console/webserver_mode_dropdown_setting.jsx +++ b/webapp/components/admin_console/webserver_mode_dropdown_setting.jsx @@ -75,7 +75,7 @@ export default class WebserverModeDropdownSetting extends React.Component { values={[ {value: 'gzip', text: Utils.localizeMessage('admin.webserverModeGzip', 'gzip')}, {value: 'uncompressed', text: Utils.localizeMessage('admin.webserverModeUncompressed', 'Uncompressed')}, - {value: 'disabled', text: Utils.localizeMessage('admin.webserverModeDiabled', 'Disabled')} + {value: 'disabled', text: Utils.localizeMessage('admin.webserverModeDisabled', 'Disabled')} ]} label={ { if (err.id === 'api.context.invalid_param.app_error') { - this.setState({serverError: Utils.localizeMessage('edit_channel_puropse_modal.error', 'This channel purpose is too long, please enter a shorter one')}); + this.setState({serverError: Utils.localizeMessage('edit_channel_purpose_modal.error', 'This channel purpose is too long, please enter a shorter one')}); } else { this.setState({serverError: err.message}); } diff --git a/webapp/components/signup/components/signup_ldap.jsx b/webapp/components/signup/components/signup_ldap.jsx index 0e02d5db7..d93470db6 100644 --- a/webapp/components/signup/components/signup_ldap.jsx +++ b/webapp/components/signup/components/signup_ldap.jsx @@ -115,7 +115,7 @@ export default class SignupLdap extends React.Component { if (global.window.mm_config.LdapLoginFieldName) { ldapIdPlaceholder = global.window.mm_config.LdapLoginFieldName; } else { - ldapIdPlaceholder = Utils.localizeMessage('login.ldap_username', 'AD/LDAP Username'); + ldapIdPlaceholder = Utils.localizeMessage('login.ldapUsername', 'AD/LDAP Username'); } let errorClass = ''; diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index b15e99bec..bd6c2f979 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -165,6 +165,7 @@ "admin.cluster.status_table.status": "Status", "admin.cluster.status_table.url": "Inter-Node URL", "admin.cluster.status_table.version": "Version", + "admin.cluster.unknown": "unknown", "admin.compliance.directoryDescription": "Directory to which compliance reports are written. If blank, will be set to ./data/.", "admin.compliance.directoryExample": "E.g.: \"./data/\"", "admin.compliance.directoryTitle": "Compliance Report Directory:", @@ -387,6 +388,7 @@ "admin.image.amazonS3RegionDescription": "AWS region you selected for creating your S3 bucket.", "admin.image.amazonS3RegionExample": "E.g.: \"us-east-1\"", "admin.image.amazonS3RegionTitle": "Amazon S3 Region:", + "admin.image.amazonS3SSLExample": "E.g.: \"true\"", "admin.image.amazonS3SSLDescription": "When false, allow insecure connections to Amazon S3. Defaults to secure connections only.", "admin.image.amazonS3SSLTitle": "Enable Secure Amazon S3 Connections:", "admin.image.amazonS3SecretDescription": "Obtain this credential from your Amazon EC2 administrator.", @@ -691,7 +693,7 @@ "admin.service.corsTitle": "Enable cross-origin requests from:", "admin.service.developerDesc": "When true, JavaScript errors are shown in a red bar at the top of the user interface. Not recommended for use in production. ", "admin.service.developerTitle": "Enable Developer Mode: ", - "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:", + "admin.service.enforceMfaTitle": "Enforce Multi-factor Authentication:", "admin.service.enforceMfaDesc": "When true, multi-factor authentication is required for login. New users will be required to configure MFA on signup. Logged in users without MFA configured are redirected to the MFA setup page until configuration is complete.

If your system has users with login methods other than AD/LDAP and email, MFA must be enforced with the authentication provider outside of Mattermost.", "admin.service.forward80To443": "Forward port 80 to 443:", "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443", @@ -773,6 +775,7 @@ "admin.sidebar.login": "Login", "admin.sidebar.logs": "Logs", "admin.sidebar.metrics": "Performance Monitoring", + "admin.sidebar.mfa": "MFA", "admin.sidebar.nativeAppLinks": "Mattermost App Links", "admin.sidebar.notifications": "Notifications", "admin.sidebar.oauth": "OAuth 2.0", @@ -1134,7 +1137,7 @@ "channel_modal.publicChannel2": "Create a new public channel anyone can join. ", "channel_modal.purpose": "Purpose", "channel_modal.purposeEx": "E.g.: \"A channel to file bugs and improvements\"", - "channel_notification.push": "Send mobile push notifications", + "channel_notifications.push": "Send mobile push notifications", "channel_notifications.allActivity": "For all activity", "channel_notifications.allUnread": "For all unread messages", "channel_notifications.globalDefault": "Global default ({notifyLevel})", @@ -1605,6 +1608,7 @@ "login.or": "or", "login.password": "Password", "login.passwordChanged": " Password updated successfully", + "login.placeholderOr": " or ", "login.session_expired": " Your session has expired. Please login again.", "login.signIn": "Sign in", "login.signInLoading": "Signing in...", -- cgit v1.2.3-1-g7c22