From 1a6e3e73c5dc72a2f593f32725b7e977c39227ad Mon Sep 17 00:00:00 2001 From: Krishan <33421343+kfiven@users.noreply.github.com> Date: Wed, 30 Mar 2022 13:42:52 +0530 Subject: [PATCH] String update and file extension name consistency (#436) * Fixes #434 * Fixes #433 * Prtially fixes #432 * Disable auto labelling of issues * Use yaml instead of yml as recommended by yaml.org * shortened the strings * simplified option description --- .github/{FUNDING.yml => FUNDING.yaml} | 0 .../ISSUE_TEMPLATE/{bug_report.yml => bug_report.yaml} | 3 +-- .github/ISSUE_TEMPLATE/{config.yml => config.yaml} | 0 .../{feature_request.yml => feature_request.yaml} | 3 +-- .github/{dependabot.yml => dependabot.yaml} | 6 +++--- ...{build-pull-request.yml => build-pull-request.yaml} | 0 ...eploy-pull-request.yml => deploy-pull-request.yaml} | 0 .github/workflows/netlify-dev.yaml | 2 +- .../room-history-visibility/RoomHistoryVisibility.jsx | 10 +++++----- src/app/organisms/create-room/CreateRoom.jsx | 2 +- src/app/organisms/room/RoomSettings.jsx | 2 +- src/app/organisms/room/RoomViewContent.jsx | 2 +- 12 files changed, 14 insertions(+), 16 deletions(-) rename .github/{FUNDING.yml => FUNDING.yaml} (100%) rename .github/ISSUE_TEMPLATE/{bug_report.yml => bug_report.yaml} (98%) rename .github/ISSUE_TEMPLATE/{config.yml => config.yaml} (100%) rename .github/ISSUE_TEMPLATE/{feature_request.yml => feature_request.yaml} (96%) rename .github/{dependabot.yml => dependabot.yaml} (93%) rename .github/workflows/{build-pull-request.yml => build-pull-request.yaml} (100%) rename .github/workflows/{deploy-pull-request.yml => deploy-pull-request.yaml} (100%) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yaml similarity index 100% rename from .github/FUNDING.yml rename to .github/FUNDING.yaml diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yaml similarity index 98% rename from .github/ISSUE_TEMPLATE/bug_report.yml rename to .github/ISSUE_TEMPLATE/bug_report.yaml index f3f6ef3d..76fc578a 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -1,6 +1,5 @@ name: 🐞 Bug Report description: Report a bug -labels: 'type: bug' body: - type: markdown @@ -50,7 +49,7 @@ body: render: shell validations: required: true - + - type: textarea id: context attributes: diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yaml similarity index 100% rename from .github/ISSUE_TEMPLATE/config.yml rename to .github/ISSUE_TEMPLATE/config.yaml diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yaml similarity index 96% rename from .github/ISSUE_TEMPLATE/feature_request.yml rename to .github/ISSUE_TEMPLATE/feature_request.yaml index 7026f957..412d5181 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yaml @@ -1,6 +1,5 @@ name: 💡 Feature Request description: Suggest an idea -labels: 'type: feature' body: - type: textarea @@ -26,7 +25,7 @@ body: attributes: label: Alternatives considered description: "Any alternative solutions you've considered" - + - type: textarea id: context attributes: diff --git a/.github/dependabot.yml b/.github/dependabot.yaml similarity index 93% rename from .github/dependabot.yml rename to .github/dependabot.yaml index 63e94ac7..f49eabc9 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yaml @@ -5,7 +5,7 @@ version: 2 updates: - package-ecosystem: github-actions directory: / - schedule: + schedule: interval: weekly day: "tuesday" time: "01:00" @@ -13,7 +13,7 @@ updates: - package-ecosystem: docker directory: / - schedule: + schedule: interval: weekly day: "tuesday" time: "01:00" @@ -21,7 +21,7 @@ updates: - package-ecosystem: npm directory: / - schedule: + schedule: interval: weekly day: "tuesday" time: "01:00" diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yaml similarity index 100% rename from .github/workflows/build-pull-request.yml rename to .github/workflows/build-pull-request.yaml diff --git a/.github/workflows/deploy-pull-request.yml b/.github/workflows/deploy-pull-request.yaml similarity index 100% rename from .github/workflows/deploy-pull-request.yml rename to .github/workflows/deploy-pull-request.yaml diff --git a/.github/workflows/netlify-dev.yaml b/.github/workflows/netlify-dev.yaml index d1100ebf..5a71fcdd 100644 --- a/.github/workflows/netlify-dev.yaml +++ b/.github/workflows/netlify-dev.yaml @@ -10,7 +10,7 @@ jobs: name: 'Deploy' runs-on: ubuntu-latest - steps: + steps: - name: Checkout repository uses: actions/checkout@v3.0.0 - name: Build and deploy to Netlify diff --git a/src/app/molecules/room-history-visibility/RoomHistoryVisibility.jsx b/src/app/molecules/room-history-visibility/RoomHistoryVisibility.jsx index 766f7653..6a72a99b 100644 --- a/src/app/molecules/room-history-visibility/RoomHistoryVisibility.jsx +++ b/src/app/molecules/room-history-visibility/RoomHistoryVisibility.jsx @@ -17,19 +17,19 @@ const visibility = { const items = [{ iconSrc: null, - text: 'World readable (anyone can read)', + text: 'Anyone (including guests)', type: visibility.WORLD_READABLE, }, { iconSrc: null, - text: 'Member shared (since the point in time of selecting this option)', + text: 'Members (all messages)', type: visibility.SHARED, }, { iconSrc: null, - text: 'Member invited (since they were invited)', + text: 'Members (messages after invite)', type: visibility.INVITED, }, { iconSrc: null, - text: 'Member joined (since they joined)', + text: 'Members (messages after join)', type: visibility.JOINED, }]; @@ -87,7 +87,7 @@ function RoomHistoryVisibility({ roomId }) { )) } - Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged. + Changes to history visibility will only apply to future messages. The visibility of existing history will have no effect. ); } diff --git a/src/app/organisms/create-room/CreateRoom.jsx b/src/app/organisms/create-room/CreateRoom.jsx index ac344b09..15be02d2 100644 --- a/src/app/organisms/create-room/CreateRoom.jsx +++ b/src/app/organisms/create-room/CreateRoom.jsx @@ -210,7 +210,7 @@ function CreateRoomContent({ isSpace, parentId, onRequestClose }) { /> )} content={( - Founder (101) override the default Admin (100) power level. + Selecting Admin sets 100 power level whereas Founder sets 101. )} /> diff --git a/src/app/organisms/room/RoomSettings.jsx b/src/app/organisms/room/RoomSettings.jsx index bd083c13..0fb27221 100644 --- a/src/app/organisms/room/RoomSettings.jsx +++ b/src/app/organisms/room/RoomSettings.jsx @@ -123,7 +123,7 @@ function SecuritySettings({ roomId }) {
- Message history visibility (Who can read history) + Message history visibility
diff --git a/src/app/organisms/room/RoomViewContent.jsx b/src/app/organisms/room/RoomViewContent.jsx index dd77e989..96839b24 100644 --- a/src/app/organisms/room/RoomViewContent.jsx +++ b/src/app/organisms/room/RoomViewContent.jsx @@ -63,7 +63,7 @@ function genRoomIntro(mEvent, roomTimeline) { avatarSrc={avatarSrc} name={roomTimeline.room.name} heading={`Welcome to ${roomTimeline.room.name}`} - desc={`This is the beginning of ${roomTimeline.room.name} room.${typeof roomTopic !== 'undefined' ? (` Topic: ${roomTopic}`) : ''}`} + desc={`This is the beginning of the ${roomTimeline.room.name} room.${typeof roomTopic !== 'undefined' ? (` Topic: ${roomTopic}`) : ''}`} time={mEvent ? `Created at ${dateFormat(mEvent.getDate(), 'dd mmmm yyyy, hh:MM TT')}` : null} /> );