Merge pull request #1662 from frappe/develop

chore: merge 'develop' into 'main'

frontend/src/components/CourseCard.vue

@@ -18,7 +18,7 @@
 			<div class="flex items-center flex-wrap relative top-4 px-2 w-fit">
 				<div
 					v-if="course.featured"
-					class="flex items-center space-x-1 text-xs text-ink-amber-3 bg-surface-white border border-outline-amber-1 px-2 py-0.5 rounded-md mr-1 mb-1"
+					class="flex items-center space-x-1 text-xs text-ink-amber-3 bg-surface-white px-2 py-0.5 rounded-md mr-1 mb-1"
 				>
 					<Star class="size-3 stroke-2" />
 					<span>
@@ -35,7 +35,7 @@
 			</div>
 			<div
 				v-if="!course.image"
-				class="flex items-center justify-center text-white flex-1 font-extrabold text-2xl my-auto px-5 text-center leading-6"
+				class="flex items-center justify-center text-white flex-1 font-extrabold text-2xl my-auto"
 				:class="course.tags ? 'h-[80%]' : 'h-full'"
 			>
 				{{ course.title }}
@@ -120,7 +120,7 @@
 					v-if="course.paid_certificate || course.enable_certification"
 					:text="__('Get Certified')"
 				>
-					<GraduationCap class="size-5 stroke-1.5 text-ink-gray-7" />
+					<GraduationCap class="size-5 stroke-1.5" />
 				</Tooltip>
 			</div>
 		</div>

frontend/src/components/Modals/AnnouncementModal.vue

@@ -25,7 +25,6 @@
 				<div class="">
 					<div class="mb-1.5 text-sm text-ink-gray-5">
 						{{ __('Reply To') }}
-						<span class="text-ink-red-3">*</span>
 					</div>
 					<Input type="text" v-model="announcement.replyTo" />
 				</div>
@@ -71,8 +70,8 @@ const announcementResource = createResource({
 	url: 'frappe.core.doctype.communication.email.make',
 	makeParams(values) {
 		return {
-			recipients: announcement.replyTo,
+			recipients: props.students.join(', '),
-			bcc: props.students.join(', '),
+			cc: announcement.replyTo,
 			subject: announcement.subject,
 			content: announcement.announcement,
 			doctype: 'LMS Batch',
@@ -96,9 +95,6 @@ const makeAnnouncement = (close) => {
 				if (!announcement.announcement) {
 					return __('Announcement is required')
 				}
-				if (!announcement.replyTo) {
-					return __('Reply To is required')
-				}
 			},
 			onSuccess() {
 				close()

lms/locale/main.pot

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Frappe LMS VERSION\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-08-01 16:04+0000\n"
+"POT-Creation-Date: 2025-07-25 16:04+0000\n"
-"PO-Revision-Date: 2025-08-01 16:04+0000\n"
+"PO-Revision-Date: 2025-07-25 16:04+0000\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: jannat@frappe.io\n"
 "MIME-Version: 1.0\n"
@@ -182,7 +182,7 @@ msgstr ""
 msgid "Add a Student"
 msgstr ""
 
-#: frontend/src/components/AppSidebar.vue:584
+#: frontend/src/components/AppSidebar.vue:568
 msgid "Add a chapter"
 msgstr ""
 
@@ -194,7 +194,7 @@ msgstr ""
 msgid "Add a keyword and then press enter"
 msgstr ""
 
-#: frontend/src/components/AppSidebar.vue:585
+#: frontend/src/components/AppSidebar.vue:569
 msgid "Add a lesson"
 msgstr ""
 
@@ -227,7 +227,7 @@ msgstr ""
 msgid "Add at least one possible answer for this question: {0}"
 msgstr ""
 
-#: frontend/src/components/AppSidebar.vue:548
+#: frontend/src/components/AppSidebar.vue:532
 msgid "Add courses to your batch"
 msgstr ""
 
@@ -235,7 +235,7 @@ msgstr ""
 msgid "Add quiz to this video"
 msgstr ""
 
-#: frontend/src/components/AppSidebar.vue:527
+#: frontend/src/components/AppSidebar.vue:511
 msgid "Add students to your batch"
 msgstr ""
 
@@ -247,11 +247,11 @@ msgstr ""
 msgid "Add your assignment as {0}"
 msgstr ""
 
-#: frontend/src/components/AppSidebar.vue:460
+#: frontend/src/components/AppSidebar.vue:444
 msgid "Add your first chapter"
 msgstr ""
 
-#: frontend/src/components/AppSidebar.vue:476
+#: frontend/src/components/AppSidebar.vue:460
 msgid "Add your first lesson"
 msgstr ""
 
@@ -366,15 +366,15 @@ msgstr ""
 msgid "Amount with GST"
 msgstr ""
 
-#: frontend/src/components/Modals/AnnouncementModal.vue:34
+#: frontend/src/components/Modals/AnnouncementModal.vue:33
 msgid "Announcement"
 msgstr ""
 
-#: frontend/src/components/Modals/AnnouncementModal.vue:105
+#: frontend/src/components/Modals/AnnouncementModal.vue:101
 msgid "Announcement has been sent successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/AnnouncementModal.vue:97
+#: frontend/src/components/Modals/AnnouncementModal.vue:96
 msgid "Announcement is required"
 msgstr ""
 
@@ -472,7 +472,7 @@ msgid "Assessment {0} has already been added to this batch."
 msgstr ""
 
 #. Label of the show_assessments (Check) field in DocType 'LMS Settings'
-#: frontend/src/components/AppSidebar.vue:597
+#: frontend/src/components/AppSidebar.vue:581
 #: frontend/src/components/Assessments.vue:5
 #: frontend/src/components/BatchStudents.vue:32
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -554,7 +554,7 @@ msgstr ""
 msgid "Assignment will appear at the bottom of the lesson."
 msgstr ""
 
-#: frontend/src/components/AppSidebar.vue:601
+#: frontend/src/components/AppSidebar.vue:585
 #: frontend/src/components/Settings/Badges.vue:163
 #: frontend/src/pages/Assignments.vue:208 lms/www/lms.py:273
 msgid "Assignments"
@@ -618,8 +618,8 @@ msgstr ""
 msgid "Average Rating"
 msgstr ""
 
-#: frontend/src/components/Modals/VideoStatistics.vue:72
+#: frontend/src/components/Modals/VideoStatistics.vue:65
-msgid "Average Watch Time (minutes)"
+msgid "Average Watch Time (seconds)"
 msgstr ""
 
 #: frontend/src/pages/Lesson.vue:151
@@ -966,7 +966,7 @@ msgstr ""
 #. Enrollment'
 #. Label of a Card Break in the LMS Workspace
 #. Label of a Link in the LMS Workspace
-#: frontend/src/components/AppSidebar.vue:605
+#: frontend/src/components/AppSidebar.vue:589
 #: frontend/src/components/Modals/Event.vue:381
 #: frontend/src/pages/BatchForm.vue:69 frontend/src/pages/Batches.vue:38
 #: frontend/src/pages/CourseCertification.vue:10
@@ -994,8 +994,8 @@ msgid "Certified"
 msgstr ""
 
 #. Label of the certified_members (Check) field in DocType 'LMS Settings'
-#: frontend/src/pages/CertifiedParticipants.vue:183
+#: frontend/src/pages/CertifiedParticipants.vue:182
-#: frontend/src/pages/CertifiedParticipants.vue:190
+#: frontend/src/pages/CertifiedParticipants.vue:189
 #: frontend/src/pages/Statistics.vue:40
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Certified Members"
@@ -1715,15 +1715,15 @@ msgstr ""
 msgid "Create a Quiz"
 msgstr ""
 
-#: frontend/src/components/AppSidebar.vue:592
+#: frontend/src/components/AppSidebar.vue:576
 msgid "Create a batch"
 msgstr ""
 
-#: frontend/src/components/AppSidebar.vue:583
+#: frontend/src/components/AppSidebar.vue:567
 msgid "Create a course"
 msgstr ""
 
-#: frontend/src/components/AppSidebar.vue:593
+#: frontend/src/components/AppSidebar.vue:577
 msgid "Create a live class"
 msgstr ""
 
@@ -1735,15 +1735,15 @@ msgstr ""
 msgid "Create an Assignment"
 msgstr ""
 
-#: frontend/src/components/AppSidebar.vue:517
+#: frontend/src/components/AppSidebar.vue:501
 msgid "Create your first batch"
 msgstr ""
 
-#: frontend/src/components/AppSidebar.vue:448
+#: frontend/src/components/AppSidebar.vue:432
 msgid "Create your first course"
 msgstr ""
 
-#: frontend/src/components/AppSidebar.vue:495
+#: frontend/src/components/AppSidebar.vue:479
 msgid "Create your first quiz"
 msgstr ""
 
@@ -1751,11 +1751,11 @@ msgstr ""
 msgid "Created"
 msgstr ""
 
-#: frontend/src/components/AppSidebar.vue:589
+#: frontend/src/components/AppSidebar.vue:573
 msgid "Creating a batch"
 msgstr ""
 
-#: frontend/src/components/AppSidebar.vue:580
+#: frontend/src/components/AppSidebar.vue:564
 msgid "Creating a course"
 msgstr ""
 
@@ -1774,7 +1774,7 @@ msgstr ""
 msgid "Current Lesson"
 msgstr ""
 
-#: frontend/src/components/AppSidebar.vue:611
+#: frontend/src/components/AppSidebar.vue:595
 msgid "Custom Certificate Templates"
 msgstr ""
 
@@ -2506,7 +2506,7 @@ msgstr ""
 msgid "Failed to update badge assignment: "
 msgstr ""
 
-#: frontend/src/utils/index.js:659
+#: frontend/src/utils/index.js:670
 msgid "Failed to update meta tags {0}"
 msgstr ""
 
@@ -3005,8 +3005,8 @@ msgstr ""
 msgid "Interest"
 msgstr ""
 
-#: frontend/src/components/AppSidebar.vue:572
+#: frontend/src/components/AppSidebar.vue:556
-#: frontend/src/components/AppSidebar.vue:575
+#: frontend/src/components/AppSidebar.vue:559
 msgid "Introduction"
 msgstr ""
 
@@ -3044,7 +3044,7 @@ msgstr ""
 msgid "Invite Request"
 msgstr ""
 
-#: frontend/src/components/AppSidebar.vue:506
+#: frontend/src/components/AppSidebar.vue:490
 msgid "Invite your team and students"
 msgstr ""
 
@@ -3076,7 +3076,7 @@ msgstr ""
 msgid "Issue Date"
 msgstr ""
 
-#: frontend/src/components/AppSidebar.vue:608
+#: frontend/src/components/AppSidebar.vue:592
 msgid "Issue a Certificate"
 msgstr ""
 
@@ -3785,7 +3785,7 @@ msgstr ""
 #. Label of the member (Link) field in DocType 'LMS Zoom Settings'
 #: frontend/src/components/Modals/CourseProgressSummary.vue:216
 #: frontend/src/components/Modals/LiveClassAttendance.vue:14
-#: frontend/src/components/Modals/VideoStatistics.vue:29
+#: frontend/src/components/Modals/VideoStatistics.vue:22
 #: frontend/src/components/Modals/ZoomAccountModal.vue:42
 #: frontend/src/components/Settings/BadgeAssignmentForm.vue:26
 #: frontend/src/components/Settings/BadgeAssignments.vue:179
@@ -4065,7 +4065,7 @@ msgstr ""
 msgid "Monday"
 msgstr ""
 
-#: frontend/src/components/AppSidebar.vue:616
+#: frontend/src/components/AppSidebar.vue:600
 msgid "Monetization"
 msgstr ""
 
@@ -4253,11 +4253,7 @@ msgstr ""
 msgid "No slots available for this date."
 msgstr ""
 
-#: frontend/src/components/Modals/VideoStatistics.vue:84
+#: frontend/src/components/Modals/AnnouncementModal.vue:90
-msgid "No statistics available for this video."
-msgstr ""
-
-#: frontend/src/components/Modals/AnnouncementModal.vue:91
 msgid "No students in this batch"
 msgstr ""
 
@@ -4366,7 +4362,7 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr ""
 
-#: frontend/src/utils/index.js:491
+#: frontend/src/utils/index.js:502
 msgid "Only image file is allowed."
 msgstr ""
 
@@ -5204,7 +5200,7 @@ msgstr ""
 msgid "Quiz will appear at the bottom of the lesson."
 msgstr ""
 
-#: frontend/src/components/AppSidebar.vue:600
+#: frontend/src/components/AppSidebar.vue:584
 #: frontend/src/pages/QuizForm.vue:396 frontend/src/pages/Quizzes.vue:275
 #: frontend/src/pages/Quizzes.vue:285 lms/www/lms.py:251
 msgid "Quizzes"
@@ -5308,10 +5304,6 @@ msgstr ""
 msgid "Reply To"
 msgstr ""
 
-#: frontend/src/components/Modals/AnnouncementModal.vue:100
-msgid "Reply To is required"
-msgstr ""
-
 #: lms/lms/widgets/RequestInvite.html:7
 msgid "Request Invite"
 msgstr ""
@@ -5381,7 +5373,7 @@ msgstr ""
 msgid "Role updated successfully"
 msgstr ""
 
-#: frontend/src/components/AppSidebar.vue:628
+#: frontend/src/components/AppSidebar.vue:612
 msgid "Roles"
 msgstr ""
 
@@ -5505,8 +5497,7 @@ msgid "Search"
 msgstr ""
 
 #: frontend/src/components/Modals/CourseProgressSummary.vue:18
-#: frontend/src/components/Modals/VideoStatistics.vue:20
+msgid "Search by Member Name"
-msgid "Search by Member"
 msgstr ""
 
 #: frontend/src/pages/CertifiedParticipants.vue:23
@@ -5593,15 +5584,15 @@ msgstr ""
 msgid "Set your Password"
 msgstr ""
 
-#: frontend/src/components/AppSidebar.vue:576
+#: frontend/src/components/AppSidebar.vue:560
 msgid "Setting up"
 msgstr ""
 
-#: frontend/src/components/AppSidebar.vue:621
+#: frontend/src/components/AppSidebar.vue:605
 msgid "Setting up payment gateway"
 msgstr ""
 
-#: frontend/src/components/AppSidebar.vue:626
+#: frontend/src/components/AppSidebar.vue:610
 #: frontend/src/components/Settings/Settings.vue:7
 #: frontend/src/pages/BatchForm.vue:53 frontend/src/pages/CourseForm.vue:142
 #: frontend/src/pages/ProfileRoles.vue:4
@@ -5946,7 +5937,7 @@ msgstr ""
 msgid "Subject"
 msgstr ""
 
-#: frontend/src/components/Modals/AnnouncementModal.vue:94
+#: frontend/src/components/Modals/AnnouncementModal.vue:93
 msgid "Subject is required"
 msgstr ""
 
@@ -6750,7 +6741,7 @@ msgid "Volunteering or Internship"
 msgstr ""
 
 #. Label of the watch_time (Data) field in DocType 'LMS Video Watch Duration'
-#: frontend/src/components/Modals/VideoStatistics.vue:32
+#: frontend/src/components/Modals/VideoStatistics.vue:25
 #: lms/lms/doctype/lms_video_watch_duration/lms_video_watch_duration.json
 msgid "Watch Time"
 msgstr ""