[MM-27535] Change string to be more in-line with designs and the front end verbiage (#15320)
* Change string to be more in-line with designs and the front end verbiage * Tweak tests to have the new string * fix eetests
Этот коммит содержится в:
@@ -2737,9 +2737,9 @@ func TestInviteUsersToTeamWithUserLimit(t *testing.T) {
|
|||||||
CheckNoError(t, resp)
|
CheckNoError(t, resp)
|
||||||
require.Len(t, invitesWithErrors, 2)
|
require.Len(t, invitesWithErrors, 2)
|
||||||
require.NotNil(t, invitesWithErrors[0].Error)
|
require.NotNil(t, invitesWithErrors[0].Error)
|
||||||
assert.Equal(t, invitesWithErrors[0].Error.Message, "You've reached the user limit of your current tier")
|
assert.Equal(t, invitesWithErrors[0].Error.Message, "You've reached the free tier user limit")
|
||||||
require.NotNil(t, invitesWithErrors[1].Error)
|
require.NotNil(t, invitesWithErrors[1].Error)
|
||||||
assert.Equal(t, invitesWithErrors[1].Error.Message, "You've reached the user limit of your current tier")
|
assert.Equal(t, invitesWithErrors[1].Error.Message, "You've reached the free tier user limit")
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("Regular user, invite when at limit should succeed", func(t *testing.T) {
|
t.Run("Regular user, invite when at limit should succeed", func(t *testing.T) {
|
||||||
@@ -2760,7 +2760,7 @@ func TestInviteUsersToTeamWithUserLimit(t *testing.T) {
|
|||||||
require.Len(t, invitesWithErrors, 2)
|
require.Len(t, invitesWithErrors, 2)
|
||||||
require.Nil(t, invitesWithErrors[0].Error)
|
require.Nil(t, invitesWithErrors[0].Error)
|
||||||
require.NotNil(t, invitesWithErrors[1].Error)
|
require.NotNil(t, invitesWithErrors[1].Error)
|
||||||
assert.Equal(t, invitesWithErrors[1].Error.Message, "You've reached the user limit of your current tier")
|
assert.Equal(t, invitesWithErrors[1].Error.Message, "You've reached the free tier user limit")
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -54,6 +54,12 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
|
|||||||
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||||
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||||
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
|
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
|
||||||
|
github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20200721093743-053c38dcd293 h1:N9FaqZD58xkAIJGFGY5qdKXGlY2aNMaYQ9KkVEXv8xE=
|
||||||
|
github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20200721093743-053c38dcd293/go.mod h1:3gKozJI8n2Y/vW37GfnFWAdehGXe5yZlt+HykK6Y3DM=
|
||||||
|
github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20200730135456-e2334fe87160 h1:+JXFDXEkbMieBt54Rihj3ppnZ/Pm1kZxkLOD0hrWFzs=
|
||||||
|
github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20200730135456-e2334fe87160/go.mod h1:3gKozJI8n2Y/vW37GfnFWAdehGXe5yZlt+HykK6Y3DM=
|
||||||
|
github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20200814100246-5fc14ed48292 h1:swpUQyq7HWhc0aStUAgdZI6o0UOD9OzXJxbxUTLo1fo=
|
||||||
|
github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20200814100246-5fc14ed48292/go.mod h1:3gKozJI8n2Y/vW37GfnFWAdehGXe5yZlt+HykK6Y3DM=
|
||||||
github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20200821090819-f7569391b4d3 h1:H2Ir959KhgPrj+/zBP73pW5zxrC32HgICWtcerxCtcc=
|
github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20200821090819-f7569391b4d3 h1:H2Ir959KhgPrj+/zBP73pW5zxrC32HgICWtcerxCtcc=
|
||||||
github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20200821090819-f7569391b4d3/go.mod h1:3gKozJI8n2Y/vW37GfnFWAdehGXe5yZlt+HykK6Y3DM=
|
github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20200821090819-f7569391b4d3/go.mod h1:3gKozJI8n2Y/vW37GfnFWAdehGXe5yZlt+HykK6Y3DM=
|
||||||
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
|
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
|
||||||
|
|||||||
@@ -2224,7 +2224,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "api.team.invite_members.limit_reached.app_error",
|
"id": "api.team.invite_members.limit_reached.app_error",
|
||||||
"translation": "You've reached the user limit of your current tier"
|
"translation": "You've reached the free tier user limit"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "api.team.invite_members.no_one.app_error",
|
"id": "api.team.invite_members.no_one.app_error",
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user