From 03fc2d203651b63c1278d30c24f55c006c532774 Mon Sep 17 00:00:00 2001
From: Firman Ramdhani <33869609+firmanramdhani@users.noreply.github.com>
Date: Fri, 3 Jul 2026 16:18:33 +0700
Subject: [PATCH] refactor: update notification strings and improve
 translations in common.json

---
 .../layouts/components/header.layout.tsx      |  2 +-
 .../notifications/notification-dropdown.tsx   | 14 +++++++-------
 packages/core-i18n/src/locales/en/common.json | 17 ++++++++---------
 packages/core-i18n/src/locales/id/common.json | 19 +++++++++----------
 4 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/apps/web/src/apps/modules/layouts/components/header.layout.tsx b/apps/web/src/apps/modules/layouts/components/header.layout.tsx
index d50bc56..3f9ea43 100644
--- a/apps/web/src/apps/modules/layouts/components/header.layout.tsx
+++ b/apps/web/src/apps/modules/layouts/components/header.layout.tsx
@@ -148,7 +148,7 @@ export default function HeaderLayout() {
 
             {/* Application Section */}
             <Menu.Label>{t('common:application')}</Menu.Label>
-            <Menu.Item leftSection={<Settings size={14} />}>{t('common:accountSettings')}</Menu.Item>
+            <Menu.Item leftSection={<Settings size={14} />}>{t('common:settings')}</Menu.Item>
             <Menu.Item leftSection={<User size={14} />}>{t('common:myProfile')}</Menu.Item>
 
             <Menu.Divider />
diff --git a/apps/web/src/apps/modules/layouts/components/notifications/notification-dropdown.tsx b/apps/web/src/apps/modules/layouts/components/notifications/notification-dropdown.tsx
index 087e7bf..c619a83 100644
--- a/apps/web/src/apps/modules/layouts/components/notifications/notification-dropdown.tsx
+++ b/apps/web/src/apps/modules/layouts/components/notifications/notification-dropdown.tsx
@@ -36,21 +36,21 @@ export function NotificationDropdown({ children }: NotificationDropdownProps) {
       id: '1',
       title: 'New User Registration',
       description: 'John Doe has registered a new account in the system.',
-      timestamp: t('common:notifications_justNow'),
+      timestamp: t('common:justNow'),
       isRead: false,
     },
     {
       id: '2',
       title: 'System Update Completed',
       description: 'The ERP database has been successfully updated to v2.4.',
-      timestamp: `2 ${t('common:notifications_hoursAgo')}`,
+      timestamp: `2 ${t('common:hoursAgo')}`,
       isRead: false,
     },
     {
       id: '3',
       title: 'Weekly Report Ready',
       description: 'Your weekly financial summary is ready to be downloaded.',
-      timestamp: `5 ${t('common:notifications_hoursAgo')}`,
+      timestamp: `5 ${t('common:hoursAgo')}`,
       isRead: true,
     },
   ]);
@@ -80,12 +80,12 @@ export function NotificationDropdown({ children }: NotificationDropdownProps) {
           style={{ borderBottom: '1px solid var(--mantine-color-default-border)' }}
         >
           <Text fw={600} size="sm">
-            {t('common:notifications_title')}
+            {t('common:notificationsTitle')}
           </Text>
           {unreadCount > 0 && (
             <UnstyledButton onClick={handleMarkAllAsRead}>
               <Text size="xs" c="blue" fw={500} style={{ '&:hover': { textDecoration: 'underline' } }}>
-                {t('common:notifications_markAllAsRead')}
+                {t('common:markAllAsRead')}
               </Text>
             </UnstyledButton>
           )}
@@ -97,7 +97,7 @@ export function NotificationDropdown({ children }: NotificationDropdownProps) {
               <Stack align="center" gap="xs">
                 <BellOff size={32} style={{ opacity: 0.2 }} />
                 <Text size="sm" c="dimmed">
-                  {t('common:notifications_emptyState')}
+                  {t('common:emptyState')}
                 </Text>
               </Stack>
             </Center>
@@ -138,7 +138,7 @@ export function NotificationDropdown({ children }: NotificationDropdownProps) {
         {notifications.length > 0 && (
           <Box p="xs">
             <Button variant="light" color="gray" fullWidth size="xs" radius="md">
-              {t('common:notifications_viewAll')}
+              {t('common:viewAll')}
             </Button>
           </Box>
         )}
diff --git a/packages/core-i18n/src/locales/en/common.json b/packages/core-i18n/src/locales/en/common.json
index 2646c98..e12b59d 100644
--- a/packages/core-i18n/src/locales/en/common.json
+++ b/packages/core-i18n/src/locales/en/common.json
@@ -13,20 +13,19 @@
     "preferences": "Preferences",
     "language": "Language",
     "application": "Application",
-    "accountSettings": "Account Settings",
     "myProfile": "My Profile",
     "workspace": "Workspace",
     "switchWorkspace": "Switch Workspace",
     "signOut": "Sign Out",
     "english": "English",
     "indonesian": "Indonesia",
-    "notifications_title": "Notifications",
-    "notifications_unread": "Unread",
-    "notifications_all": "All",
-    "notifications_markAllAsRead": "Mark all as read",
-    "notifications_viewAll": "View all notifications",
-    "notifications_emptyState": "No new notifications",
-    "notifications_justNow": "Just now",
-    "notifications_hoursAgo": "hours ago"
+    "notificationsTitle": "Notifications",
+    "unread": "Unread",
+    "all": "All",
+    "markAllAsRead": "Mark all as read",
+    "viewAll": "View all notifications",
+    "emptyState": "No new notifications",
+    "justNow": "Just now",
+    "hoursAgo": "hours ago"
   }
 }
\ No newline at end of file
diff --git a/packages/core-i18n/src/locales/id/common.json b/packages/core-i18n/src/locales/id/common.json
index 0f14717..100049d 100644
--- a/packages/core-i18n/src/locales/id/common.json
+++ b/packages/core-i18n/src/locales/id/common.json
@@ -13,20 +13,19 @@
     "preferences": "Preferensi",
     "language": "Bahasa",
     "application": "Aplikasi",
-    "accountSettings": "Pengaturan Akun",
     "myProfile": "Profil Saya",
     "workspace": "Ruang Kerja",
     "switchWorkspace": "Ganti Ruang Kerja",
     "signOut": "Keluar",
     "english": "Inggris",
-    "indonesian": "Bahasa Indonesia",
-    "notifications_title": "Notifikasi",
-    "notifications_unread": "Belum dibaca",
-    "notifications_all": "Semua",
-    "notifications_markAllAsRead": "Tandai semua dibaca",
-    "notifications_viewAll": "Lihat semua notifikasi",
-    "notifications_emptyState": "Tidak ada notifikasi baru",
-    "notifications_justNow": "Baru saja",
-    "notifications_hoursAgo": "jam lalu"
+    "indonesian": "Indonesia",
+    "notificationsTitle": "Notifikasi",
+    "unread": "Belum dibaca",
+    "all": "Semua",
+    "markAllAsRead": "Tandai semua dibaca",
+    "viewAll": "Lihat semua notifikasi",
+    "emptyState": "Tidak ada notifikasi baru",
+    "justNow": "Baru saja",
+    "hoursAgo": "jam lalu"
   }
 }
\ No newline at end of file