Add t() translation mark to i18nable strings and update translations

components/activity_log_modal/components/activity_log.jsx

@@ -7,7 +7,7 @@ import {FormattedDate, FormattedMessage, FormattedTime} from 'react-intl';
 import {General} from 'mattermost-redux/constants';
 
 import {localizeMessage} from 'utils/utils.jsx';
-import {getMonthLong} from 'utils/i18n';
+import {getMonthLong, t} from 'utils/i18n';
 
 import MoreInfo from './more_info.jsx';
 
@@ -64,21 +64,21 @@ export default class ActivityLog extends React.PureComponent {
  if (session.device_id.includes('apple')) {
  devicePicture = 'fa fa-apple';
  deviceTitle = localizeMessage('device_icons.apple', 'Apple Icon');
- deviceTypeId = 'activity_log_modal.iphoneNativeClassicApp';
+ deviceTypeId = t('activity_log_modal.iphoneNativeClassicApp');
  deviceTypeMessage = 'iPhone Native Classic App';
 
  if (session.device_id.includes(General.PUSH_NOTIFY_APPLE_REACT_NATIVE)) {
- deviceTypeId = 'activity_log_modal.iphoneNativeApp';
+ deviceTypeId = t('activity_log_modal.iphoneNativeApp');
  deviceTypeMessage = 'iPhone Native App';
  }
  } else if (session.device_id.includes('android')) {
  devicePicture = 'fa fa-android';
  deviceTitle = localizeMessage('device_icons.android', 'Android Icon');
- deviceTypeId = 'activity_log_modal.androidNativeClassicApp';
+ deviceTypeId = t('activity_log_modal.androidNativeClassicApp');
  deviceTypeMessage = 'Android Native Classic App';
 
  if (session.device_id.includes(General.PUSH_NOTIFY_ANDROID_REACT_NATIVE)) {
- deviceTypeId = 'activity_log_modal.androidNativeApp';
+ deviceTypeId = t('activity_log_modal.androidNativeApp');
  deviceTypeMessage = 'Android Native App';
  }
  }

components/admin_console/database_settings.jsx

@@ -6,6 +6,7 @@ import {FormattedMessage} from 'react-intl';
 
 import {recycleDatabaseConnection} from 'actions/admin_actions.jsx';
 import * as Utils from 'utils/utils.jsx';
+import {t} from 'utils/i18n';
 
 import AdminSettings from './admin_settings.jsx';
 import BooleanSetting from './boolean_setting.jsx';
@@ -97,7 +98,7 @@ export default class DatabaseSettings extends AdminSettings {
  }
  showSuccessMessage={false}
  errorMessage={{
- id: 'admin.recycle.reloadFail',
+ id: t('admin.recycle.reloadFail'),
  defaultMessage: 'Recycling unsuccessful: {error}',
  }}
  includeDetailedError={true}

components/admin_console/elasticsearch_settings.jsx

@@ -7,6 +7,7 @@ import {FormattedMessage} from 'react-intl';
 import {elasticsearchPurgeIndexes, elasticsearchTest} from 'actions/admin_actions.jsx';
 import {JobStatuses, JobTypes} from 'utils/constants.jsx';
 import * as Utils from 'utils/utils.jsx';
+import {t} from 'utils/i18n';
 
 import AdminSettings from './admin_settings.jsx';
 import BooleanSetting from './boolean_setting.jsx';
@@ -283,7 +284,7 @@ export default class ElasticsearchSettings extends AdminSettings {
  />
  }
  successMessage={{
- id: 'admin.elasticsearch.testConfigSuccess',
+ id: t('admin.elasticsearch.testConfigSuccess'),
  defaultMessage: 'Test successful. Configuration saved.',
  }}
  disabled={!this.state.enableIndexing}
@@ -334,11 +335,11 @@ export default class ElasticsearchSettings extends AdminSettings {
  />
  }
  successMessage={{
- id: 'admin.elasticsearch.purgeIndexesButton.success',
+ id: t('admin.elasticsearch.purgeIndexesButton.success'),
  defaultMessage: 'Indexes purged successfully.',
  }}
  errorMessage={{
- id: 'admin.elasticsearch.purgeIndexesButton.error',
+ id: t('admin.elasticsearch.purgeIndexesButton.error'),
  defaultMessage: 'Failed to purge indexes: {error}',
  }}
  disabled={!this.state.canPurgeAndIndex}

components/admin_console/license_settings.jsx

@@ -10,14 +10,15 @@ import {defineMessages, FormattedHTMLMessage, FormattedMessage, injectIntl, intl
 import {removeLicenseFile, uploadLicenseFile} from 'actions/admin_actions.jsx';
 import ErrorStore from 'stores/error_store.jsx';
 import * as Utils from 'utils/utils.jsx';
+import {t} from 'utils/i18n';
 
 const holders = defineMessages({
  removing: {
- id: 'admin.license.removing',
+ id: t('admin.license.removing'),
  defaultMessage: 'Removing License...',
  },
  uploading: {
- id: 'admin.license.uploading',
+ id: t('admin.license.uploading'),
  defaultMessage: 'Uploading License...',
  },
 });

components/admin_console/password_settings.jsx

@@ -6,6 +6,7 @@ import {FormattedMessage} from 'react-intl';
 
 import Constants from 'utils/constants.jsx';
 import * as Utils from 'utils/utils.jsx';
+import {t} from 'utils/i18n';
 
 import AdminSettings from './admin_settings.jsx';
 import Setting from './setting.jsx';
@@ -35,6 +36,22 @@ export default class PasswordSettings extends AdminSettings {
  });
 
  // Update sample message from config settings
+ t('user.settings.security.passwordErrorLowercase');
+ t('user.settings.security.passwordErrorLowercaseUppercase');
+ t('user.settings.security.passwordErrorLowercaseUppercaseNumber');
+ t('user.settings.security.passwordErrorLowercaseUppercaseNumberSymbol');
+ t('user.settings.security.passwordErrorLowercaseUppercaseSymbol');
+ t('user.settings.security.passwordErrorLowercaseNumber');
+ t('user.settings.security.passwordErrorLowercaseNumberSymbol');
+ t('user.settings.security.passwordErrorLowercaseSymbol');
+ t('user.settings.security.passwordErrorUppercase');
+ t('user.settings.security.passwordErrorUppercaseNumber');
+ t('user.settings.security.passwordErrorUppercaseNumberSymbol');
+ t('user.settings.security.passwordErrorUppercaseSymbol');
+ t('user.settings.security.passwordErrorNumber');
+ t('user.settings.security.passwordErrorNumberSymbol');
+ t('user.settings.security.passwordErrorSymbol');
+
  let sampleErrorMsgId = 'user.settings.security.passwordError';
  if (props.config.PasswordSettings.Lowercase) {
  sampleErrorMsgId += 'Lowercase';

components/admin_console/permission_schemes_settings/edit_post_time_limit_button/edit_post_time_limit_button.jsx

@@ -6,6 +6,7 @@ import PropTypes from 'prop-types';
 import {FormattedMessage} from 'react-intl';
 
 import {Constants} from 'utils/constants';
+import {t} from 'utils/i18n';
 
 export default class EditPostTimeLimitButton extends React.Component {
  static propTypes = {
@@ -16,9 +17,9 @@ export default class EditPostTimeLimitButton extends React.Component {
  render = () => {
  let messageID;
  if (this.props.timeLimit === Constants.UNSET_POST_EDIT_TIME_LIMIT) {
- messageID = 'edit_post.time_limit_button.no_limit';
+ messageID = t('edit_post.time_limit_button.no_limit');
  } else {
- messageID = 'edit_post.time_limit_button.for_n_seconds';
+ messageID = t('edit_post.time_limit_button.for_n_seconds');
  }
 
  return (

components/admin_console/permission_schemes_settings/edit_post_time_limit_modal/edit_post_time_limit_modal.jsx

@@ -8,6 +8,7 @@ import {Modal} from 'react-bootstrap';
 
 import {Constants} from 'utils/constants';
 import {localizeMessage} from 'utils/utils.jsx';
+import {t} from 'utils/i18n';
 
 const INT32_MAX = 2147483647;
 
@@ -175,7 +176,7 @@ export default class EditPostTimeLimitModal extends React.Component {
  disabled={this.state.saving}
  >
  <FormattedMessage
- id={this.state.saving ? 'save_button.saving' : 'edit_post.time_limit_modal.save_button'}
+ id={this.state.saving ? t('save_button.saving') : t('edit_post.time_limit_modal.save_button')}
  defaultMessage='Save Edit Time'
  />
  </button>

components/admin_console/permission_schemes_settings/permission_schemes_settings.jsx

@@ -6,6 +6,8 @@ import PropTypes from 'prop-types';
 import {FormattedMessage} from 'react-intl';
 import {Link} from 'react-router-dom';
 
+import {t} from 'utils/i18n';
+
 import FormattedMarkdownMessage from 'components/formatted_markdown_message';
 
 import LoadingScreen from 'components/loading_screen.jsx';
@@ -95,14 +97,14 @@ export default class PermissionSchemesSettings extends React.PureComponent {
 
  if (this.props.jobsAreEnabled && !this.props.clusterIsEnabled) {
  return this.teamOverrideUnavalableView(
- 'admin.permissions.teamOverrideSchemesInProgress',
+ t('admin.permissions.teamOverrideSchemesInProgress'),
  'Migration job in progress: Team Override Schemes are not available until the job server completes the permissions migration. Learn more in the {documentationLink}.',
  docLink
  );
  }
 
  return this.teamOverrideUnavalableView(
- 'admin.permissions.teamOverrideSchemesNoJobsEnabled',
+ t('admin.permissions.teamOverrideSchemesNoJobsEnabled'),
  'Migration job on hold: Team Override Schemes are not available until the job server can execute the permissions migration. The job will be automatically started when the job server is enabled. Learn more in the {documentationLink}.',
  docLink,
  );
@@ -254,3 +256,101 @@ export default class PermissionSchemesSettings extends React.PureComponent {
  );
  };
 }
+
+t('admin.permissions.group.delete_posts.description');
+t('admin.permissions.group.delete_posts.name');
+t('admin.permissions.group.integrations.description');
+t('admin.permissions.group.integrations.name');
+t('admin.permissions.group.posts.description');
+t('admin.permissions.group.posts.name');
+t('admin.permissions.group.private_channel.description');
+t('admin.permissions.group.private_channel.name');
+t('admin.permissions.group.public_channel.description');
+t('admin.permissions.group.public_channel.name');
+t('admin.permissions.group.reactions.description');
+t('admin.permissions.group.reactions.name');
+t('admin.permissions.group.send_invites.description');
+t('admin.permissions.group.send_invites.name');
+t('admin.permissions.group.teams.description');
+t('admin.permissions.group.teams.name');
+t('admin.permissions.permission.assign_system_admin_role.description');
+t('admin.permissions.permission.assign_system_admin_role.name');
+t('admin.permissions.permission.create_direct_channel.description');
+t('admin.permissions.permission.create_direct_channel.name');
+t('admin.permissions.permission.create_group_channel.description');
+t('admin.permissions.permission.create_group_channel.name');
+t('admin.permissions.permission.create_private_channel.description');
+t('admin.permissions.permission.create_private_channel.name');
+t('admin.permissions.permission.create_public_channel.description');
+t('admin.permissions.permission.create_public_channel.name');
+t('admin.permissions.permission.create_team.description');
+t('admin.permissions.permission.create_team.name');
+t('admin.permissions.permission.create_user_access_token.description');
+t('admin.permissions.permission.create_user_access_token.name');
+t('admin.permissions.permission.delete_others_posts.description');
+t('admin.permissions.permission.delete_others_posts.name');
+t('admin.permissions.permission.delete_post.description');
+t('admin.permissions.permission.delete_post.name');
+t('admin.permissions.permission.delete_private_channel.description');
+t('admin.permissions.permission.delete_private_channel.name');
+t('admin.permissions.permission.delete_public_channel.description');
+t('admin.permissions.permission.delete_public_channel.name');
+t('admin.permissions.permission.edit_other_users.description');
+t('admin.permissions.permission.edit_other_users.name');
+t('admin.permissions.permission.edit_post.description');
+t('admin.permissions.permission.edit_post.name');
+t('admin.permissions.permission.import_team.description');
+t('admin.permissions.permission.import_team.name');
+t('admin.permissions.permission.list_team_channels.description');
+t('admin.permissions.permission.list_team_channels.name');
+t('admin.permissions.permission.list_users_without_team.description');
+t('admin.permissions.permission.list_users_without_team.name');
+t('admin.permissions.permission.manage_channel_roles.description');
+t('admin.permissions.permission.manage_channel_roles.name');
+t('admin.permissions.permission.manage_emojis.description');
+t('admin.permissions.permission.manage_emojis.name');
+t('admin.permissions.permission.manage_jobs.description');
+t('admin.permissions.permission.manage_jobs.name');
+t('admin.permissions.permission.manage_oauth.description');
+t('admin.permissions.permission.manage_oauth.name');
+t('admin.permissions.permission.manage_private_channel_members.description');
+t('admin.permissions.permission.manage_private_channel_members.name');
+t('admin.permissions.permission.manage_private_channel_properties.description');
+t('admin.permissions.permission.manage_private_channel_properties.name');
+t('admin.permissions.permission.manage_public_channel_members.description');
+t('admin.permissions.permission.manage_public_channel_members.name');
+t('admin.permissions.permission.manage_public_channel_properties.description');
+t('admin.permissions.permission.manage_public_channel_properties.name');
+t('admin.permissions.permission.manage_roles.description');
+t('admin.permissions.permission.manage_roles.name');
+t('admin.permissions.permission.manage_slash_commands.description');
+t('admin.permissions.permission.manage_slash_commands.name');
+t('admin.permissions.permission.manage_system.description');
+t('admin.permissions.permission.manage_system.name');
+t('admin.permissions.permission.manage_team.description');
+t('admin.permissions.permission.manage_team.name');
+t('admin.permissions.permission.manage_team_roles.description');
+t('admin.permissions.permission.manage_team_roles.name');
+t('admin.permissions.permission.manage_webhooks.description');
+t('admin.permissions.permission.manage_webhooks.name');
+t('admin.permissions.permission.permanent_delete_user.description');
+t('admin.permissions.permission.permanent_delete_user.name');
+t('admin.permissions.permission.read_channel.description');
+t('admin.permissions.permission.read_channel.name');
+t('admin.permissions.permission.read_user_access_token.description');
+t('admin.permissions.permission.read_user_access_token.name');
+t('admin.permissions.permission.remove_user_from_team.description');
+t('admin.permissions.permission.remove_user_from_team.name');
+t('admin.permissions.permission.revoke_user_access_token.description');
+t('admin.permissions.permission.revoke_user_access_token.name');
+t('admin.permissions.permission.upload_file.description');
+t('admin.permissions.permission.upload_file.name');
+t('admin.permissions.permission.view_team.description');
+t('admin.permissions.permission.view_team.name');
+t('admin.permissions.roles.all_users.name');
+t('admin.permissions.roles.channel_admin.name');
+t('admin.permissions.roles.channel_user.name');
+t('admin.permissions.roles.system_admin.name');
+t('admin.permissions.roles.system_user.name');
+t('admin.permissions.roles.team_admin.name');
+t('admin.permissions.roles.team_user.name');

components/admin_console/request_button/request_button.jsx

@@ -6,6 +6,7 @@ import React from 'react';
 import {FormattedMessage} from 'react-intl';
 
 import * as Utils from 'utils/utils.jsx';
+import {t} from 'utils/i18n';
 
 /**
  * A button which, when clicked, performs an action and displays
@@ -127,11 +128,11 @@ export default class RequestButton extends React.Component {
  showSuccessMessage: true,
  includeDetailedError: false,
  successMessage: {
- id: 'admin.requestButton.requestSuccess',
+ id: t('admin.requestButton.requestSuccess'),
  defaultMessage: 'Test Successful',
  },
  errorMessage: {
- id: 'admin.requestButton.requestFailure',
+ id: t('admin.requestButton.requestFailure'),
  defaultMessage: 'Test Failure: {error}',
  },
  }

components/admin_console/system_users/system_users_dropdown.jsx

@@ -13,6 +13,7 @@ import TeamStore from 'stores/team_store.jsx';
 import UserStore from 'stores/user_store.jsx';
 import {Constants} from 'utils/constants.jsx';
 import * as Utils from 'utils/utils.jsx';
+import {t} from 'utils/i18n';
 import {clientLogout} from 'actions/global_actions.jsx';
 import ConfirmModal from 'components/confirm_modal.jsx';
 import SystemPermissionGate from 'components/permissions_gates/system_permission_gate';
@@ -307,11 +308,11 @@ export default class SystemUsersDropdown extends React.Component {
  let messageId = '';
  if (hasUserAccessTokenRole || isSystemAdmin) {
  if (hasPostAllRole) {
- messageId = 'admin.user_item.userAccessTokenPostAll';
+ messageId = t('admin.user_item.userAccessTokenPostAll');
  } else if (hasPostAllPublicRole) {
- messageId = 'admin.user_item.userAccessTokenPostAllPublic';
+ messageId = t('admin.user_item.userAccessTokenPostAllPublic');
  } else {
- messageId = 'admin.user_item.userAccessTokenYes';
+ messageId = t('admin.user_item.userAccessTokenYes');
  }
  }
 

components/announcement_bar/announcement_bar.jsx

@@ -14,6 +14,7 @@ import {ErrorBarTypes, StatTypes, StoragePrefixes} from 'utils/constants.jsx';
 import {displayExpiryDate, isLicenseExpired, isLicenseExpiring, isLicensePastGracePeriod} from 'utils/license_utils.jsx';
 import * as TextFormatting from 'utils/text_formatting.jsx';
 import * as Utils from 'utils/utils.jsx';
+import {t} from 'utils/i18n';
 
 import FormattedMarkdownMessage from 'components/formatted_markdown_message';
 
@@ -293,10 +294,10 @@ export default class AnnouncementBar extends React.PureComponent {
  let id;
  let defaultMessage;
  if (this.props.enableSignUpWithGitLab) {
- id = 'error_bar.site_url_gitlab';
+ id = t('error_bar.site_url_gitlab');
  defaultMessage = 'Please configure your {docsLink} in the System Console or in gitlab.rb if you\'re using GitLab Mattermost.';
  } else {
- id = 'error_bar.site_url';
+ id = t('error_bar.site_url');
  defaultMessage = 'Please configure your {docsLink} in the System Console.';
  }