From b65fc8100d5557572046e6cabc8a8c5d03df1b2e Mon Sep 17 00:00:00 2001
From: Mattermost Build <build@mattermost.com>
Date: Wed, 18 Dec 2019 19:11:23 +0100
Subject: [PATCH] Updated localization items (#3726)

Updated the i18n and default messages for the network failure and entire channel message alert.
---
 app/components/failed_network_action/index.js               | 4 ++--
 app/components/post_textbox/post_textbox_base.js            | 4 ++--
 .../__snapshots__/error_teams_list.test.js.snap             | 2 +-
 .../select_team/__snapshots__/select_team.test.js.snap      | 2 +-
 .../__snapshots__/terms_of_service.test.js.snap             | 2 +-
 assets/base/i18n/en.json                                    | 6 +++---
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/components/failed_network_action/index.js b/app/components/failed_network_action/index.js
index 3fe3a3d11..4aada5e00 100644
--- a/app/components/failed_network_action/index.js
+++ b/app/components/failed_network_action/index.js
@@ -25,7 +25,7 @@ export default class FailedNetworkAction extends PureComponent {
         actionId: t('mobile.failed_network_action.retry'),
         actionDefaultMessage: 'try again',
         errorId: t('mobile.failed_network_action.shortDescription'),
-        errorDefaultMessage: 'Messages will load when you have an internet connection or {refresh}.',
+        errorDefaultMessage: 'Messages will load when you have an internet connection or {tryAgainAction}.',
     };
 
     render() {
@@ -54,7 +54,7 @@ export default class FailedNetworkAction extends PureComponent {
                     defaultMessage={errorDefaultMessage}
                     style={style.description}
                     values={{
-                        refresh: (
+                        tryAgainAction: (
                             <FormattedText
                                 id={actionId}
                                 defaultMessage={actionDefaultMessage}
diff --git a/app/components/post_textbox/post_textbox_base.js b/app/components/post_textbox/post_textbox_base.js
index 1f4965f4f..82851c584 100644
--- a/app/components/post_textbox/post_textbox_base.js
+++ b/app/components/post_textbox/post_textbox_base.js
@@ -459,7 +459,7 @@ export default class PostTextBoxBase extends PureComponent {
                 intl.formatMessage(
                     {
                         id: 'mobile.post_textbox.entire_channel.message.with_timezones',
-                        defaultMessage: 'By using @all or @channel you are about to send notifications to {totalMembers} people in {timezones, number} {timezones, plural, one {timezone} other {timezones}}. Are you sure you want to do this?',
+                        defaultMessage: 'By using @all or @channel you are about to send notifications to {totalMembers, number} {totalMembers, plural, one {person} other {people}} in {timezones, number} {timezones, plural, one {timezone} other {timezones}}. Are you sure you want to do this?',
                     },
                     {
                         totalMembers: currentMembersCount - 1,
@@ -472,7 +472,7 @@ export default class PostTextBoxBase extends PureComponent {
                 intl.formatMessage(
                     {
                         id: 'mobile.post_textbox.entire_channel.message',
-                        defaultMessage: 'By using @all or @channel you are about to send notifications to {totalMembers} people. Are you sure you want to do this?',
+                        defaultMessage: 'By using @all or @channel you are about to send notifications to {totalMembers, number} {totalMembers, plural, one {person} other {people}}. Are you sure you want to do this?',
                     },
                     {
                         totalMembers: currentMembersCount - 1,
diff --git a/app/screens/error_teams_list/__snapshots__/error_teams_list.test.js.snap b/app/screens/error_teams_list/__snapshots__/error_teams_list.test.js.snap
index 16c39697a..4e179f184 100644
--- a/app/screens/error_teams_list/__snapshots__/error_teams_list.test.js.snap
+++ b/app/screens/error_teams_list/__snapshots__/error_teams_list.test.js.snap
@@ -13,7 +13,7 @@ exports[`ErrorTeamsList should match snapshot 1`] = `
   <FailedNetworkAction
     actionDefaultMessage="try again"
     actionId="mobile.failed_network_action.retry"
-    errorDefaultMessage="Messages will load when you have an internet connection or {refresh}."
+    errorDefaultMessage="Messages will load when you have an internet connection or {tryAgainAction}."
     errorId="mobile.failed_network_action.shortDescription"
     onRetry={[Function]}
     theme={
diff --git a/app/screens/select_team/__snapshots__/select_team.test.js.snap b/app/screens/select_team/__snapshots__/select_team.test.js.snap
index 3d3ff3696..118a548e4 100644
--- a/app/screens/select_team/__snapshots__/select_team.test.js.snap
+++ b/app/screens/select_team/__snapshots__/select_team.test.js.snap
@@ -4,7 +4,7 @@ exports[`SelectTeam should match snapshot for fail of teams 1`] = `
 <FailedNetworkAction
   actionDefaultMessage="try again"
   actionId="mobile.failed_network_action.retry"
-  errorDefaultMessage="Messages will load when you have an internet connection or {refresh}."
+  errorDefaultMessage="Messages will load when you have an internet connection or {tryAgainAction}."
   errorId="mobile.failed_network_action.shortDescription"
   onRetry={[Function]}
   theme={
diff --git a/app/screens/terms_of_service/__snapshots__/terms_of_service.test.js.snap b/app/screens/terms_of_service/__snapshots__/terms_of_service.test.js.snap
index 3ac829734..6b850ccac 100644
--- a/app/screens/terms_of_service/__snapshots__/terms_of_service.test.js.snap
+++ b/app/screens/terms_of_service/__snapshots__/terms_of_service.test.js.snap
@@ -291,7 +291,7 @@ exports[`TermsOfService should match snapshot for fail of get terms 1`] = `
   <FailedNetworkAction
     actionDefaultMessage="try again"
     actionId="mobile.failed_network_action.retry"
-    errorDefaultMessage="Messages will load when you have an internet connection or {refresh}."
+    errorDefaultMessage="Messages will load when you have an internet connection or {tryAgainAction}."
     errorId="mobile.failed_network_action.shortDescription"
     onRetry={[Function]}
     theme={
diff --git a/assets/base/i18n/en.json b/assets/base/i18n/en.json
index b3d7afa32..37faeb42f 100644
--- a/assets/base/i18n/en.json
+++ b/assets/base/i18n/en.json
@@ -254,7 +254,7 @@
   "mobile.extension.permission": "Mattermost needs access to the device storage to share files.",
   "mobile.extension.title": "Share in Mattermost",
   "mobile.failed_network_action.retry": "try again",
-  "mobile.failed_network_action.shortDescription": "Messages will load when you have an internet connection or {refresh}.",
+  "mobile.failed_network_action.shortDescription": "Messages will load when you have an internet connection or {tryAgainAction}.",
   "mobile.failed_network_action.title": "No internet connection",
   "mobile.file_upload.browse": "Browse Files",
   "mobile.file_upload.camera_photo": "Take Photo",
@@ -370,8 +370,8 @@
   "mobile.post_pre_header.pinned_flagged": "Pinned and Flagged",
   "mobile.post_textbox.entire_channel.cancel": "Cancel",
   "mobile.post_textbox.entire_channel.confirm": "Confirm",
-  "mobile.post_textbox.entire_channel.message": "By using @all or @channel you are about to send notifications to {totalMembers} people. Are you sure you want to do this?",
-  "mobile.post_textbox.entire_channel.message.with_timezones": "By using @all or @channel you are about to send notifications to {totalMembers} people in {timezones, number} {timezones, plural, one {timezone} other {timezones}}. Are you sure you want to do this?",
+  "mobile.post_textbox.entire_channel.message": "By using @all or @channel you are about to send notifications to {totalMembers, number} {totalMembers, plural, one {person} other {people}}. Are you sure you want to do this?",
+  "mobile.post_textbox.entire_channel.message.with_timezones": "By using @all or @channel you are about to send notifications to {totalMembers, number} {totalMembers, plural, one {person} other {people}} in {timezones, number} {timezones, plural, one {timezone} other {timezones}}. Are you sure you want to do this?",
   "mobile.post_textbox.entire_channel.title": "Confirm sending notifications to entire channel",
   "mobile.post_textbox.uploadFailedDesc": "Some attachments failed to upload to the server. Are you sure you want to post the message?",
   "mobile.post_textbox.uploadFailedTitle": "Attachment failure",