Skip to content

chore: merge 'develop' into 'main' #1714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
frappe-pr-bot wants to merge 4 commits into from
Closed

chore: merge 'develop' into 'main' #1714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5eecffb
fix(ui): make install prompt message mobile responsive
vishwajeet-13 Sep 4, 2025
9951642
Merge pull request #1710 from vishwajeet-13/fix/installprompt-respons…
pateljannat Sep 4, 2025
9a10240
chore: update POT file
frappe-pr-bot Sep 5, 2025
3848af0
Merge pull request #1711 from frappe/pot_develop_2025-09-05
pateljannat Sep 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions frontend/src/components/InstallPrompt.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
</template>
</Dialog>

<Popover :show="iosInstallMessage" placement="bottom">
<Popover :show="iosInstallMessage" placement="top">
<template #body>
<div
class="mx-2 mt-[calc(100vh-15rem)] flex flex-col gap-3 rounded bg-blue-100 py-5 drop-shadow-xl"
class="fixed bottom-[4rem] left-1/2 -translate-x-1/2 z-20 w-[90%] flex flex-col gap-3 rounded bg-blue-100 py-5 drop-shadow-xl"
>
<div
class="mb-1 flex flex-row items-center justify-between px-3 text-center"
Expand Down
34 changes: 17 additions & 17 deletions lms/locale/main.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-29 16:04+0000\n"
"PO-Revision-Date: 2025-08-29 16:04+0000\n"
"POT-Creation-Date: 2025-09-05 16:04+0000\n"
"PO-Revision-Date: 2025-09-05 16:04+0000\n"
"Last-Translator: jannat@frappe.io\n"
"Language-Team: jannat@frappe.io\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -1300,7 +1300,7 @@ msgstr ""
msgid "Common keywords that will be used for all pages"
msgstr ""

#: frontend/src/pages/Lesson.vue:829
#: frontend/src/pages/Lesson.vue:839
msgid "Community"
msgstr ""

Expand Down Expand Up @@ -2287,7 +2287,7 @@ msgstr ""
msgid "End Time"
msgstr ""

#: frontend/src/components/LiveClass.vue:89
#: frontend/src/components/LiveClass.vue:92
#: frontend/src/pages/Home/AdminHome.vue:183
#: frontend/src/pages/Home/StudentHome.vue:126
msgid "Ended"
Expand Down Expand Up @@ -2328,7 +2328,7 @@ msgstr ""
msgid "Enrollment Count"
msgstr ""

#: lms/lms/utils.py:1873
#: lms/lms/utils.py:1880
msgid "Enrollment Failed, {0}"
msgstr ""

Expand Down Expand Up @@ -2466,7 +2466,7 @@ msgstr ""
msgid "Evaluator deleted successfully"
msgstr ""

#: lms/lms/api.py:1391
#: lms/lms/api.py:1392
msgid "Evaluator does not exist."
msgstr ""

Expand Down Expand Up @@ -3271,7 +3271,7 @@ msgstr ""
msgid "Jobs"
msgstr ""

#: frontend/src/components/LiveClass.vue:78
#: frontend/src/components/LiveClass.vue:81
#: frontend/src/pages/Home/AdminHome.vue:172
#: frontend/src/pages/Home/StudentHome.vue:115
#: lms/templates/upcoming_evals.html:15
Expand Down Expand Up @@ -4149,7 +4149,7 @@ msgstr ""
msgid "Meta Tags"
msgstr ""

#: lms/lms/api.py:1431
#: lms/lms/api.py:1432
msgid "Meta tags should be a list."
msgstr ""

Expand Down Expand Up @@ -4386,7 +4386,7 @@ msgstr ""
msgid "No introduction"
msgstr ""

#: frontend/src/components/LiveClass.vue:97
#: frontend/src/components/LiveClass.vue:100
msgid "No live classes scheduled"
msgstr ""

Expand Down Expand Up @@ -4472,8 +4472,8 @@ msgstr ""
msgid "Note"
msgstr ""

#: frontend/src/pages/Lesson.vue:359 frontend/src/pages/Lesson.vue:825
#: frontend/src/pages/Lesson.vue:836
#: frontend/src/pages/Lesson.vue:359 frontend/src/pages/Lesson.vue:835
#: frontend/src/pages/Lesson.vue:846
msgid "Notes"
msgstr ""

Expand Down Expand Up @@ -4918,7 +4918,7 @@ msgstr ""
msgid "Please login to continue with payment."
msgstr ""

#: lms/lms/utils.py:2006
#: lms/lms/utils.py:2013
msgid "Please login to enroll in the program."
msgstr ""

Expand Down Expand Up @@ -5998,7 +5998,7 @@ msgstr ""
msgid "Stage"
msgstr ""

#: frontend/src/components/LiveClass.vue:70 frontend/src/components/Quiz.vue:81
#: frontend/src/components/LiveClass.vue:73 frontend/src/components/Quiz.vue:81
#: frontend/src/pages/Home/AdminHome.vue:164
#: frontend/src/pages/Home/StudentHome.vue:107
msgid "Start"
Expand Down Expand Up @@ -6389,7 +6389,7 @@ msgstr ""
msgid "Thanks and Regards"
msgstr ""

#: lms/lms/utils.py:1897
#: lms/lms/utils.py:1904
msgid "The batch is full. Please contact the Administrator."
msgstr ""

Expand Down Expand Up @@ -6468,7 +6468,7 @@ msgstr ""
msgid "This certificate does no expire"
msgstr ""

#: frontend/src/components/LiveClass.vue:83
#: frontend/src/components/LiveClass.vue:86
#: frontend/src/pages/Home/AdminHome.vue:177
#: frontend/src/pages/Home/StudentHome.vue:120
msgid "This class has ended"
Expand All @@ -6478,7 +6478,7 @@ msgstr ""
msgid "This course has:"
msgstr ""

#: lms/lms/utils.py:1758
#: lms/lms/utils.py:1765
msgid "This course is free."
msgstr ""

Expand Down Expand Up @@ -6664,7 +6664,7 @@ msgstr ""
msgid "To Date"
msgstr ""

#: lms/lms/utils.py:1769
#: lms/lms/utils.py:1776
msgid "To join this batch, please contact the Administrator."
msgstr ""

Expand Down
Loading