Skip to content

Commit eae0a4e

Browse files
nucleogenesisnucleogenesis
authored
Merge pull request #13925 from marcellamaki/0.19-string-freeze-updates
0.19 string freeze updates
2 parents f5da465 + b6647a9 commit eae0a4e

File tree

12 files changed

+115
-272
lines changed

12 files changed

+115
-272
lines changed

‎kolibri/plugins/facility/assets/src/routes.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ export default [
116116
{
117117
name: PageNames.USERS_TRASH_PAGE,
118118
component: UsersTrashPage,
119-
path: '/:facility_id?/users/removed',
119+
path: '/:facility_id?/users/deleted',
120120
handler: toRoute => {
121121
if (facilityParamRequiredGuard(toRoute, UsersTrashPage.name)) {
122122
return;

‎kolibri/plugins/facility/assets/src/views/users/NewUsersPage.vue‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@
5555
<template #filterLink>
5656
<KRouterLink
5757
appearance="basic-link"
58-
:text="numAppliedFilters ? numFilters$({ n: numAppliedFilters }) : filterLabel$()"
58+
:text="
59+
numAppliedFilters ? numFilters$({ n: numAppliedFilters }) : coreString('filter')
60+
"
5961
class="filter-button"
6062
:to="overrideRoute($route, { name: PageNames.FILTER_USERS_SIDE_PANEL__NEW_USERS })"
6163
/>
@@ -97,14 +99,14 @@
9799
<KIconButton
98100
ref="enrollButton"
99101
icon="add"
100-
:ariaLabel="enrollToClass$()"
102+
:ariaLabel="enrollInClass$()"
101103
:disabled="!canEnrollOrRemoveFromClass || !hasSelectedUsers"
102104
@click="navigateToSidePanel(PageNames.ENROLL_LEARNERS_SIDE_PANEL__NEW_USERS)"
103105
/>
104106
<KTooltip
105107
reference="enrollButton"
106108
:refs="$refs"
107-
:text="enrollToClass$()"
109+
:text="enrollInClass$()"
108110
/>
109111
<KIconButton
110112
ref="removeButton"
@@ -174,7 +176,7 @@
174176
<KRouterLink
175177
primary
176178
appearance="raised-button"
177-
:text="addNewUserLabel$()"
179+
:text="createNewUserLabel$()"
178180
:to="$store.getters.facilityPageLinks.UserCreatePage"
179181
/>
180182
</div>
@@ -302,14 +304,13 @@
302304
newUsers$,
303305
backToUsers$,
304306
assignCoach$,
305-
enrollToClass$,
307+
enrollInClass$,
306308
removeFromClass$,
307309
deleteSelection$,
308310
noNewUsersLabel$,
309-
addNewUserLabel$,
311+
createNewUserLabel$,
310312
noNewUsersDescription$,
311313
numFilters$,
312-
filterLabel$,
313314
numUsersSelected$,
314315
clearFiltersLabel$,
315316
} = bulkUserManagementStrings;
@@ -397,14 +398,13 @@
397398
newUsers$,
398399
backToUsers$,
399400
assignCoach$,
400-
enrollToClass$,
401+
enrollInClass$,
401402
removeFromClass$,
402403
deleteSelection$,
403404
noNewUsersLabel$,
404-
addNewUserLabel$,
405+
createNewUserLabel$,
405406
noNewUsersDescription$,
406407
numFilters$,
407-
filterLabel$,
408408
numUsersSelected$,
409409
clearFiltersLabel$,
410410

‎kolibri/plugins/facility/assets/src/views/users/UsersRootPage/index.vue‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@
7373
appearance="basic-link"
7474
class="filter-button"
7575
:to="overrideRoute($route, { name: PageNames.FILTER_USERS_SIDE_PANEL })"
76-
:text="numAppliedFilters ? numFilters$({ n: numAppliedFilters }) : filterLabel$()"
76+
:text="
77+
numAppliedFilters ? numFilters$({ n: numAppliedFilters }) : coreString('filter')
78+
"
7779
/>
7880
</template>
7981
<template #clearFiltersButton>
@@ -114,14 +116,14 @@
114116
<KIconButton
115117
ref="enrollButton"
116118
icon="add"
117-
:ariaLabel="enrollToClass$()"
119+
:ariaLabel="enrollInClass$()"
118120
:disabled="!canEnrollOrRemoveFromClass || !hasSelectedUsers"
119121
@click="navigateToSidePanel(PageNames.ENROLL_LEARNERS_SIDE_PANEL)"
120122
/>
121123
<KTooltip
122124
reference="enrollButton"
123125
:refs="$refs"
124-
:text="enrollToClass$()"
126+
:text="enrollInClass$()"
125127
/>
126128
<KIconButton
127129
ref="removeButton"
@@ -138,14 +140,14 @@
138140
<KIconButton
139141
ref="trashButton"
140142
icon="trash"
141-
:ariaLabel="deleteSelectionTooltip"
143+
:ariaLabel="deleteSelection$()"
142144
:disabled="!canDeleteSelection || !hasSelectedUsers"
143145
@click="isMoveToTrashModalOpen = true"
144146
/>
145147
<KTooltip
146148
reference="trashButton"
147149
:refs="$refs"
148-
:text="deleteSelectionTooltip"
150+
:text="deleteSelection$()"
149151
/>
150152
</template>
151153
<template #paginationControls>
@@ -244,12 +246,10 @@
244246
viewTrash$,
245247
assignCoach$,
246248
viewNewUsers$,
247-
enrollToClass$,
249+
enrollInClass$,
248250
removeFromClass$,
249251
deleteSelection$,
250-
cannotDeleteSelfTooltip$,
251252
numFilters$,
252-
filterLabel$,
253253
numUsersSelected$,
254254
clearFiltersLabel$,
255255
} = bulkUserManagementStrings;
@@ -391,12 +391,10 @@
391391
viewTrash$,
392392
assignCoach$,
393393
viewNewUsers$,
394-
enrollToClass$,
394+
enrollInClass$,
395395
removeFromClass$,
396396
deleteSelection$,
397-
cannotDeleteSelfTooltip$,
398397
numFilters$,
399-
filterLabel$,
400398
numUsersSelected$,
401399
clearFiltersLabel$,
402400
};
@@ -470,12 +468,6 @@
470468
}
471469
return false;
472470
},
473-
deleteSelectionTooltip() {
474-
if (this.listContainsLoggedInUser) {
475-
return this.cannotDeleteSelfTooltip$();
476-
}
477-
return this.deleteSelection$();
478-
},
479471
},
480472
methods: {
481473
handlePageDropdownSelection(option) {

‎kolibri/plugins/facility/assets/src/views/users/UsersTrashPage/index.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@
4646
<template #filterLink>
4747
<KRouterLink
4848
appearance="basic-link"
49-
:text="numAppliedFilters ? numFilters$({ n: numAppliedFilters }) : filterLabel$()"
49+
:text="
50+
numAppliedFilters ? numFilters$({ n: numAppliedFilters }) : coreString('filter')
51+
"
5052
class="filter-button"
5153
:to="overrideRoute($route, { name: PageNames.FILTER_USERS_SIDE_PANEL__TRASH })"
5254
/>
@@ -258,7 +260,6 @@
258260
recoverSelectionLabel$,
259261
deletePermanentlyLabel$,
260262
numFilters$,
261-
filterLabel$,
262263
numUsersSelected$,
263264
clearFiltersLabel$,
264265
} = bulkUserManagementStrings;
@@ -402,7 +403,6 @@
402403
removedUsersNotice$,
403404
noRemovedUsersLabel$,
404405
numFilters$,
405-
filterLabel$,
406406
numUsersSelected$,
407407
clearFiltersLabel$,
408408
};

‎kolibri/plugins/facility/assets/src/views/users/common/MoveToTrashModal.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
const usersRemoved = ref(null);
7575
7676
const {
77-
trashUndoneNotice$,
77+
actionSuccessful$,
7878
movingToTrash$,
7979
moveToTrashAction$,
8080
moveToTrashLabel$,
@@ -132,15 +132,15 @@
132132
await DeletedFacilityUserResource.restoreCollection({
133133
by_ids: usersRemoved.value.join(','),
134134
});
135-
createSnackbar(trashUndoneNotice$());
135+
createSnackbar(actionSuccessful$());
136136
props.onChange();
137137
};
138138
139139
const { performAction: moveToTrash } = useActionWithUndo({
140140
action: _moveToTrash,
141141
actionNotice$: usersTrashedNotice$,
142142
undoAction: undoMoveToTrash,
143-
undoActionNotice$: trashUndoneNotice$,
143+
undoActionNotice$: actionSuccessful$,
144144
onBlur: props.onBlur,
145145
});
146146

‎kolibri/plugins/facility/assets/src/views/users/common/UsersTable.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -589,12 +589,12 @@
589589
/deep/ .k-table-wrapper {
590590
tr td:first-child,
591591
tr th:first-child {
592-
padding: 0.675em 1em;
592+
padding: 0 1em;
593593
}
594594
595595
tr td:last-child,
596596
tr th:last-child {
597-
padding: 0.675em 1em;
597+
padding: 0 1em;
598598
}
599599
}
600600

‎kolibri/plugins/facility/assets/src/views/users/sidePanels/AssignCoachesSidePanel.vue‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@closePanel="closeSidePanel"
1212
>
1313
<template #header>
14-
<h1 class="side-panel-title">{{ assignUsersHeading$({ num: selectedUsersCount }) }}</h1>
14+
<h1 class="side-panel-title">{{ assignUsersHeading$({ num: eligibleUsersCount }) }}</h1>
1515
</template>
1616

1717
<div class="assign-coaches-content">
@@ -26,6 +26,7 @@
2626
</div>
2727

2828
<div
29+
v-if="ineligibleUsersCount > 0"
2930
class="info-box"
3031
:style="{ backgroundColor: $themePalette.grey.v_100 }"
3132
>
@@ -35,13 +36,11 @@
3536
class="info-icon"
3637
/>
3738
<div class="info-wrapper">
38-
<template v-if="ineligibleUsersCount > 0">
39+
<template>
3940
<span>
4041
{{ numUsersNotEligible$({ num: ineligibleUsersCount }) }}
4142
</span>
42-
<span>{{ usersInClassNotAffected$() }}</span>
4343
</template>
44-
<span v-else>{{ usersInClassNotAffected$() }}</span>
4544
</div>
4645
</div>
4746
</div>
@@ -154,8 +153,7 @@
154153
155154
const {
156155
coachesAssignedNotice$,
157-
assignCoachUndoneNotice$,
158-
usersInClassNotAffected$,
156+
actionSuccessful$,
159157
assignAction$,
160158
searchForAClass$,
161159
defaultErrorMessage$,
@@ -193,8 +191,6 @@
193191
.map(({ id, name }) => ({ id, label: name }));
194192
});
195193
196-
const selectedUsersCount = computed(() => props.selectedUsers.size);
197-
198194
const hasSelectedClasses = computed(() => selectedClasses.value.length > 0);
199195
200196
const hasUnsavedChanges = computed(() => {
@@ -220,6 +216,7 @@
220216
return facilityUsers.value.filter(user => user.kind === UserKinds.LEARNER);
221217
});
222218
const ineligibleUsersCount = computed(() => ineligibleUsers.value.length);
219+
const eligibleUsersCount = computed(() => eligibleUsers.value.length);
223220
224221
// Methods
225222
async function _handleAssign() {
@@ -282,7 +279,7 @@
282279
action: _handleAssign,
283280
actionNotice$: coachesAssignedNotice$,
284281
undoAction: handleUndoAssignments,
285-
undoActionNotice$: assignCoachUndoneNotice$,
282+
undoActionNotice$: actionSuccessful$,
286283
onBlur: props.onBlur,
287284
});
288285
@@ -295,13 +292,12 @@
295292
selectedClasses,
296293
isLoading,
297294
formattedClasses,
298-
selectedUsersCount,
299295
hasSelectedClasses,
300296
hasUnsavedChanges,
297+
eligibleUsersCount,
301298
ineligibleUsersCount,
302299
showErrorWarning,
303300
defaultErrorMessage$,
304-
usersInClassNotAffected$,
305301
assignAction$,
306302
searchForAClass$,
307303
selectClassesLabel$,

0 commit comments

Comments
 (0)