Merge pull request #169 from frappe/develop

chore: Merge develop to main

frontend/src/components/Activities.vue

@@ -475,8 +475,11 @@
           <div
             class="cursor-pointer rounded bg-gray-50 px-4 py-3 text-base leading-6 transition-all duration-300 ease-in-out"
           >
-            <div v-html="activity.content" />
-            <div v-if="activity.attachments.length" class="flex flex-wrap gap-2 mt-2">
+            <div class="prose-f" v-html="activity.content" />
+            <div
+              v-if="activity.attachments.length"
+              class="mt-2 flex flex-wrap gap-2"
+            >
               <AttachmentItem
                 v-for="a in activity.attachments"
                 :key="a.file_url"

frontend/src/components/Layouts/AppSidebar.vue

@@ -10,7 +10,7 @@
       <div class="mb-3 flex flex-col">
         <SidebarLink
           id="notifications-btn"
-          label="Notifications"
+          :label="__('Notifications')"
           :icon="NotificationsIcon"
           :isCollapsed="isSidebarCollapsed"
           @click="() => toggleNotificationPanel()"
@@ -67,7 +67,7 @@
             <SidebarLink
               v-for="link in view.views"
               :icon="link.icon"
-              :label="link.label"
+              :label="__(link.label)"
               :to="link.to"
               :isCollapsed="isSidebarCollapsed"
               class="mx-2 my-0.5"
@@ -78,7 +78,7 @@
     </div>
     <div class="m-2 flex flex-col gap-1">
       <SidebarLink
-        :label="isSidebarCollapsed ? 'Expand' : 'Collapse'"
+        :label="isSidebarCollapsed ? __('Expand') : __('Collapse')"
         :isCollapsed="isSidebarCollapsed"
         @click="isSidebarCollapsed = !isSidebarCollapsed"
         class=""

frontend/src/components/SidebarLink.vue

@@ -9,7 +9,7 @@
       :class="isCollapsed ? 'ml-[3px] p-1' : 'px-2 py-1'"
     >
       <div class="flex items-center truncate">
-        <Tooltip :text="__(label)" placement="right" :disabled="!isCollapsed">
+        <Tooltip :text="label" placement="right" :disabled="!isCollapsed">
           <slot name="icon">
             <span class="grid h-4.5 w-4.5 flex-shrink-0 place-items-center">
               <FeatherIcon
@@ -21,7 +21,7 @@
             </span>
           </slot>
         </Tooltip>
-        <Tooltip :text="__(label)" placement="right" :disabled="isCollapsed" hoverDelay="1.5">
+        <Tooltip :text="label" placement="right" :disabled="isCollapsed" hoverDelay="1.5">
           <span
             class="flex-1 flex-shrink-0 truncate text-base duration-300 ease-in-out"
             :class="
@@ -30,7 +30,7 @@
                 : 'ml-2 w-auto opacity-100'
             "
           >
-            {{ __(label) }}
+            {{ label }}
           </span>
         </Tooltip>
       </div>