imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 't3chguy/fix/18092' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088

Browse source 
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
	src/i18n/strings/en_EN.json
This commit is contained in:
Michael Telatynski 2021-08-11 20:53:22 +01:00
commit 38dbe89316
4 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
res/css/views/dialogs/_CreateSpaceFromCommunityDialog.scss
View file

@ -50,6 +50,10 @@ limitations under the License.
line-height: $font-15px; line-height: $font-15px;
margin: 16px 0; margin: 16px 0;
} }
.mx_Field_textarea {
margin-bottom: 0;
}
} }
.mx_JoinRuleDropdown .mx_Dropdown_menu { .mx_JoinRuleDropdown .mx_Dropdown_menu {

5
src/components/views/dialogs/CreateSpaceFromCommunityDialog.tsx
View file

@ -288,8 +288,9 @@ const CreateSpaceFromCommunityDialog: React.FC<IProps> = ({ matrixClient: cli, g
<p> <p>
{ _t("Spaces are the new version of communities - with new features coming.") } { _t("Spaces are the new version of communities - with new features coming.") }
&nbsp; &nbsp;
{ _t("All rooms will automatically be added, a link to the Space will be " + { _t("A link to the Space will be put in your community description.") }
"added to your old community description and all community members will be invited.") } &nbsp;
{ _t("All rooms will be added and all community members will be invited.") }
</p> </p>
<p className="mx_CreateSpaceFromCommunityDialog_flairNotice"> <p className="mx_CreateSpaceFromCommunityDialog_flairNotice">
{ _t("Flair won't be available in Spaces for the foreseeable future.") } { _t("Flair won't be available in Spaces for the foreseeable future.") }

4
src/components/views/spaces/SpaceCreateMenu.tsx
View file

@ -283,8 +283,8 @@ const SpaceCreateMenu = ({ onFinished }) => {
{ sub } { sub }
</AccessibleButton>, </AccessibleButton>,
}) } }) }
&nbsp; <br />
{ _t("To join a space you'll need an invite") } { _t("To join a space you'll need an invite.") }
</p> </p>
<SpaceFeedbackPrompt onClick={onFinished} /> <SpaceFeedbackPrompt onClick={onFinished} />

5
src/i18n/strings/en_EN.json
View file

@ -1028,7 +1028,7 @@
"Private": "Private", "Private": "Private",
"Invite only, best for yourself or teams": "Invite only, best for yourself or teams", "Invite only, best for yourself or teams": "Invite only, best for yourself or teams",
"You can also make Spaces from <a>communities</a>.": "You can also make Spaces from <a>communities</a>.", "You can also make Spaces from <a>communities</a>.": "You can also make Spaces from <a>communities</a>.",
"To join a space you'll need an invite": "To join a space you'll need an invite", "To join a space you'll need an invite.": "To join a space you'll need an invite.",
"Go back": "Go back", "Go back": "Go back",
"Your public space": "Your public space", "Your public space": "Your public space",
"Your private space": "Your private space", "Your private space": "Your private space",
@ -2233,7 +2233,8 @@
"Failed to migrate community": "Failed to migrate community", "Failed to migrate community": "Failed to migrate community",
"Create Space from community": "Create Space from community", "Create Space from community": "Create Space from community",
"Spaces are the new version of communities - with new features coming.": "Spaces are the new version of communities - with new features coming.", "Spaces are the new version of communities - with new features coming.": "Spaces are the new version of communities - with new features coming.",
"All rooms will automatically be added, a link to the Space will be added to your old community description and all community members will be invited.": "All rooms will automatically be added, a link to the Space will be added to your old community description and all community members will be invited.", "A link to the Space will be put in your community description.": "A link to the Space will be put in your community description.",
"All rooms will be added and all community members will be invited.": "All rooms will be added and all community members will be invited.",
"Flair won't be available in Spaces for the foreseeable future.": "Flair won't be available in Spaces for the foreseeable future.", "Flair won't be available in Spaces for the foreseeable future.": "Flair won't be available in Spaces for the foreseeable future.",
"This description will be shown to people when they view your space": "This description will be shown to people when they view your space", "This description will be shown to people when they view your space": "This description will be shown to people when they view your space",
"Space visibility": "Space visibility", "Space visibility": "Space visibility",