Merge branch 'develop' into pot_develop_2025-08-22

frontend/src/components/LiveClass.vue

@@ -52,7 +52,7 @@
 					<Clock class="w-4 h-4 stroke-1.5" />
 					<span>
 						{{ formatTime(cls.time) }} -
-						{{ dayjs(getClassEnd(cls)).format('HH:mm') }}
+						{{ dayjs(getClassEnd(cls)).format('HH:mm A') }}
 					</span>
 				</div>
 				<div

frontend/src/pages/Programs/Programs.vue

@@ -12,7 +12,12 @@
 	</header>
 	<div v-if="programs.data?.length && !isStudent" class="py-10 w-3/4 mx-auto">
 		<div class="text-lg font-semibold text-ink-gray-9 mb-5">
-			{{ __('{0} Programs').format(programs.data.length) }}
+			{{
+				__('{0} {1}').format(
+					programs.data.length,
+					programs.data.length == 1 ? __('Program') : __('Programs')
+				)
+			}}
 		</div>
 		<div class="grid grid-cols-1 lg:grid-cols-3 gap-5">
 			<div