Skip to content

Commit 5450358

Browse files
marcellamakimarcellamaki
committed
Update ESoCC strings after UX writing review
1 parent 502b5ce commit 5450358

8 files changed

Lines changed: 69 additions & 99 deletions

File tree

‎contentcuration/contentcuration/frontend/administration/components/CommunityLibraryStatusButton.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
icon: 'circleCheckmark',
4949
},
5050
[CommunityLibraryStatus.REJECTED]: {
51-
text: 'Flagged',
52-
tooltip: 'Review flagged submission',
51+
text: 'Needs changes',
52+
tooltip: 'Submission requires changes before approval',
5353
color: theme.red.v_100,
5454
darkColor: theme.red.v_200,
5555
labelColor: theme.red.v_600,

‎contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/PublishSidePanel.vue‎

Lines changed: 18 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
<component :is="showDraftMode ? 'KRadioButtonGroup' : 'div'">
1717
<KRadioButton
1818
v-if="showDraftMode"
19-
:label="modeLive$()"
19+
:label="publishChannelMode$()"
2020
:buttonValue="PublishModes.LIVE"
2121
:currentValue="mode"
22-
:description="modeLiveDescription$()"
22+
:description="publishChannelDescription$()"
2323
@input="mode = PublishModes.LIVE"
2424
/>
2525

@@ -53,7 +53,7 @@
5353
showInvalidText
5454
:label="versionDescriptionLabel$()"
5555
:invalid="isVersionNotesBlurred && !isVersionNotesValid"
56-
:invalidText="versionNotesRequiredMessage$()"
56+
:invalidText="fieldRequired$()"
5757
textArea
5858
:maxlength="250"
5959
:appearanceOverrides="{ maxWidth: 'none' }"
@@ -70,7 +70,7 @@
7070
v-model="newChannelLanguage"
7171
:label="languageLabel$()"
7272
:invalid="isLanguageSelectBlurred && !isNewLanguageValid"
73-
:invalidText="languageRequiredMessage$()"
73+
:invalidText="fieldRequired$()"
7474
:options="languageOptions"
7575
@blur="isLanguageSelectBlurred = true"
7676
/>
@@ -112,26 +112,17 @@
112112
>
113113
{{ incompleteResourcesDescription1$() }}
114114
</div>
115-
<div
116-
class="warning-description"
117-
:style="{
118-
color: $themePalette.grey.v_800,
119-
marginTop: '16px',
120-
}"
121-
>
122-
{{ incompleteResourcesDescription2$() }}
123-
</div>
124115
</div>
125116
</div>
126117
</div>
127118
</div>
128119

129120
<KRadioButton
130121
v-if="showDraftMode"
131-
:label="modeDraft$()"
122+
:label="publishDraftMode$()"
132123
:buttonValue="PublishModes.DRAFT"
133124
:currentValue="mode"
134-
:description="modeDraftDescription$()"
125+
:description="publishDraftDescription$()"
135126
@input="mode = PublishModes.DRAFT"
136127
/>
137128
</component>
@@ -166,6 +157,7 @@
166157
import { Channel, CommunityLibrarySubmission } from 'shared/data/resources';
167158
import { forceServerSync } from 'shared/data/serverSync';
168159
import { communityChannelsStrings } from 'shared/strings/communityChannelsStrings';
160+
import commonStrings from 'shared/translator';
169161
import { LanguagesList } from 'shared/leUtils/Languages';
170162
import logging from 'shared/logging';
171163
import { FeatureFlagKeys } from 'shared/constants';
@@ -205,23 +197,22 @@
205197
publishChannel$,
206198
publishAction$,
207199
saveDraft$,
208-
modeLive$,
209-
modeDraft$,
200+
publishChannelMode$,
201+
publishDraftMode$,
210202
versionNotesLabel$,
211-
modeLiveDescription$,
212-
modeDraftDescription$,
203+
publishChannelDescription$,
204+
publishDraftDescription$,
213205
publishingInfo$,
214206
versionDescriptionLabel$,
215207
incompleteResourcesWarning$,
216208
incompleteResourcesDescription1$,
217-
incompleteResourcesDescription2$,
218209
cancelAction$,
219210
languageLabel$,
220-
languageRequiredMessage$,
221211
draftBeingPublishedNotice$,
222-
versionNotesRequiredMessage$,
223212
} = communityChannelsStrings;
224213
214+
const { fieldRequired$ } = commonStrings;
215+
225216
const currentChannel = computed(() => store.getters['currentChannel/currentChannel']);
226217
const getContentNode = computed(() => store.getters['contentNode/getContentNode']);
227218
const areAllChangesSaved = computed(() => store.getters['areAllChangesSaved']);
@@ -416,21 +407,19 @@
416407
isVersionNotesValid,
417408
submitText,
418409
419-
modeLive$,
420-
modeDraft$,
410+
publishChannelMode$,
411+
publishDraftMode$,
421412
publishChannel$,
422413
versionNotesLabel$,
423-
modeLiveDescription$,
424-
modeDraftDescription$,
414+
publishChannelDescription$,
415+
publishDraftDescription$,
425416
publishingInfo$,
426417
versionDescriptionLabel$,
427418
incompleteResourcesWarning$,
428419
incompleteResourcesDescription1$,
429-
incompleteResourcesDescription2$,
430420
cancelAction$,
431421
languageLabel$,
432-
languageRequiredMessage$,
433-
versionNotesRequiredMessage$,
422+
fieldRequired$,
434423
435424
onClose,
436425
submit,

‎contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/__tests__/SubmitToCommunityLibrarySidePanel.spec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jest.mock('shared/data/resources', () => ({
3030

3131
const store = factory();
3232

33-
const { nonePrimaryInfo$, flaggedPrimaryInfo$, approvedPrimaryInfo$, submittedPrimaryInfo$ } =
33+
const { nonePrimaryInfo$, needsChangesPrimaryInfo$, approvedPrimaryInfo$, submittedPrimaryInfo$ } =
3434
communityChannelsStrings;
3535

3636
async function makeWrapper({ channel, publishedData, latestSubmission }) {
@@ -195,7 +195,7 @@ describe('SubmitToCommunityLibrarySidePanel', () => {
195195

196196
const infoSection = wrapper.find('.info-section');
197197
expect(infoSection.exists()).toBe(true);
198-
expect(infoSection.text()).toContain(flaggedPrimaryInfo$());
198+
expect(infoSection.text()).toContain(needsChangesPrimaryInfo$());
199199
});
200200

201201
it('when the previous submission was approved', async () => {

‎contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/SubmitToCommunityLibrarySidePanel/index.vue‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
v-model="description"
176176
:disabled="!canBeEdited"
177177
:invalid="description.length < 1"
178-
:invalidText="descriptionRequired$()"
178+
:invalidText="fieldRequired$()"
179179
textArea
180180
:label="descriptionLabel$()"
181181
:maxlength="250"
@@ -240,6 +240,7 @@
240240
import { translateMetadataString } from 'shared/utils/metadataStringsTranslation';
241241
import countriesUtil from 'shared/utils/countries';
242242
import { communityChannelsStrings } from 'shared/strings/communityChannelsStrings';
243+
import commonStrings from 'shared/translator';
243244
import { CommunityLibrarySubmission } from 'shared/data/resources';
244245
245246
import SidePanelModal from 'shared/views/SidePanelModal';
@@ -276,7 +277,6 @@
276277
lessDetailsButton$,
277278
countryLabel$,
278279
descriptionLabel$,
279-
descriptionRequired$,
280280
notPublishedWarningTitle$,
281281
notPublishedWarningDescription$,
282282
publicWarningTitle$,
@@ -285,9 +285,8 @@
285285
alreadySubmittedWarningDescription$,
286286
submitButton$,
287287
cancelAction$,
288-
submittedPrimaryInfo$,
289288
approvedPrimaryInfo$,
290-
flaggedPrimaryInfo$,
289+
needsChangesPrimaryInfo$,
291290
nonePrimaryInfo$,
292291
channelVersion$,
293292
submittedSnackbar$,
@@ -297,6 +296,8 @@
297296
confirmReplacementText$,
298297
} = communityChannelsStrings;
299298
299+
const { fieldRequired$ } = commonStrings;
300+
300301
const annotationColor = computed(() => tokensTheme.annotation);
301302
const infoTextColor = computed(() => paletteTheme.grey.v_700);
302303
@@ -343,17 +344,13 @@
343344
if (!latestSubmissionIsFinished.value) return undefined;
344345
345346
switch (latestSubmissionStatus.value) {
346-
case CommunityLibraryStatus.PENDING:
347-
return {
348-
primaryText: submittedPrimaryInfo$(),
349-
};
350347
case CommunityLibraryStatus.APPROVED:
351348
return {
352349
primaryText: approvedPrimaryInfo$(),
353350
};
354351
case CommunityLibraryStatus.REJECTED:
355352
return {
356-
primaryText: flaggedPrimaryInfo$(),
353+
primaryText: needsChangesPrimaryInfo$(),
357354
};
358355
case null:
359356
return {
@@ -572,7 +569,7 @@
572569
lessDetailsButton$,
573570
countryLabel$,
574571
descriptionLabel$,
575-
descriptionRequired$,
572+
fieldRequired$,
576573
channelVersion$,
577574
notPublishedWarningTitle$,
578575
notPublishedWarningDescription$,

‎contentcuration/contentcuration/frontend/channelEdit/components/sidePanels/__tests__/PublishSidePanel.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ describe('PublishSidePanel', () => {
8080

8181
// Headers and default texts
8282
expect(screen.getByText(communityChannelsStrings.publishChannel$())).toBeVisible();
83-
expect(screen.getByText(communityChannelsStrings.modeLive$())).toBeVisible();
83+
expect(screen.getByText(communityChannelsStrings.publishChannelMode$())).toBeVisible();
8484

8585
expect(
8686
screen.getByText(communityChannelsStrings.publishingInfo$({ version: 2 })),

0 commit comments

Comments
 (0)