From 11694de4e6958e81bc160268edc07fef3d7d3f1f Mon Sep 17 00:00:00 2001
From: kithmina1999 <kithgaming99@gmail.com>
Date: Fri, 6 Jun 2025 12:38:46 +0530
Subject: [PATCH 1/9] feat(db): add database backup and initialization system

- Add backup.sh script for manual PostgreSQL database backups
- Update .gitignore to exclude pg_backups directory
- Modify docker-compose.yml to include backup service and volume mounts
- Add init.sh script for automated database initialization with backup restoration
---
 .gitignore                        | 137 +++++++++++++++---------------
 backup.sh                         |  16 ++++
 docker-compose.yml                |  46 +++++++++-
 worklenz-backend/database/init.sh |  88 +++++++++++++++++++
 4 files changed, 216 insertions(+), 71 deletions(-)
 create mode 100644 backup.sh
 create mode 100644 worklenz-backend/database/init.sh

diff --git a/.gitignore b/.gitignore
index d255be7f..f17ba915 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,79 +1,82 @@
-# Dependencies
-node_modules/
-.pnp/
-.pnp.js
+    # Dependencies
+    node_modules/
+    .pnp/
+    .pnp.js
 
-# Build outputs
-dist/
-build/
-out/
-.next/
-.nuxt/
-.cache/
+    # Build outputs
+    dist/
+    build/
+    out/
+    .next/
+    .nuxt/
+    .cache/
 
-# Environment variables
-.env
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-.env.development
-.env.production
-.env.*
-!.env.example
-!.env.template
+    # Environment variables
+    .env
+    .env.local
+    .env.development.local
+    .env.test.local
+    .env.production.local
+    .env.development
+    .env.production
+    .env.*
+    !.env.example
+    !.env.template
 
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-lerna-debug.log*
+    # Logs
+    logs
+    *.log
+    npm-debug.log*
+    yarn-debug.log*
+    yarn-error.log*
+    pnpm-debug.log*
+    lerna-debug.log*
 
-# Editor directories and files
-.vscode/*
-!.vscode/extensions.json
-.idea/
-.DS_Store
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
-*.sublime-workspace
+    #backups
+    pg_backups/
 
-# Testing
-coverage/
-.nyc_output/
+    # Editor directories and files
+    .vscode/*
+    !.vscode/extensions.json
+    .idea/
+    .DS_Store
+    *.suo
+    *.ntvs*
+    *.njsproj
+    *.sln
+    *.sw?
+    *.sublime-workspace
 
-# Temp files
-.temp/
-.tmp/
-temp/
-tmp/
+    # Testing
+    coverage/
+    .nyc_output/
 
-# Debug
-.debug/
+    # Temp files
+    .temp/
+    .tmp/
+    temp/
+    tmp/
 
-# Misc
-.DS_Store
-Thumbs.db
-.thumbs.db
-ehthumbs.db
-Desktop.ini
-$RECYCLE.BIN/
+    # Debug
+    .debug/
 
-# Yarn
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/sdks
-!.yarn/versions
+    # Misc
+    .DS_Store
+    Thumbs.db
+    .thumbs.db
+    ehthumbs.db
+    Desktop.ini
+    $RECYCLE.BIN/
 
-# TypeScript
-*.tsbuildinfo
+    # Yarn
+    .yarn/*
+    !.yarn/patches
+    !.yarn/plugins
+    !.yarn/releases
+    !.yarn/sdks
+    !.yarn/versions
+
+    # TypeScript
+    *.tsbuildinfo
 
 
diff --git a/backup.sh b/backup.sh
new file mode 100644
index 00000000..8f16e1c7
--- /dev/null
+++ b/backup.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+set -eu
+
+# Adjust these as needed:
+CONTAINER=worklenz_db
+DB_NAME=worklenz_db
+DB_USER=postgres
+BACKUP_DIR=./pg_backups
+mkdir -p "$BACKUP_DIR"
+
+timestamp=$(date +%Y-%m-%d_%H-%M-%S)
+outfile="${BACKUP_DIR}/${DB_NAME}_${timestamp}.sql"
+echo "Creating backup $outfile ..."
+
+docker exec -t "$CONTAINER" pg_dump -U "$DB_USER" -d "$DB_NAME" > "$outfile"
+echo "Backup saved to $outfile"
diff --git a/docker-compose.yml b/docker-compose.yml
index e7d074ad..8c539ae1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -80,7 +80,11 @@ services:
       POSTGRES_DB: ${DB_NAME:-worklenz_db}
       POSTGRES_PASSWORD: ${DB_PASSWORD:-password}
     healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -d ${DB_NAME:-worklenz_db} -U ${DB_USER:-postgres}" ]
+      test:
+        [
+          "CMD-SHELL",
+          "pg_isready -d ${DB_NAME:-worklenz_db} -U ${DB_USER:-postgres}",
+        ]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -89,9 +93,20 @@ services:
     volumes:
       - worklenz_postgres_data:/var/lib/postgresql/data
       - type: bind
-        source: ./worklenz-backend/database
-        target: /docker-entrypoint-initdb.d
+        source: ./worklenz-backend/database/sql
+        target: /docker-entrypoint-initdb.d/sql
         consistency: cached
+      - type: bind
+        source: ./worklenz-backend/database/migrations
+        target: /docker-entrypoint-initdb.d/migrations
+        consistency: cached
+      - type: bind
+        source: ./worklenz-backend/database/init.sh
+        target: /docker-entrypoint-initdb.d/00_init.sh
+        consistency: cached
+      - type: bind
+        source: ./pg_backups
+        target: /docker-entrypoint-initdb.d/pg_backups
     command: >
       bash -c ' if command -v apt-get >/dev/null 2>&1; then
         apt-get update && apt-get install -y dos2unix
@@ -101,11 +116,34 @@ services:
         dos2unix "{}" 2>/dev/null || true
         chmod +x "{}"
       '\'' \; && exec docker-entrypoint.sh postgres '
+  db-backup:
+    image: postgres:15
+    container_name: worklenz_db_backup
+    environment:
+      POSTGRES_USER: ${DB_USER:-postgres}
+      POSTGRES_DB: ${DB_NAME:-worklenz_db}
+      POSTGRES_PASSWORD: ${DB_PASSWORD:-password}
+    depends_on:
+      db:
+        condition: service_healthy
+    volumes:
+      - ./pg_backups:/pg_backups #host dir for backups files
+    #setup bassh loop to backup data evey 24h
+    command: >
+      bash -c "while true; do
+                sleep 86400;
+                PGPASSWORD=$$POSTGRES_PASSWORD pg_dump -h worklenz_db -U $$POSTGRES_USER -d $$POSTGRES_DB \
+              > /pg_backups/worklenz_db_$(date +%Y-%m-%d_%H-%M-%S).sql;
+              find /pg_backups -type f -name '*.sql' -mtime +30 -delete;
+      done"
+    restart: unless-stopped
+    networks:
+      - worklenz
 
 volumes:
   worklenz_postgres_data:
   worklenz_minio_data:
-
+  pgdata:
 
 networks:
   worklenz:
diff --git a/worklenz-backend/database/init.sh b/worklenz-backend/database/init.sh
new file mode 100644
index 00000000..afd8562a
--- /dev/null
+++ b/worklenz-backend/database/init.sh
@@ -0,0 +1,88 @@
+#!/bin/bash
+set -e
+
+echo "Starting database initialization..."
+
+SQL_DIR="/docker-entrypoint-initdb.d/sql"
+MIGRATIONS_DIR="/docker-entrypoint-initdb.d/migrations"
+BACKUP_DIR="/docker-entrypoint-initdb.d/pg_backups"
+
+# --------------------------------------------
+# 🗄️ STEP 1: Attempt to restore latest backup
+# --------------------------------------------
+
+if [ -d "$BACKUP_DIR" ]; then
+  LATEST_BACKUP=$(ls -t "$BACKUP_DIR"/*.sql 2>/dev/null | head -n 1)
+else
+  LATEST_BACKUP=""
+fi
+
+if [ -f "$LATEST_BACKUP" ]; then
+  echo "🗄️ Found latest backup: $LATEST_BACKUP"
+  echo "⏳ Restoring from backup..."
+  psql -U "$POSTGRES_USER" -d "$POSTGRES_DB" < "$LATEST_BACKUP"
+  echo "✅ Backup restoration complete. Skipping schema and migrations."
+  exit 0
+else
+  echo "ℹ️ No valid backup found. Proceeding with base schema and migrations."
+fi
+
+# --------------------------------------------
+# 🏗️ STEP 2: Continue with base schema setup
+# --------------------------------------------
+
+# Create migrations table if it doesn't exist
+psql -U "$POSTGRES_USER" -d "$POSTGRES_DB" -c "
+  CREATE TABLE IF NOT EXISTS schema_migrations (
+    version TEXT PRIMARY KEY,
+    applied_at TIMESTAMP DEFAULT now()
+  );
+"
+
+# List of base schema files to execute in order
+BASE_SQL_FILES=(
+  "0_extensions.sql"
+  "1_tables.sql"
+  "indexes.sql"
+  "4_functions.sql"
+  "triggers.sql"
+  "3_views.sql"
+  "2_dml.sql"
+  "5_database_user.sql"
+)
+
+echo "Running base schema SQL files in order..."
+
+for file in "${BASE_SQL_FILES[@]}"; do
+  full_path="$SQL_DIR/$file"
+  if [ -f "$full_path" ]; then
+    echo "Executing $file..."
+    psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" -d "$POSTGRES_DB" -f "$full_path"
+  else
+    echo "WARNING: $file not found, skipping."
+  fi
+done
+
+echo "✅ Base schema SQL execution complete."
+
+# --------------------------------------------
+# 🚀 STEP 3: Apply SQL migrations
+# --------------------------------------------
+
+if [ -d "$MIGRATIONS_DIR" ] && compgen -G "$MIGRATIONS_DIR/*.sql" > /dev/null; then
+  echo "Applying migrations..."
+  for f in "$MIGRATIONS_DIR"/*.sql; do
+    version=$(basename "$f")
+    if ! psql -U "$POSTGRES_USER" -d "$POSTGRES_DB" -tAc "SELECT 1 FROM schema_migrations WHERE version = '$version'" | grep -q 1; then
+      echo "Applying migration: $version"
+      psql -U "$POSTGRES_USER" -d "$POSTGRES_DB" -f "$f"
+      psql -U "$POSTGRES_USER" -d "$POSTGRES_DB" -c "INSERT INTO schema_migrations (version) VALUES ('$version');"
+    else
+      echo "Skipping already applied migration: $version"
+    fi
+  done
+else
+  echo "No migration files found or directory is empty, skipping migrations."
+fi
+
+echo "🎉 Database initialization completed successfully."

From dc22d1e6cbd254471ae44e4f69dc602a22e3a556 Mon Sep 17 00:00:00 2001
From: kithmina1999 <kithgaming99@gmail.com>
Date: Fri, 6 Jun 2025 15:12:06 +0530
Subject: [PATCH 2/9] fix(db): improve database initialization script and
 docker setup

- Rename init.sh to 00_init.sh for better ordering
- Format docker-compose command for better readability
- Add comprehensive database initialization script with backup restoration
- Implement proper migration handling with schema_migrations table
---
 docker-compose.yml                            | 23 +++++++++++--------
 .../database/{init.sh => 00_init.sh}          |  0
 2 files changed, 14 insertions(+), 9 deletions(-)
 rename worklenz-backend/database/{init.sh => 00_init.sh} (100%)

diff --git a/docker-compose.yml b/docker-compose.yml
index 8c539ae1..ac6987ae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -101,21 +101,26 @@ services:
         target: /docker-entrypoint-initdb.d/migrations
         consistency: cached
       - type: bind
-        source: ./worklenz-backend/database/init.sh
+        source: ./worklenz-backend/database/00_init.sh
         target: /docker-entrypoint-initdb.d/00_init.sh
         consistency: cached
       - type: bind
         source: ./pg_backups
         target: /docker-entrypoint-initdb.d/pg_backups
     command: >
-      bash -c ' if command -v apt-get >/dev/null 2>&1; then
-        apt-get update && apt-get install -y dos2unix
-      elif command -v apk >/dev/null 2>&1; then
-        apk add --no-cache dos2unix
-      fi && find /docker-entrypoint-initdb.d -type f -name "*.sh" -exec sh -c '\''
-        dos2unix "{}" 2>/dev/null || true
-        chmod +x "{}"
-      '\'' \; && exec docker-entrypoint.sh postgres '
+      bash -c ' 
+        if command -v apt-get >/dev/null 2>&1; then
+          apt-get update && apt-get install -y dos2unix
+        elif command -v apk >/dev/null 2>&1; then
+          apk add --no-cache dos2unix
+        fi
+        find /docker-entrypoint-initdb.d -type f -name "*.sh" -exec sh -c '\'' 
+          dos2unix "{}" 2>/dev/null || true
+          chmod +x "{}"
+        '\'' \;
+        exec docker-entrypoint.sh postgres
+      '
+
   db-backup:
     image: postgres:15
     container_name: worklenz_db_backup
diff --git a/worklenz-backend/database/init.sh b/worklenz-backend/database/00_init.sh
similarity index 100%
rename from worklenz-backend/database/init.sh
rename to worklenz-backend/database/00_init.sh

From 0987fb14b263b29b5ceb1b7f4a8c6400c53f6353 Mon Sep 17 00:00:00 2001
From: kithmina1999 <kithgaming99@gmail.com>
Date: Fri, 6 Jun 2025 15:34:18 +0530
Subject: [PATCH 3/9] refactor(docker): improve command formatting and fix
 shell script issues

- Fix shell script syntax in db service command by using proper quoting and loop structure
- Clean up indentation and formatting in both db and db-backup services
- Ensure consistent command structure while maintaining the same functionality
---
 docker-compose.yml | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ac6987ae..fe936e16 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -107,19 +107,24 @@ services:
       - type: bind
         source: ./pg_backups
         target: /docker-entrypoint-initdb.d/pg_backups
-    command: >
-      bash -c ' 
-        if command -v apt-get >/dev/null 2>&1; then
-          apt-get update && apt-get install -y dos2unix
-        elif command -v apk >/dev/null 2>&1; then
-          apk add --no-cache dos2unix
-        fi
-        find /docker-entrypoint-initdb.d -type f -name "*.sh" -exec sh -c '\'' 
-          dos2unix "{}" 2>/dev/null || true
-          chmod +x "{}"
-        '\'' \;
-        exec docker-entrypoint.sh postgres
-      '
+    command: |
+        bash -c "
+          if command -v apt-get >/dev/null 2>&1; then
+            apt-get update && apt-get install -y dos2unix
+          elif command -v apk >/dev/null 2>&1; then
+            apk add --no-cache dos2unix
+          fi
+
+          find /docker-entrypoint-initdb.d -type f -name '*.sh' -exec sh -c '
+            for file; do
+              dos2unix \"$file\" 2>/dev/null || true
+              chmod +x \"$file\"
+            done
+          ' sh {} +
+
+          exec docker-entrypoint.sh postgres
+        "
+
 
   db-backup:
     image: postgres:15
@@ -135,12 +140,12 @@ services:
       - ./pg_backups:/pg_backups #host dir for backups files
     #setup bassh loop to backup data evey 24h
     command: >
-      bash -c "while true; do
-                sleep 86400;
-                PGPASSWORD=$$POSTGRES_PASSWORD pg_dump -h worklenz_db -U $$POSTGRES_USER -d $$POSTGRES_DB \
-              > /pg_backups/worklenz_db_$(date +%Y-%m-%d_%H-%M-%S).sql;
-              find /pg_backups -type f -name '*.sql' -mtime +30 -delete;
-      done"
+          bash -c "while true; do
+            sleep 86400;
+            PGPASSWORD=$$POSTGRES_PASSWORD pg_dump -h worklenz_db -U $$POSTGRES_USER -d $$POSTGRES_DB \
+            > /pg_backups/worklenz_db_\$(date +%Y-%m-%d_%H-%M-%S).sql;
+            find /pg_backups -type f -name '*.sql' -mtime +30 -delete;
+          done"
     restart: unless-stopped
     networks:
       - worklenz

From 1442c57e18b721849e7777f8bad80a1c9221988c Mon Sep 17 00:00:00 2001
From: kithmina1999 <kithgaming99@gmail.com>
Date: Fri, 6 Jun 2025 16:06:42 +0530
Subject: [PATCH 4/9] refactor(docker): improve postgres container
 initialization script

The command for the postgres service was restructured to:
1. Use more readable multi-line formatting
2. Replace the find -exec with a more efficient for loop
3. Maintain the same functionality while improving maintainability
---
 docker-compose.yml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 8c539ae1..dbf96f7d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -108,14 +108,20 @@ services:
         source: ./pg_backups
         target: /docker-entrypoint-initdb.d/pg_backups
     command: >
-      bash -c ' if command -v apt-get >/dev/null 2>&1; then
-        apt-get update && apt-get install -y dos2unix
-      elif command -v apk >/dev/null 2>&1; then
-        apk add --no-cache dos2unix
-      fi && find /docker-entrypoint-initdb.d -type f -name "*.sh" -exec sh -c '\''
-        dos2unix "{}" 2>/dev/null || true
-        chmod +x "{}"
-      '\'' \; && exec docker-entrypoint.sh postgres '
+        bash -c '
+          if command -v apt-get >/dev/null 2>&1; then
+            apt-get update && apt-get install -y dos2unix
+          elif command -v apk >/dev/null 2>&1; then
+            apk add --no-cache dos2unix
+          fi
+          find /docker-entrypoint-initdb.d -type f -name "*.sh" -exec sh -c "
+            for f; do
+              dos2unix \"\$f\" 2>/dev/null || true
+              chmod +x \"\$f\"
+            done
+          " sh {} +
+          exec docker-entrypoint.sh postgres
+        '
   db-backup:
     image: postgres:15
     container_name: worklenz_db_backup

From c5e480af52a4700e0df0c0899b5df5c83553b77d Mon Sep 17 00:00:00 2001
From: kithmina1999 <kithgaming99@gmail.com>
Date: Fri, 6 Jun 2025 16:30:46 +0530
Subject: [PATCH 5/9] fix(db): correct variable syntax in pg_dump command

The previous version used $$ for variable expansion which doesn't work in this context. Changed to single $ for proper shell variable expansion in the database backup command.
---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 16d33195..64277545 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -141,7 +141,7 @@ services:
           bash -c "while true; do
             sleep 86400;
             PGPASSWORD=$$POSTGRES_PASSWORD pg_dump -h worklenz_db -U $$POSTGRES_USER -d $$POSTGRES_DB \
-            > /pg_backups/worklenz_db_\$(date +%Y-%m-%d_%H-%M-%S).sql;
+            > /pg_backups/worklenz_db_$(date +%Y-%m-%d_%H-%M-%S).sql;
             find /pg_backups -type f -name '*.sql' -mtime +30 -delete;
           done"
     restart: unless-stopped

From f142046dccca16972309f5548f3c438a2a835131 Mon Sep 17 00:00:00 2001
From: kithmina1999 <kithgaming99@gmail.com>
Date: Fri, 6 Jun 2025 16:32:11 +0530
Subject: [PATCH 6/9] fix(docker): correct bash syntax in postgres backup
 command

The command was using incorrect quote escaping which could cause issues with variable expansion and file deletion. Fixed by using single quotes for the outer string and proper escaping for date command substitution.
---
 docker-compose.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 64277545..71d74475 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -138,12 +138,12 @@ services:
       - ./pg_backups:/pg_backups #host dir for backups files
     #setup bassh loop to backup data evey 24h
     command: >
-          bash -c "while true; do
-            sleep 86400;
-            PGPASSWORD=$$POSTGRES_PASSWORD pg_dump -h worklenz_db -U $$POSTGRES_USER -d $$POSTGRES_DB \
-            > /pg_backups/worklenz_db_$(date +%Y-%m-%d_%H-%M-%S).sql;
-            find /pg_backups -type f -name '*.sql' -mtime +30 -delete;
-          done"
+           bash -c 'while true; do
+              sleep 86400;
+              PGPASSWORD=$$POSTGRES_PASSWORD pg_dump -h worklenz_db -U $$POSTGRES_USER -d $$POSTGRES_DB \
+              > /pg_backups/worklenz_db_$$(date +%Y-%m-%d_%H-%M-%S).sql;
+              find /pg_backups -type f -name "*.sql" -mtime +30 -delete;
+            done'
     restart: unless-stopped
     networks:
       - worklenz

From 81a6c44090f9e846564a8458d36da6ed56ed182e Mon Sep 17 00:00:00 2001
From: chamikaJ <chamika@ceydigital.com>
Date: Fri, 6 Jun 2025 17:03:31 +0530
Subject: [PATCH 7/9] refactor(info-tab-footer): enhance member selection and
 comment handling

- Updated member selection to use member names as values for better display.
- Improved handling of selected members to ensure correct identification using member IDs.
- Reset selected members and comment value upon comment submission.
- Enhanced comment input with filtering options for mentions, improving user experience.
---
 .../shared/info-tab/info-tab-footer.tsx       | 56 ++++++++++---------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/worklenz-frontend/src/components/task-drawer/shared/info-tab/info-tab-footer.tsx b/worklenz-frontend/src/components/task-drawer/shared/info-tab/info-tab-footer.tsx
index 2e79c42c..b98c09fe 100644
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/info-tab-footer.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/info-tab-footer.tsx
@@ -71,6 +71,8 @@ const InfoTabFooter = () => {
     setIsCommentBoxExpand(false);
     setSelectedFiles([]);
     setAttachmentComment(false);
+    setCommentValue('');
+    setSelectedMembers([]);
   };
 
   // Check if comment is valid (either has text or files)
@@ -97,30 +99,27 @@ const InfoTabFooter = () => {
   // mentions options
   const mentionsOptions =
     members?.map(member => ({
-      value: member.id,
+      value: member.name, // Use name as value so it displays correctly
       label: member.name,
+      key: member.id, // Keep ID as key for identification
     })) ?? [];
 
   const memberSelectHandler = useCallback((member: IMentionMemberSelectOption) => {
-    console.log('member', member);
     if (!member?.value || !member?.label) return;
+    
+    // Find the member ID from the members array using the name
+    const selectedMember = members.find(m => m.name === member.value);
+    if (!selectedMember || !selectedMember.id || !selectedMember.name) return;
+    
+    // Add to selected members if not already present
     setSelectedMembers(prev =>
-      prev.some(mention => mention.team_member_id === member.value)
+      prev.some(mention => mention.team_member_id === selectedMember.id)
         ? prev
-        : [...prev, { team_member_id: member.value, name: member.label }]
+        : [...prev, { team_member_id: selectedMember.id!, name: selectedMember.name! }]
     );
-
-    setCommentValue(prev => {
-      const parts = prev.split('@');
-      const lastPart = parts[parts.length - 1];
-      const mentionText = member.label;
-      // Keep only the part before the @ and add the new mention
-      return prev.slice(0, prev.length - lastPart.length) + mentionText;
-    });
-  }, []);
+  }, [members]);
 
   const handleCommentChange = useCallback((value: string) => {
-    // Only update the value without trying to replace mentions
     setCommentValue(value);
     setCharacterLength(value.trim().length);
   }, []);
@@ -152,6 +151,7 @@ const InfoTabFooter = () => {
         setAttachmentComment(false);
         setIsCommentBoxExpand(false);
         setCommentValue('');
+        setSelectedMembers([]);
         
         // Dispatch event to notify that a comment was created
         // This will trigger scrolling to the new comment
@@ -275,6 +275,12 @@ const InfoTabFooter = () => {
             maxLength={5000}
             onClick={() => setIsCommentBoxExpand(true)}
             onChange={e => setCharacterLength(e.length)}
+            prefix="@"
+            filterOption={(input, option) => {
+              if (!input) return true;
+              const optionLabel = (option as any)?.label || '';
+              return optionLabel.toLowerCase().includes(input.toLowerCase());
+            }}
             style={{
               minHeight: 60,
               resize: 'none',
@@ -371,7 +377,11 @@ const InfoTabFooter = () => {
                 onSelect={option => memberSelectHandler(option as IMentionMemberSelectOption)}
                 onChange={handleCommentChange}
                 prefix="@"
-                split=""
+                filterOption={(input, option) => {
+                  if (!input) return true;
+                  const optionLabel = (option as any)?.label || '';
+                  return optionLabel.toLowerCase().includes(input.toLowerCase());
+                }}
                 style={{
                   minHeight: 100,
                   maxHeight: 200,
@@ -437,31 +447,27 @@ const InfoTabFooter = () => {
       <Flex align="center" justify="space-between" style={{ width: '100%', marginTop: 8 }}>
         <Tooltip
           title={
-            taskFormViewModel?.task?.created_at
-              ? formatDateTimeWithLocale(taskFormViewModel.task.created_at)
+            taskFormViewModel?.task?.created_from_now
+              ? `Created ${taskFormViewModel.task.created_from_now}`
               : 'N/A'
           }
         >
           <Typography.Text type="secondary" style={{ fontSize: 12 }}>
             Created{' '}
-            {taskFormViewModel?.task?.created_at
-              ? calculateTimeDifference(taskFormViewModel.task.created_at)
-              : 'N/A'}{' '}
+            {taskFormViewModel?.task?.created_from_now || 'N/A'}{' '}
             by {taskFormViewModel?.task?.reporter}
           </Typography.Text>
         </Tooltip>
         <Tooltip
           title={
-            taskFormViewModel?.task?.updated_at
-              ? formatDateTimeWithLocale(taskFormViewModel.task.updated_at)
+            taskFormViewModel?.task?.updated_from_now
+              ? `Updated ${taskFormViewModel.task.updated_from_now}`
               : 'N/A'
           }
         >
           <Typography.Text type="secondary" style={{ fontSize: 12 }}>
             Updated{' '}
-            {taskFormViewModel?.task?.updated_at
-              ? calculateTimeDifference(taskFormViewModel.task.updated_at)
-              : 'N/A'}
+            {taskFormViewModel?.task?.updated_from_now || 'N/A'}
           </Typography.Text>
         </Tooltip>
       </Flex>

From f1d504f98519f4aec8a2f78a93d9ea1b26c8c914 Mon Sep 17 00:00:00 2001
From: chamiakJ <chamika@ceydigital.com>
Date: Tue, 24 Jun 2025 22:28:33 +0530
Subject: [PATCH 8/9] Update LANGUAGE_TYPE enum to include 'alb' and 'de' for
 Albanian and German languages

---
 worklenz-backend/database/sql/1_tables.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worklenz-backend/database/sql/1_tables.sql b/worklenz-backend/database/sql/1_tables.sql
index af6cdc0e..e9fc31c4 100644
--- a/worklenz-backend/database/sql/1_tables.sql
+++ b/worklenz-backend/database/sql/1_tables.sql
@@ -12,7 +12,7 @@ CREATE TYPE DEPENDENCY_TYPE AS ENUM ('blocked_by');
 
 CREATE TYPE SCHEDULE_TYPE AS ENUM ('daily', 'weekly', 'yearly', 'monthly', 'every_x_days', 'every_x_weeks', 'every_x_months');
 
-CREATE TYPE LANGUAGE_TYPE AS ENUM ('en', 'es', 'pt');
+CREATE TYPE LANGUAGE_TYPE AS ENUM ('en', 'es', 'pt', 'alb', 'de');
 
 -- START: Users
 CREATE SEQUENCE IF NOT EXISTS users_user_no_seq START 1;

From 39e09bedd3f45eabefc1e092611bcb1fd8fc8e29 Mon Sep 17 00:00:00 2001
From: jiuhao47 <jiangjunyan22@mails.ucas.ac.cn>
Date: Mon, 30 Jun 2025 20:52:49 +0800
Subject: [PATCH 9/9] add support for zh_cn

---
 worklenz-backend/database/sql/1_tables.sql    |  2 +-
 .../public/locales/zh/404-page.json           |  4 +
 .../public/locales/zh/account-setup.json      | 27 ++++++
 .../locales/zh/admin-center/current-bill.json | 96 +++++++++++++++++++
 .../locales/zh/admin-center/overview.json     |  8 ++
 .../locales/zh/admin-center/projects.json     | 12 +++
 .../locales/zh/admin-center/sidebar.json      |  8 ++
 .../public/locales/zh/admin-center/teams.json | 33 +++++++
 .../public/locales/zh/admin-center/users.json |  9 ++
 .../public/locales/zh/all-project-list.json   | 23 +++++
 .../public/locales/zh/auth/auth-common.json   |  5 +
 .../locales/zh/auth/forgot-password.json      | 12 +++
 .../public/locales/zh/auth/login.json         | 27 ++++++
 .../public/locales/zh/auth/signup.json        | 29 ++++++
 .../locales/zh/auth/verify-reset-email.json   | 14 +++
 .../public/locales/zh/common.json             |  9 ++
 .../locales/zh/create-first-project-form.json | 13 +++
 .../public/locales/zh/create-first-tasks.json |  7 ++
 worklenz-frontend/public/locales/zh/home.json | 46 +++++++++
 .../zh/invite-initial-team-members.json       |  8 ++
 .../public/locales/zh/kanban-board.json       | 19 ++++
 .../public/locales/zh/license-expired.json    |  6 ++
 .../public/locales/zh/navbar.json             | 31 ++++++
 .../locales/zh/organization-name-form.json    |  5 +
 .../public/locales/zh/phases-drawer.json      |  7 ++
 .../public/locales/zh/project-drawer.json     | 42 ++++++++
 .../public/locales/zh/project-view-files.json | 14 +++
 .../locales/zh/project-view-insights.json     | 41 ++++++++
 .../locales/zh/project-view-members.json      | 17 ++++
 .../locales/zh/project-view-updates.json      |  6 ++
 .../project-view/import-task-templates.json   | 11 +++
 .../project-view/project-member-drawer.json   |  7 ++
 .../zh/project-view/project-view-header.json  | 13 +++
 .../zh/project-view/save-as-template.json     | 27 ++++++
 .../locales/zh/reporting-members-drawer.json  | 76 +++++++++++++++
 .../public/locales/zh/reporting-members.json  | 31 ++++++
 .../locales/zh/reporting-overview-drawer.json | 33 +++++++
 .../public/locales/zh/reporting-overview.json | 22 +++++
 .../locales/zh/reporting-projects-drawer.json | 52 ++++++++++
 .../zh/reporting-projects-filters.json        | 31 ++++++
 .../public/locales/zh/reporting-projects.json | 44 +++++++++
 .../public/locales/zh/reporting-sidebar.json  |  8 ++
 .../public/locales/zh/schedule.json           | 34 +++++++
 .../locales/zh/settings/categories.json       | 10 ++
 .../locales/zh/settings/change-password.json  | 15 +++
 .../public/locales/zh/settings/clients.json   | 22 +++++
 .../locales/zh/settings/job-titles.json       | 20 ++++
 .../public/locales/zh/settings/labels.json    | 11 +++
 .../public/locales/zh/settings/language.json  |  7 ++
 .../locales/zh/settings/notifications.json    | 11 +++
 .../public/locales/zh/settings/profile.json   | 13 +++
 .../zh/settings/project-templates.json        |  8 ++
 .../public/locales/zh/settings/sidebar.json   | 14 +++
 .../locales/zh/settings/task-templates.json   |  9 ++
 .../locales/zh/settings/team-members.json     | 44 +++++++++
 .../zh/task-drawer/task-drawer-info-tab.json  | 29 ++++++
 .../locales/zh/task-drawer/task-drawer.json   | 78 +++++++++++++++
 .../public/locales/zh/task-list-filters.json  | 54 +++++++++++
 .../public/locales/zh/task-list-table.json    | 56 +++++++++++
 .../locales/zh/task-template-drawer.json      | 11 +++
 .../zh/tasks/task-table-bulk-actions.json     | 24 +++++
 .../public/locales/zh/template-drawer.json    | 19 ++++
 .../public/locales/zh/templateDrawer.json     | 23 +++++
 .../public/locales/zh/time-report.json        | 33 +++++++
 .../public/locales/zh/unauthorized.json       |  5 +
 .../src/features/i18n/language-selector.tsx   |  2 +
 .../src/features/i18n/localesSlice.ts         |  1 +
 .../language-and-region-settings.tsx          |  6 +-
 worklenz-frontend/src/utils/greetingString.ts |  6 ++
 69 files changed, 1498 insertions(+), 2 deletions(-)
 create mode 100644 worklenz-frontend/public/locales/zh/404-page.json
 create mode 100644 worklenz-frontend/public/locales/zh/account-setup.json
 create mode 100644 worklenz-frontend/public/locales/zh/admin-center/current-bill.json
 create mode 100644 worklenz-frontend/public/locales/zh/admin-center/overview.json
 create mode 100644 worklenz-frontend/public/locales/zh/admin-center/projects.json
 create mode 100644 worklenz-frontend/public/locales/zh/admin-center/sidebar.json
 create mode 100644 worklenz-frontend/public/locales/zh/admin-center/teams.json
 create mode 100644 worklenz-frontend/public/locales/zh/admin-center/users.json
 create mode 100644 worklenz-frontend/public/locales/zh/all-project-list.json
 create mode 100644 worklenz-frontend/public/locales/zh/auth/auth-common.json
 create mode 100644 worklenz-frontend/public/locales/zh/auth/forgot-password.json
 create mode 100644 worklenz-frontend/public/locales/zh/auth/login.json
 create mode 100644 worklenz-frontend/public/locales/zh/auth/signup.json
 create mode 100644 worklenz-frontend/public/locales/zh/auth/verify-reset-email.json
 create mode 100644 worklenz-frontend/public/locales/zh/common.json
 create mode 100644 worklenz-frontend/public/locales/zh/create-first-project-form.json
 create mode 100644 worklenz-frontend/public/locales/zh/create-first-tasks.json
 create mode 100644 worklenz-frontend/public/locales/zh/home.json
 create mode 100644 worklenz-frontend/public/locales/zh/invite-initial-team-members.json
 create mode 100644 worklenz-frontend/public/locales/zh/kanban-board.json
 create mode 100644 worklenz-frontend/public/locales/zh/license-expired.json
 create mode 100644 worklenz-frontend/public/locales/zh/navbar.json
 create mode 100644 worklenz-frontend/public/locales/zh/organization-name-form.json
 create mode 100644 worklenz-frontend/public/locales/zh/phases-drawer.json
 create mode 100644 worklenz-frontend/public/locales/zh/project-drawer.json
 create mode 100644 worklenz-frontend/public/locales/zh/project-view-files.json
 create mode 100644 worklenz-frontend/public/locales/zh/project-view-insights.json
 create mode 100644 worklenz-frontend/public/locales/zh/project-view-members.json
 create mode 100644 worklenz-frontend/public/locales/zh/project-view-updates.json
 create mode 100644 worklenz-frontend/public/locales/zh/project-view/import-task-templates.json
 create mode 100644 worklenz-frontend/public/locales/zh/project-view/project-member-drawer.json
 create mode 100644 worklenz-frontend/public/locales/zh/project-view/project-view-header.json
 create mode 100644 worklenz-frontend/public/locales/zh/project-view/save-as-template.json
 create mode 100644 worklenz-frontend/public/locales/zh/reporting-members-drawer.json
 create mode 100644 worklenz-frontend/public/locales/zh/reporting-members.json
 create mode 100644 worklenz-frontend/public/locales/zh/reporting-overview-drawer.json
 create mode 100644 worklenz-frontend/public/locales/zh/reporting-overview.json
 create mode 100644 worklenz-frontend/public/locales/zh/reporting-projects-drawer.json
 create mode 100644 worklenz-frontend/public/locales/zh/reporting-projects-filters.json
 create mode 100644 worklenz-frontend/public/locales/zh/reporting-projects.json
 create mode 100644 worklenz-frontend/public/locales/zh/reporting-sidebar.json
 create mode 100644 worklenz-frontend/public/locales/zh/schedule.json
 create mode 100644 worklenz-frontend/public/locales/zh/settings/categories.json
 create mode 100644 worklenz-frontend/public/locales/zh/settings/change-password.json
 create mode 100644 worklenz-frontend/public/locales/zh/settings/clients.json
 create mode 100644 worklenz-frontend/public/locales/zh/settings/job-titles.json
 create mode 100644 worklenz-frontend/public/locales/zh/settings/labels.json
 create mode 100644 worklenz-frontend/public/locales/zh/settings/language.json
 create mode 100644 worklenz-frontend/public/locales/zh/settings/notifications.json
 create mode 100644 worklenz-frontend/public/locales/zh/settings/profile.json
 create mode 100644 worklenz-frontend/public/locales/zh/settings/project-templates.json
 create mode 100644 worklenz-frontend/public/locales/zh/settings/sidebar.json
 create mode 100644 worklenz-frontend/public/locales/zh/settings/task-templates.json
 create mode 100644 worklenz-frontend/public/locales/zh/settings/team-members.json
 create mode 100644 worklenz-frontend/public/locales/zh/task-drawer/task-drawer-info-tab.json
 create mode 100644 worklenz-frontend/public/locales/zh/task-drawer/task-drawer.json
 create mode 100644 worklenz-frontend/public/locales/zh/task-list-filters.json
 create mode 100644 worklenz-frontend/public/locales/zh/task-list-table.json
 create mode 100644 worklenz-frontend/public/locales/zh/task-template-drawer.json
 create mode 100644 worklenz-frontend/public/locales/zh/tasks/task-table-bulk-actions.json
 create mode 100644 worklenz-frontend/public/locales/zh/template-drawer.json
 create mode 100644 worklenz-frontend/public/locales/zh/templateDrawer.json
 create mode 100644 worklenz-frontend/public/locales/zh/time-report.json
 create mode 100644 worklenz-frontend/public/locales/zh/unauthorized.json

diff --git a/worklenz-backend/database/sql/1_tables.sql b/worklenz-backend/database/sql/1_tables.sql
index e9fc31c4..21f498f1 100644
--- a/worklenz-backend/database/sql/1_tables.sql
+++ b/worklenz-backend/database/sql/1_tables.sql
@@ -12,7 +12,7 @@ CREATE TYPE DEPENDENCY_TYPE AS ENUM ('blocked_by');
 
 CREATE TYPE SCHEDULE_TYPE AS ENUM ('daily', 'weekly', 'yearly', 'monthly', 'every_x_days', 'every_x_weeks', 'every_x_months');
 
-CREATE TYPE LANGUAGE_TYPE AS ENUM ('en', 'es', 'pt', 'alb', 'de');
+CREATE TYPE LANGUAGE_TYPE AS ENUM ('en', 'es', 'pt', 'alb', 'de', 'zh_cn');
 
 -- START: Users
 CREATE SEQUENCE IF NOT EXISTS users_user_no_seq START 1;
diff --git a/worklenz-frontend/public/locales/zh/404-page.json b/worklenz-frontend/public/locales/zh/404-page.json
new file mode 100644
index 00000000..24a74b3e
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/404-page.json
@@ -0,0 +1,4 @@
+{
+  "doesNotExistText": "抱歉，您访问的页面不存在。",
+  "backHomeButton": "返回首页"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/account-setup.json b/worklenz-frontend/public/locales/zh/account-setup.json
new file mode 100644
index 00000000..51cac1eb
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/account-setup.json
@@ -0,0 +1,27 @@
+{
+  "continue": "继续",
+  "setupYourAccount": "设置您的Worklenz账户。",
+  "organizationStepTitle": "命名您的组织",
+  "organizationStepLabel": "为您的Worklenz账户选择一个名称。",
+  "projectStepTitle": "创建您的第一个项目",
+  "projectStepLabel": "您现在正在做什么项目？",
+  "projectStepPlaceholder": "例如：营销计划",
+  "tasksStepTitle": "创建您的第一个任务",
+  "tasksStepLabel": "输入您将在其中完成的几个任务",
+  "tasksStepAddAnother": "添加另一个",
+  "emailPlaceholder": "电子邮件地址",
+  "invalidEmail": "请输入有效的电子邮件地址",
+  "or": "或",
+  "templateButton": "从模板导入",
+  "goBack": "返回",
+  "cancel": "取消",
+  "create": "创建",
+  "templateDrawerTitle": "从模板中选择",
+  "step3InputLabel": "通过电子邮件邀请",
+  "addAnother": "添加另一个",
+  "skipForNow": "暂时跳过",
+  "formTitle": "创建您的第一个任务。",
+  "step3Title": "邀请您的团队一起工作",
+  "maxMembers": "（您最多可以邀请5名成员）",
+  "maxTasks": "（您最多可以创建5个任务）"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/admin-center/current-bill.json b/worklenz-frontend/public/locales/zh/admin-center/current-bill.json
new file mode 100644
index 00000000..e18e8761
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/admin-center/current-bill.json
@@ -0,0 +1,96 @@
+{
+  "title": "账单",
+  "currentBill": "当前账单",
+  "configuration": "配置",
+  "currentPlanDetails": "当前计划详情",
+  "upgradePlan": "升级计划",
+  "cardBodyText01": "免费试用",
+  "cardBodyText02": "（您的试用计划将在1个月19天后到期）",
+  "redeemCode": "兑换码",
+  "accountStorage": "账户存储",
+  "used": "已用：",
+  "remaining": "剩余：",
+  "charges": "费用",
+  "tooltip": "当前账单周期的费用",
+  "description": "描述",
+  "billingPeriod": "账单周期",
+  "billStatus": "账单状态",
+  "perUserValue": "每用户费用",
+  "users": "用户",
+  "amount": "金额",
+  "invoices": "发票",
+  "transactionId": "交易ID",
+  "transactionDate": "交易日期",
+  "paymentMethod": "支付方式",
+  "status": "状态",
+  "ltdUsers": "您最多可以添加{{ltd_users}}名用户。",
+  "totalSeats": "总席位",
+  "availableSeats": "可用席位",
+  "addMoreSeats": "添加更多席位",
+  "drawerTitle": "兑换码",
+  "label": "兑换码",
+  "drawerPlaceholder": "输入您的兑换码",
+  "redeemSubmit": "提交",
+  "modalTitle": "为您的团队选择最佳计划",
+  "seatLabel": "席位数量",
+  "freePlan": "免费计划",
+  "startup": "初创",
+  "business": "商业",
+  "tag": "最受欢迎",
+  "enterprise": "企业",
+  "freeSubtitle": "永远免费",
+  "freeUsers": "最适合个人使用",
+  "freeText01": "100MB存储",
+  "freeText02": "3个项目",
+  "freeText03": "5名团队成员",
+  "startupSubtitle": "固定费率/月",
+  "startupUsers": "最多15名用户",
+  "startupText01": "25GB存储",
+  "startupText02": "无限活跃项目",
+  "startupText03": "日程",
+  "startupText04": "报告",
+  "startupText05": "订阅项目",
+  "businessSubtitle": "每用户/月",
+  "businessUsers": "16 - 200名用户",
+  "enterpriseUsers": "200 - 500+名用户",
+  "footerTitle": "请提供一个我们可以联系您的电话号码。",
+  "footerLabel": "联系电话",
+  "footerButton": "联系我们",
+  "redeemCodePlaceHolder": "输入您的兑换码",
+  "submit": "提交",
+  "trialPlan": "免费试用",
+  "trialExpireDate": "有效期至{{trial_expire_date}}",
+  "trialExpired": "您的免费试用已于{{trial_expire_string}}到期",
+  "trialInProgress": "您的免费试用将在{{trial_expire_string}}到期",
+  "required": "此字段为必填项",
+  "invalidCode": "无效的代码",
+  "selectPlan": "为您的团队选择最佳计划",
+  "changeSubscriptionPlan": "更改您的订阅计划",
+  "noOfSeats": "席位数量",
+  "annualPlan": "专业 - 年度",
+  "monthlyPlan": "专业 - 月度",
+  "freeForever": "永远免费",
+  "bestForPersonalUse": "最适合个人使用",
+  "storage": "存储",
+  "projects": "项目",
+  "teamMembers": "团队成员",
+  "unlimitedTeamMembers": "无限团队成员",
+  "unlimitedActiveProjects": "无限活跃项目",
+  "schedule": "日程",
+  "reporting": "报告",
+  "subscribeToProjects": "订阅项目",
+  "billedAnnually": "按年计费",
+  "billedMonthly": "按月计费",
+  "pausePlan": "暂停计划",
+  "resumePlan": "恢复计划",
+  "changePlan": "更改计划",
+  "cancelPlan": "取消计划",
+  "perMonthPerUser": "每用户/月",
+  "viewInvoice": "查看发票",
+  "switchToFreePlan": "切换到免费计划",
+  "expirestoday": "今天",
+  "expirestomorrow": "明天",
+  "expiredDaysAgo": "{{days}}天前",
+  "continueWith": "继续使用{{plan}}",
+  "changeToPlan": "更改为{{plan}}"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/admin-center/overview.json b/worklenz-frontend/public/locales/zh/admin-center/overview.json
new file mode 100644
index 00000000..9c70093f
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/admin-center/overview.json
@@ -0,0 +1,8 @@
+{
+  "overview": "概览",
+  "name": "组织名称",
+  "owner": "组织所有者",
+  "admins": "组织管理员",
+  "contactNumber": "添加联系电话",
+  "edit": "编辑"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/admin-center/projects.json b/worklenz-frontend/public/locales/zh/admin-center/projects.json
new file mode 100644
index 00000000..ca2eded2
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/admin-center/projects.json
@@ -0,0 +1,12 @@
+{
+  "membersCount": "成员数量",
+  "createdAt": "创建于",
+  "projectName": "项目名称",
+  "teamName": "团队名称",
+  "refreshProjects": "刷新项目",
+  "searchPlaceholder": "按项目名称搜索",
+  "deleteProject": "您确定要删除此项目吗？",
+  "confirm": "确认",
+  "cancel": "取消",
+  "delete": "删除项目"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/admin-center/sidebar.json b/worklenz-frontend/public/locales/zh/admin-center/sidebar.json
new file mode 100644
index 00000000..ab8808c3
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/admin-center/sidebar.json
@@ -0,0 +1,8 @@
+{
+  "overview": "概览",
+  "users": "用户",
+  "teams": "团队",
+  "billing": "账单",
+  "projects": "项目",
+  "adminCenter": "管理中心"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/admin-center/teams.json b/worklenz-frontend/public/locales/zh/admin-center/teams.json
new file mode 100644
index 00000000..4244d848
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/admin-center/teams.json
@@ -0,0 +1,33 @@
+{
+  "title": "团队",
+  "subtitle": "团队",
+  "tooltip": "刷新团队",
+  "placeholder": "按名称搜索",
+  "addTeam": "添加团队",
+  "team": "团队",
+  "membersCount": "成员数量",
+  "members": "成员",
+  "drawerTitle": "创建新团队",
+  "label": "团队名称",
+  "drawerPlaceholder": "名称",
+  "create": "创建",
+  "delete": "删除",
+  "settings": "设置",
+  "popTitle": "您确定吗？",
+  "message": "请输入名称",
+  "teamSettings": "团队设置",
+  "teamName": "团队名称",
+  "teamDescription": "团队描述",
+  "teamMembers": "团队成员",
+  "teamMembersCount": "团队成员数量",
+  "teamMembersPlaceholder": "按名称搜索",
+  "addMember": "添加成员",
+  "add": "添加",
+  "update": "更新",
+  "teamNamePlaceholder": "团队名称",
+  "user": "用户",
+  "role": "角色",
+  "owner": "所有者",
+  "admin": "管理员",
+  "member": "成员"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/admin-center/users.json b/worklenz-frontend/public/locales/zh/admin-center/users.json
new file mode 100644
index 00000000..83800c09
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/admin-center/users.json
@@ -0,0 +1,9 @@
+{
+  "title": "用户",
+  "subTitle": "用户",
+  "placeholder": "按名称搜索",
+  "user": "用户",
+  "email": "电子邮件",
+  "lastActivity": "最后活动",
+  "refresh": "刷新用户"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/all-project-list.json b/worklenz-frontend/public/locales/zh/all-project-list.json
new file mode 100644
index 00000000..9ff1a707
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/all-project-list.json
@@ -0,0 +1,23 @@
+{
+  "name": "名称",
+  "client": "客户",
+  "category": "类别",
+  "status": "状态",
+  "tasksProgress": "任务进度",
+  "updated_at": "最后更新",
+  "members": "成员",
+  "setting": "设置",
+  "projects": "项目",
+  "refreshProjects": "刷新项目",
+  "all": "全部",
+  "favorites": "收藏",
+  "archived": "已归档",
+  "placeholder": "按名称搜索",
+  "archive": "归档",
+  "unarchive": "取消归档",
+  "archiveConfirm": "您确定要归档此项目吗？",
+  "unarchiveConfirm": "您确定要取消归档此项目吗？",
+  "clickToFilter": "点击以筛选",
+  "noProjects": "未找到项目",
+  "addToFavourites": "添加到收藏"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/auth/auth-common.json b/worklenz-frontend/public/locales/zh/auth/auth-common.json
new file mode 100644
index 00000000..df57a70d
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/auth/auth-common.json
@@ -0,0 +1,5 @@
+{
+  "loggingOut": "正在登出...",
+  "authenticating": "正在认证...",
+  "gettingThingsReady": "正在为您准备..."
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/auth/forgot-password.json b/worklenz-frontend/public/locales/zh/auth/forgot-password.json
new file mode 100644
index 00000000..de1529a4
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/auth/forgot-password.json
@@ -0,0 +1,12 @@
+{
+  "headerDescription": "重置您的密码",
+  "emailLabel": "电子邮件",
+  "emailPlaceholder": "输入您的电子邮件",
+  "emailRequired": "请输入您的电子邮件！",
+  "resetPasswordButton": "重置密码",
+  "returnToLoginButton": "返回登录",
+  "passwordResetSuccessMessage": "密码重置链接已发送到您的电子邮件。",
+  "orText": "或",
+  "successTitle": "重置指令已发送！",
+  "successMessage": "重置信息已发送到您的电子邮件。请检查您的电子邮件。"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/auth/login.json b/worklenz-frontend/public/locales/zh/auth/login.json
new file mode 100644
index 00000000..e53d5fc5
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/auth/login.json
@@ -0,0 +1,27 @@
+{
+  "headerDescription": "登录到您的账户",
+  "emailLabel": "电子邮件",
+  "emailPlaceholder": "输入您的电子邮件",
+  "emailRequired": "请输入您的电子邮件！",
+  "passwordLabel": "密码",
+  "passwordPlaceholder": "输入您的密码",
+  "passwordRequired": "请输入您的密码！",
+  "rememberMe": "记住我",
+  "loginButton": "登录",
+  "signupButton": "注册",
+  "forgotPasswordButton": "忘记密码？",
+  "signInWithGoogleButton": "使用Google登录",
+  "dontHaveAccountText": "没有账户？",
+  "orText": "或",
+  "successMessage": "您已成功登录！",
+  "loginError": "登录失败",
+  "googleLoginError": "Google登录失败",
+  "validationMessages": {
+    "email": "请输入有效的电子邮件地址",
+    "password": "密码必须至少包含8个字符"
+  },
+  "errorMessages": {
+    "loginErrorTitle": "登录失败",
+    "loginErrorMessage": "请检查您的电子邮件和密码并重试"
+  }
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/auth/signup.json b/worklenz-frontend/public/locales/zh/auth/signup.json
new file mode 100644
index 00000000..a2b34e57
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/auth/signup.json
@@ -0,0 +1,29 @@
+{
+  "headerDescription": "注册以开始使用",
+  "nameLabel": "全名",
+  "namePlaceholder": "输入您的全名",
+  "nameRequired": "请输入您的全名！",
+  "nameMinCharacterRequired": "全名必须至少包含4个字符！",
+  "emailLabel": "电子邮件",
+  "emailPlaceholder": "输入您的电子邮件",
+  "emailRequired": "请输入您的电子邮件！",
+  "passwordLabel": "密码",
+  "passwordPlaceholder": "输入您的密码",
+  "passwordRequired": "请输入您的密码！",
+  "passwordMinCharacterRequired": "密码必须至少包含8个字符！",
+  "passwordPatternRequired": "密码不符合要求！",
+  "strongPasswordPlaceholder": "输入更强的密码",
+  "passwordValidationAltText": "密码必须至少包含8个字符，包括大小写字母、一个数字和一个符号。",
+  "signupSuccessMessage": "您已成功注册！",
+  "privacyPolicyLink": "隐私政策",
+  "termsOfUseLink": "使用条款",
+  "bySigningUpText": "通过注册，您同意我们的",
+  "andText": "和",
+  "signupButton": "注册",
+  "signInWithGoogleButton": "使用Google登录",
+  "alreadyHaveAccountText": "已经有账户了？",
+  "loginButton": "登录",
+  "orText": "或",
+  "reCAPTCHAVerificationError": "reCAPTCHA验证错误",
+  "reCAPTCHAVerificationErrorMessage": "我们无法验证您的reCAPTCHA。请重试。"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/auth/verify-reset-email.json b/worklenz-frontend/public/locales/zh/auth/verify-reset-email.json
new file mode 100644
index 00000000..11222523
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/auth/verify-reset-email.json
@@ -0,0 +1,14 @@
+{
+  "title": "验证重置电子邮件",
+  "description": "输入您的新密码",
+  "placeholder": "输入您的新密码",
+  "confirmPasswordPlaceholder": "确认您的新密码",
+  "passwordHint": "至少8个字符，包括大小写字母、一个数字和一个符号。",
+  "resetPasswordButton": "重置密码",
+  "orText": "或",
+  "resendResetEmail": "重新发送重置电子邮件",
+  "passwordRequired": "请输入您的新密码",
+  "returnToLoginButton": "返回登录",
+  "confirmPasswordRequired": "请确认您的新密码",
+  "passwordMismatch": "两次输入的密码不匹配"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/common.json b/worklenz-frontend/public/locales/zh/common.json
new file mode 100644
index 00000000..520ee5e2
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/common.json
@@ -0,0 +1,9 @@
+{
+  "login-success": "登录成功！",
+  "login-failed": "登录失败。请检查您的凭据并重试。",
+  "signup-success": "注册成功！欢迎加入。",
+  "signup-failed": "注册失败。请确保填写所有必填字段并重试。",
+  "reconnecting": "与服务器断开连接。",
+  "connection-lost": "无法连接到服务器。请检查您的互联网连接。",
+  "connection-restored": "成功连接到服务器"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/create-first-project-form.json b/worklenz-frontend/public/locales/zh/create-first-project-form.json
new file mode 100644
index 00000000..95ea4099
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/create-first-project-form.json
@@ -0,0 +1,13 @@
+{
+  "formTitle": "创建您的第一个项目",
+  "inputLabel": "您现在正在做什么项目？",
+  "or": "或",
+  "templateButton": "从模板导入",
+  "createFromTemplate": "从模板创建",
+  "goBack": "返回",
+  "continue": "继续",
+  "cancel": "取消",
+  "create": "创建",
+  "templateDrawerTitle": "从模板中选择",
+  "createProject": "创建项目"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/create-first-tasks.json b/worklenz-frontend/public/locales/zh/create-first-tasks.json
new file mode 100644
index 00000000..810d5aff
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/create-first-tasks.json
@@ -0,0 +1,7 @@
+{
+  "formTitle": "创建您的第一个任务。",
+  "inputLable": "输入您将在其中完成的几个任务",
+  "addAnother": "添加另一个",
+  "goBack": "返回",
+  "continue": "继续"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/home.json b/worklenz-frontend/public/locales/zh/home.json
new file mode 100644
index 00000000..184b4f1a
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/home.json
@@ -0,0 +1,46 @@
+{
+  "todoList": {
+    "title": "待办事项列表",
+    "refreshTasks": "刷新任务",
+    "addTask": "+ 添加任务",
+    "noTasks": "没有任务",
+    "pressEnter": "按",
+    "toCreate": "创建。",
+    "markAsDone": "标记为完成"
+  },
+  "projects": {
+    "title": "项目",
+    "refreshProjects": "刷新项目",
+    "noRecentProjects": "您当前未被分配到任何项目。",
+    "noFavouriteProjects": "没有项目被标记为收藏。",
+    "recent": "最近",
+    "favourites": "收藏"
+  },
+  "tasks": {
+    "assignedToMe": "分配给我",
+    "assignedByMe": "由我分配",
+    "all": "全部",
+    "today": "今天",
+    "upcoming": "即将到来",
+    "overdue": "逾期",
+    "noDueDate": "没有截止日期",
+    "noTasks": "没有任务可显示。",
+    "addTask": "+ 添加任务",
+    "name": "名称",
+    "project": "项目",
+    "status": "状态",
+    "dueDate": "截止日期",
+    "dueDatePlaceholder": "设置截止日期",
+    "tomorrow": "明天",
+    "nextWeek": "下周",
+    "nextMonth": "下个月",
+    "projectRequired": "请选择一个项目",
+    "pressTabToSelectDueDateAndProject": "按Tab键选择截止日期和项目",
+    "dueOn": "任务截止于",
+    "taskRequired": "请添加一个任务",
+    "list": "列表",
+    "calendar": "日历",
+    "tasks": "任务",
+    "refresh": "刷新"
+  }
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/invite-initial-team-members.json b/worklenz-frontend/public/locales/zh/invite-initial-team-members.json
new file mode 100644
index 00000000..6ebb9fbf
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/invite-initial-team-members.json
@@ -0,0 +1,8 @@
+{
+  "formTitle": "邀请您的团队一起工作",
+  "inputLable": "通过电子邮件邀请",
+  "addAnother": "添加另一个",
+  "goBack": "返回",
+  "continue": "继续",
+  "skipForNow": "暂时跳过"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/kanban-board.json b/worklenz-frontend/public/locales/zh/kanban-board.json
new file mode 100644
index 00000000..7b72c5d5
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/kanban-board.json
@@ -0,0 +1,19 @@
+{
+  "rename": "重命名",
+  "delete": "删除",
+  "addTask": "添加任务",
+  "addSectionButton": "添加部分",
+  "changeCategory": "更改类别",
+  "deleteTooltip": "删除",
+  "deleteConfirmationTitle": "您确定吗？",
+  "deleteConfirmationOk": "是",
+  "deleteConfirmationCancel": "取消",
+  "dueDate": "截止日期",
+  "cancel": "取消",
+  "today": "今天",
+  "tomorrow": "明天",
+  "assignToMe": "分配给我",
+  "archive": "归档",
+  "newTaskNamePlaceholder": "写一个任务名称",
+  "newSubtaskNamePlaceholder": "写一个子任务名称"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/license-expired.json b/worklenz-frontend/public/locales/zh/license-expired.json
new file mode 100644
index 00000000..838125c2
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/license-expired.json
@@ -0,0 +1,6 @@
+{
+  "title": "您的Worklenz试用已过期！",
+  "subtitle": "请立即升级。",
+  "button": "立即升级",
+  "checking": "正在检查订阅状态..."
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/navbar.json b/worklenz-frontend/public/locales/zh/navbar.json
new file mode 100644
index 00000000..c4ed67ab
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/navbar.json
@@ -0,0 +1,31 @@
+{
+  "logoAlt": "Worklenz Logo",
+  "home": "首页",
+  "projects": "项目",
+  "schedule": "日程",
+  "reporting": "报告",
+  "clients": "客户",
+  "teams": "团队",
+  "labels": "标签",
+  "jobTitles": "职位",
+  "upgradePlan": "升级计划",
+  "upgradePlanTooltip": "升级计划",
+  "invite": "邀请",
+  "inviteTooltip": "邀请团队成员加入",
+  "switchTeamTooltip": "切换团队",
+  "help": "帮助",
+  "notificationTooltip": "查看通知",
+  "profileTooltip": "查看个人资料",
+  "adminCenter": "管理中心",
+  "settings": "设置",
+  "logOut": "登出",
+  "notificationsDrawer": {
+    "read": "已读通知",
+    "unread": "未读通知",
+    "markAsRead": "标记为已读",
+    "readAndJoin": "阅读并加入",
+    "accept": "接受",
+    "acceptAndJoin": "接受并加入",
+    "noNotifications": "没有通知"
+  }
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/organization-name-form.json b/worklenz-frontend/public/locales/zh/organization-name-form.json
new file mode 100644
index 00000000..df8727d8
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/organization-name-form.json
@@ -0,0 +1,5 @@
+{
+  "nameYourOrganization": "命名您的组织。",
+  "worklenzAccountTitle": "为您的Worklenz账户选择一个名称。",
+  "continue": "继续"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/phases-drawer.json b/worklenz-frontend/public/locales/zh/phases-drawer.json
new file mode 100644
index 00000000..4bfb2a13
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/phases-drawer.json
@@ -0,0 +1,7 @@
+{
+    "configurePhases": "配置阶段",
+    "phaseLabel": "阶段标签",
+    "enterPhaseName": "输入阶段标签名称",
+    "addOption": "添加选项",
+    "phaseOptions": "阶段选项："
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/project-drawer.json b/worklenz-frontend/public/locales/zh/project-drawer.json
new file mode 100644
index 00000000..1649dfde
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/project-drawer.json
@@ -0,0 +1,42 @@
+{
+  "createProject": "创建项目",
+  "editProject": "编辑项目",
+  "enterCategoryName": "输入类别名称",
+  "hitEnterToCreate": "按回车键创建！",
+  "enterNotes": "备注",
+  "youCanManageClientsUnderSettings": "您可以在设置中管理客户",
+  "addCategory": "向项目添加类别",
+  "newCategory": "新类别",
+  "notes": "备注",
+  "startDate": "开始日期",
+  "endDate": "结束日期",
+  "estimateWorkingDays": "估算工作日",
+  "estimateManDays": "估算人天",
+  "hoursPerDay": "每天小时数",
+  "create": "创建",
+  "update": "更新",
+  "delete": "删除",
+  "typeToSearchClients": "输入以搜索客户",
+  "projectColor": "项目颜色",
+  "pleaseEnterAName": "请输入名称",
+  "enterProjectName": "输入项目名称",
+  "name": "名称",
+  "status": "状态",
+  "health": "健康状况",
+  "category": "类别",
+  "projectManager": "项目经理",
+  "client": "客户",
+  "deleteConfirmation": "您确定要删除吗？",
+  "deleteConfirmationDescription": "这将删除所有相关数据且无法撤销。",
+  "yes": "是",
+  "no": "否",
+  "createdAt": "创建于",
+  "updatedAt": "更新于",
+  "by": "由",
+  "add": "添加",
+  "asClient": "作为客户",
+  "createClient": "创建客户",
+  "searchInputPlaceholder": "按名称或电子邮件搜索",
+  "hoursPerDayValidationMessage": "每天小时数必须是1到24之间的数字",
+  "noPermission": "无权限"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/project-view-files.json b/worklenz-frontend/public/locales/zh/project-view-files.json
new file mode 100644
index 00000000..9cbf8ef6
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/project-view-files.json
@@ -0,0 +1,14 @@
+{
+  "nameColumn": "名称",
+  "attachedTaskColumn": "附加任务",
+  "sizeColumn": "大小",
+  "uploadedByColumn": "上传者",
+  "uploadedAtColumn": "上传时间",
+  "fileIconAlt": "文件图标",
+  "titleDescriptionText": "此项目中任务的所有附件将显示在这里。",
+  "deleteConfirmationTitle": "您确定吗？",
+  "deleteConfirmationOk": "是",
+  "deleteConfirmationCancel": "取消",
+  "segmentedTooltip": "即将推出！在列表视图和缩略图视图之间切换。",
+  "emptyText": "项目中没有附件。"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/project-view-insights.json b/worklenz-frontend/public/locales/zh/project-view-insights.json
new file mode 100644
index 00000000..903d73d2
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/project-view-insights.json
@@ -0,0 +1,41 @@
+{
+  "overview": {
+    "title": "概览",
+    "statusOverview": "状态概览",
+    "priorityOverview": "优先级概览",
+    "lastUpdatedTasks": "最近更新的任务"
+  },
+  "members": {
+    "title": "成员",
+    "tooltip": "成员",
+    "tasksByMembers": "按成员分类任务",
+    "tasksByMembersTooltip": "按成员分类任务",
+    "name": "名称",
+    "taskCount": "任务计数",
+    "contribution": "贡献",
+    "completed": "已完成",
+    "incomplete": "未完成",
+    "overdue": "逾期",
+    "progress": "进度"
+  },
+  "tasks": {
+    "overdueTasks": "逾期任务",
+    "overLoggedTasks": "超额记录任务",
+    "tasksCompletedEarly": "提前完成的任务",
+    "tasksCompletedLate": "延迟完成的任务",
+    "overLoggedTasksTooltip": "记录时间超过预计时间的任务",
+    "overdueTasksTooltip": "超过截止日期的任务"
+  },
+  "common": {
+    "seeAll": "查看全部",
+    "totalLoggedHours": "总记录小时数",
+    "totalEstimation": "总估算",
+    "completedTasks": "已完成任务",
+    "incompleteTasks": "未完成任务",
+    "overdueTasks": "逾期任务",
+    "overdueTasksTooltip": "超过截止日期的任务",
+    "totalLoggedHoursTooltip": "任务估算和任务记录时间。",
+    "includeArchivedTasks": "包含已归档任务",
+    "export": "导出"
+  }
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/project-view-members.json b/worklenz-frontend/public/locales/zh/project-view-members.json
new file mode 100644
index 00000000..3d217694
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/project-view-members.json
@@ -0,0 +1,17 @@
+{
+  "nameColumn": "名称",
+  "jobTitleColumn": "职位",
+  "emailColumn": "电子邮件",
+  "tasksColumn": "任务",
+  "taskProgressColumn": "任务进度",
+  "accessColumn": "访问权限",
+  "fileIconAlt": "文件图标",
+  "deleteConfirmationTitle": "您确定吗？",
+  "deleteConfirmationOk": "是",
+  "deleteConfirmationCancel": "取消",
+  "refreshButtonTooltip": "刷新成员",
+  "deleteButtonTooltip": "从项目中移除",
+  "memberCount": "成员",
+  "membersCountPlural": "成员",
+  "emptyText": "项目中没有附件。"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/project-view-updates.json b/worklenz-frontend/public/locales/zh/project-view-updates.json
new file mode 100644
index 00000000..b34c71ea
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/project-view-updates.json
@@ -0,0 +1,6 @@
+{
+  "inputPlaceholder": "添加评论",
+  "addButton": "添加",
+  "cancelButton": "取消",
+  "deleteButton": "删除"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/project-view/import-task-templates.json b/worklenz-frontend/public/locales/zh/project-view/import-task-templates.json
new file mode 100644
index 00000000..3dae9403
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/project-view/import-task-templates.json
@@ -0,0 +1,11 @@
+{
+    "importTaskTemplate": "导入任务模板",
+    "templateName": "模板名称",
+    "templateDescription": "模板描述",
+    "selectedTasks": "已选任务",
+    "tasks": "任务",
+    "templates": "模板",
+    "remove": "移除",
+    "cancel": "取消",
+    "import": "导入"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/project-view/project-member-drawer.json b/worklenz-frontend/public/locales/zh/project-view/project-member-drawer.json
new file mode 100644
index 00000000..f412f22b
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/project-view/project-member-drawer.json
@@ -0,0 +1,7 @@
+{
+    "title": "项目成员",
+    "searchLabel": "通过添加名称或电子邮件添加成员",
+    "searchPlaceholder": "输入名称或电子邮件",
+    "inviteAsAMember": "邀请为成员",
+    "inviteNewMemberByEmail": "通过电子邮件邀请新成员"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/project-view/project-view-header.json b/worklenz-frontend/public/locales/zh/project-view/project-view-header.json
new file mode 100644
index 00000000..7ce20f0b
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/project-view/project-view-header.json
@@ -0,0 +1,13 @@
+{
+    "importTasks": "导入任务",
+    "createTask": "创建任务",
+    "settings": "设置",
+    "subscribe": "订阅",
+    "unsubscribe": "取消订阅",
+    "deleteProject": "删除项目",
+    "startDate": "开始日期",
+    "endDate": "结束日期",
+    "projectSettings": "项目设置",
+    "projectSummary": "项目摘要",
+    "receiveProjectSummary": "每晚接收项目摘要。"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/project-view/save-as-template.json b/worklenz-frontend/public/locales/zh/project-view/save-as-template.json
new file mode 100644
index 00000000..d1d3dfa8
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/project-view/save-as-template.json
@@ -0,0 +1,27 @@
+{
+  "title": "保存为模板",
+  "templateName": "模板名称",
+  "includes": "项目中应包含哪些内容到模板中？",
+  "includesOptions": {
+    "statuses": "状态",
+    "phases": "阶段",
+    "labels": "标签"
+  },
+  "taskIncludes": "任务中应包含哪些内容到模板中？",
+  "taskIncludesOptions": {
+    "statuses": "状态",
+    "phases": "阶段",
+    "labels": "标签",
+    "name": "名称",
+    "priority": "优先级",
+    "status": "状态",
+    "phase": "阶段",
+    "label": "标签",
+    "timeEstimate": "预计用时",
+    "description": "描述",
+    "subTasks": "子任务"
+  },
+  "cancel": "取消",
+  "save": "保存",
+  "templateNamePlaceholder": "输入模板名称"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/reporting-members-drawer.json b/worklenz-frontend/public/locales/zh/reporting-members-drawer.json
new file mode 100644
index 00000000..db42a74b
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/reporting-members-drawer.json
@@ -0,0 +1,76 @@
+{
+  "exportButton": "导出",
+  "timeLogsButton": "时间日志",
+  "activityLogsButton": "活动日志",
+  "tasksButton": "任务",
+  "searchByNameInputPlaceholder": "按名称搜索",
+  "overviewTab": "概览",
+  "timeLogsTab": "时间日志",
+  "activityLogsTab": "活动日志",
+  "tasksTab": "任务",
+  "projectsText": "项目",
+  "totalTasksText": "任务总数",
+  "assignedTasksText": "已分配任务",
+  "completedTasksText": "已完成任务",
+  "ongoingTasksText": "进行中任务",
+  "overdueTasksText": "逾期任务",
+  "loggedHoursText": "记录小时数",
+  "tasksText": "任务",
+  "allText": "全部",
+  "tasksByProjectsText": "按项目分类任务",
+  "tasksByStatusText": "按状态分类任务",
+  "tasksByPriorityText": "按优先级分类任务",
+  "todoText": "待办",
+  "doingText": "进行中",
+  "doneText": "已完成",
+  "lowText": "低",
+  "mediumText": "中",
+  "highText": "高",
+  "billableButton": "可计费",
+  "billableText": "可计费",
+  "nonBillableText": "不可计费",
+  "timeLogsEmptyPlaceholder": "没有时间日志可显示",
+  "loggedText": "记录",
+  "forText": "为",
+  "inText": "在",
+  "updatedText": "更新",
+  "fromText": "从",
+  "toText": "到",
+  "withinText": "在...之内",
+  "activityLogsEmptyPlaceholder": "没有活动日志可显示",
+  "filterByText": "筛选依据：",
+  "selectProjectPlaceholder": "选择项目",
+  "taskColumn": "任务",
+  "nameColumn": "名称",
+  "projectColumn": "项目",
+  "statusColumn": "状态",
+  "priorityColumn": "优先级",
+  "dueDateColumn": "截止日期",
+  "completedDateColumn": "完成日期",
+  "estimatedTimeColumn": "预计用时",
+  "loggedTimeColumn": "记录时间",
+  "overloggedTimeColumn": "超额记录时间",
+  "daysLeftColumn": "剩余天数/逾期",
+  "startDateColumn": "开始日期",
+  "endDateColumn": "结束日期",
+  "actualTimeColumn": "实际时间",
+  "projectHealthColumn": "项目健康状况",
+  "categoryColumn": "类别",
+  "projectManagerColumn": "项目经理",
+  "tasksStatsOverviewDrawerTitle": "的任务",
+  "projectsStatsOverviewDrawerTitle": "的项目",
+  "cancelledText": "已取消",
+  "blockedText": "已阻塞",
+  "onHoldText": "暂停",
+  "proposedText": "提议",
+  "inPlanningText": "规划中",
+  "inProgressText": "进行中",
+  "completedText": "已完成",
+  "continuousText": "持续",
+  "daysLeftText": "天剩余",
+  "daysOverdueText": "天逾期",
+  "notSetText": "未设置",
+  "needsAttentionText": "需要关注",
+  "atRiskText": "有风险",
+  "goodText": "良好"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/reporting-members.json b/worklenz-frontend/public/locales/zh/reporting-members.json
new file mode 100644
index 00000000..de4c23bb
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/reporting-members.json
@@ -0,0 +1,31 @@
+{
+  "yesterdayText": "昨天",
+  "lastSevenDaysText": "过去7天",
+  "lastWeekText": "上周",
+  "lastThirtyDaysText": "过去30天",
+  "lastMonthText": "上个月",
+  "lastThreeMonthsText": "过去3个月",
+  "allTimeText": "所有时间",
+  "customRangeText": "自定义范围",
+  "startDateInputPlaceholder": "开始日期",
+  "EndDateInputPlaceholder": "结束日期",
+  "filterButton": "筛选",
+  "membersTitle": "成员",
+  "includeArchivedButton": "包含已归档项目",
+  "exportButton": "导出",
+  "excelButton": "Excel",
+  "searchByNameInputPlaceholder": "按名称搜索",
+  "memberColumn": "成员",
+  "tasksProgressColumn": "任务进度",
+  "tasksAssignedColumn": "分配任务",
+  "completedTasksColumn": "已完成任务",
+  "overdueTasksColumn": "逾期任务",
+  "ongoingTasksColumn": "进行中任务",
+  "tasksAssignedColumnTooltip": "在选定日期范围内分配的任务",
+  "overdueTasksColumnTooltip": "在选定日期范围结束时逾期的任务",
+  "completedTasksColumnTooltip": "在选定日期范围内完成的任务",
+  "ongoingTasksColumnTooltip": "已开始但尚未完成的任务",
+  "todoText": "待办",
+  "doingText": "进行中",
+  "doneText": "已完成"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/reporting-overview-drawer.json b/worklenz-frontend/public/locales/zh/reporting-overview-drawer.json
new file mode 100644
index 00000000..a02b318f
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/reporting-overview-drawer.json
@@ -0,0 +1,33 @@
+{
+  "exportButton": "导出",
+  "projectsButton": "项目",
+  "membersButton": "成员",
+  "searchByNameInputPlaceholder": "按名称搜索",
+  "overviewTab": "概览",
+  "projectsTab": "项目",
+  "membersTab": "成员",
+  "projectsByStatusText": "按状态分类项目",
+  "projectsByCategoryText": "按类别分类项目",
+  "projectsByHealthText": "按健康状况分类项目",
+  "projectsText": "项目",
+  "allText": "全部",
+  "cancelledText": "已取消",
+  "blockedText": "已阻塞",
+  "onHoldText": "暂停",
+  "proposedText": "提议",
+  "inPlanningText": "规划中",
+  "inProgressText": "进行中",
+  "completedText": "已完成",
+  "continuousText": "持续",
+  "notSetText": "未设置",
+  "needsAttentionText": "需要关注",
+  "atRiskText": "有风险",
+  "goodText": "良好",
+  "nameColumn": "名称",
+  "emailColumn": "电子邮件",
+  "projectsColumn": "项目",
+  "tasksColumn": "任务",
+  "overdueTasksColumn": "逾期任务",
+  "completedTasksColumn": "已完成任务",
+  "ongoingTasksColumn": "进行中任务"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/reporting-overview.json b/worklenz-frontend/public/locales/zh/reporting-overview.json
new file mode 100644
index 00000000..fb172817
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/reporting-overview.json
@@ -0,0 +1,22 @@
+{
+  "overviewTitle": "概览",
+  "includeArchivedButton": "包含已归档项目",
+  "teamCount": "团队",
+  "teamCountPlural": "团队",
+  "projectCount": "项目",
+  "projectCountPlural": "项目",
+  "memberCount": "成员",
+  "memberCountPlural": "成员",
+  "activeProjectCount": "活跃项目",
+  "activeProjectCountPlural": "活跃项目",
+  "overdueProjectCount": "逾期项目",
+  "overdueProjectCountPlural": "逾期项目",
+  "unassignedMemberCount": "未分配成员",
+  "unassignedMemberCountPlural": "未分配成员",
+  "memberWithOverdueTaskCount": "有逾期任务的成员",
+  "memberWithOverdueTaskCountPlural": "有逾期任务的成员",
+  "teamsText": "团队",
+  "nameColumn": "名称",
+  "projectsColumn": "项目",
+  "membersColumn": "成员"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/reporting-projects-drawer.json b/worklenz-frontend/public/locales/zh/reporting-projects-drawer.json
new file mode 100644
index 00000000..d2f2f6ef
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/reporting-projects-drawer.json
@@ -0,0 +1,52 @@
+{
+  "exportButton": "导出",
+  "membersButton": "成员",
+  "tasksButton": "任务",
+  "searchByNameInputPlaceholder": "按名称搜索",
+  "overviewTab": "概览",
+  "membersTab": "成员",
+  "tasksTab": "任务",
+  "completedTasksText": "已完成任务",
+  "incompleteTasksText": "未完成任务",
+  "overdueTasksText": "逾期任务",
+  "allocatedHoursText": "已分配小时数",
+  "loggedHoursText": "已记录小时数",
+  "tasksText": "任务",
+  "allText": "全部",
+  "tasksByStatusText": "按状态分类任务",
+  "tasksByPriorityText": "按优先级分类任务",
+  "tasksByDueDateText": "按截止日期分类任务",
+  "todoText": "待办",
+  "doingText": "进行中",
+  "doneText": "已完成",
+  "lowText": "低",
+  "mediumText": "中",
+  "highText": "高",
+  "completedText": "已完成",
+  "upcomingText": "即将到来",
+  "overdueText": "逾期",
+  "noDueDateText": "无截止日期",
+  "nameColumn": "名称",
+  "tasksCountColumn": "任务计数",
+  "completedTasksColumn": "已完成任务",
+  "incompleteTasksColumn": "未完成任务",
+  "overdueTasksColumn": "逾期任务",
+  "contributionColumn": "贡献",
+  "progressColumn": "进度",
+  "loggedTimeColumn": "记录时间",
+  "taskColumn": "任务",
+  "projectColumn": "项目",
+  "statusColumn": "状态",
+  "priorityColumn": "优先级",
+  "phaseColumn": "阶段",
+  "dueDateColumn": "截止日期",
+  "completedDateColumn": "完成日期",
+  "estimatedTimeColumn": "预计用时",
+  "overloggedTimeColumn": "超额记录时间",
+  "completedOnColumn": "完成于",
+  "daysOverdueColumn": "逾期天数",
+  "groupByText": "分组依据：",
+  "statusText": "状态",
+  "priorityText": "优先级",
+  "phaseText": "阶段"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/reporting-projects-filters.json b/worklenz-frontend/public/locales/zh/reporting-projects-filters.json
new file mode 100644
index 00000000..ddfbe104
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/reporting-projects-filters.json
@@ -0,0 +1,31 @@
+{
+  "searchByNamePlaceholder": "按名称搜索",
+  "searchByCategoryPlaceholder": "按类别搜索",
+  "statusText": "状态",
+  "healthText": "健康状况",
+  "categoryText": "类别",
+  "projectManagerText": "项目经理",
+  "showFieldsText": "显示字段",
+  "cancelledText": "已取消",
+  "blockedText": "已阻塞",
+  "onHoldText": "暂停",
+  "proposedText": "提议",
+  "inPlanningText": "规划中",
+  "inProgressText": "进行中",
+  "completedText": "已完成",
+  "continuousText": "持续",
+  "notSetText": "未设置",
+  "needsAttentionText": "需要关注",
+  "atRiskText": "有风险",
+  "goodText": "良好",
+  "nameText": "项目",
+  "estimatedVsActualText": "预计用时 vs 实际用时",
+  "tasksProgressText": "任务进度",
+  "lastActivityText": "最后活动",
+  "datesText": "开始/结束日期",
+  "daysLeftText": "剩余天数/逾期",
+  "projectHealthText": "项目健康状况",
+  "projectUpdateText": "项目更新",
+  "clientText": "客户",
+  "teamText": "团队"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/reporting-projects.json b/worklenz-frontend/public/locales/zh/reporting-projects.json
new file mode 100644
index 00000000..0ff7d415
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/reporting-projects.json
@@ -0,0 +1,44 @@
+{
+  "projectCount": "项目",
+  "projectCountPlural": "项目",
+  "includeArchivedButton": "包含已归档项目",
+  "exportButton": "导出",
+  "excelButton": "Excel",
+  "projectColumn": "项目",
+  "estimatedVsActualColumn": "预计用时 vs 实际用时",
+  "tasksProgressColumn": "任务进度",
+  "lastActivityColumn": "最后活动",
+  "statusColumn": "状态",
+  "datesColumn": "开始/结束日期",
+  "daysLeftColumn": "剩余天数/逾期",
+  "projectHealthColumn": "项目健康状况",
+  "categoryColumn": "类别",
+  "projectUpdateColumn": "项目更新",
+  "clientColumn": "客户",
+  "teamColumn": "团队",
+  "projectManagerColumn": "项目经理",
+  "openButton": "打开",
+  "estimatedText": "预计",
+  "actualText": "实际",
+  "todoText": "待办",
+  "doingText": "进行中",
+  "doneText": "已完成",
+  "cancelledText": "已取消",
+  "blockedText": "已阻塞",
+  "onHoldText": "暂停",
+  "proposedText": "提议",
+  "inPlanningText": "规划中",
+  "inProgressText": "进行中",
+  "completedText": "已完成",
+  "continuousText": "持续",
+  "daysLeftText": "天剩余",
+  "dayLeftText": "天剩余",
+  "daysOverdueText": "天逾期",
+  "notSetText": "未设置",
+  "needsAttentionText": "需要关注",
+  "atRiskText": "有风险",
+  "goodText": "良好",
+  "setCategoryText": "设置类别",
+  "searchByNameInputPlaceholder": "按名称搜索",
+  "todayText": "今天"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/reporting-sidebar.json b/worklenz-frontend/public/locales/zh/reporting-sidebar.json
new file mode 100644
index 00000000..8a8206fb
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/reporting-sidebar.json
@@ -0,0 +1,8 @@
+{
+  "overview": "概览",
+  "projects": "项目",
+  "members": "成员",
+  "timeReports": "用时报告",
+  "estimateVsActual": "预计用时 vs 实际用时",
+  "currentOrganizationTooltip": "当前的组织"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/schedule.json b/worklenz-frontend/public/locales/zh/schedule.json
new file mode 100644
index 00000000..53fa8a97
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/schedule.json
@@ -0,0 +1,34 @@
+{
+  "today": "今天",
+  "week": "周",
+  "month": "月",
+  "settings": "设置",
+  "workingDays": "工作日",
+  "monday": "星期一",
+  "tuesday": "星期二",
+  "wednesday": "星期三",
+  "thursday": "星期四",
+  "friday": "星期五",
+  "saturday": "星期六",
+  "sunday": "星期日",
+  "workingHours": "工作时间",
+  "hours": "小时",
+  "saveButton": "保存",
+  "totalAllocation": "总分配",
+  "timeLogged": "记录时间",
+  "remainingTime": "剩余时间",
+  "total": "总计",
+  "perDay": "每天",
+  "tasks": "任务",
+  "startDate": "开始日期",
+  "endDate": "结束日期",
+  "hoursPerDay": "每天小时数",
+  "totalHours": "总小时数",
+  "deleteButton": "删除",
+  "cancelButton": "取消",
+  "tabTitle": "没有开始和结束日期的任务",
+  "allocatedTime": "分配时间",
+  "totalLogged": "总记录",
+  "loggedBillable": "已记录可计费",
+  "loggedNonBillable": "已记录不可计费"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/settings/categories.json b/worklenz-frontend/public/locales/zh/settings/categories.json
new file mode 100644
index 00000000..00027081
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/settings/categories.json
@@ -0,0 +1,10 @@
+{
+  "categoryColumn": "类别",
+  "deleteConfirmationTitle": "您确定吗？",
+  "deleteConfirmationOk": "是",
+  "deleteConfirmationCancel": "取消",
+  "associatedTaskColumn": "关联项目",
+  "searchPlaceholder": "按名称搜索",
+  "emptyText": "在更新或创建项目时可以创建类别。",
+  "colorChangeTooltip": "点击更改颜色"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/settings/change-password.json b/worklenz-frontend/public/locales/zh/settings/change-password.json
new file mode 100644
index 00000000..30cec581
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/settings/change-password.json
@@ -0,0 +1,15 @@
+{
+  "title": "更改密码",
+  "currentPassword": "当前密码",
+  "newPassword": "新密码",
+  "confirmPassword": "确认密码",
+  "currentPasswordPlaceholder": "输入您的当前密码",
+  "newPasswordPlaceholder": "新密码",
+  "confirmPasswordPlaceholder": "确认密码",
+  "currentPasswordRequired": "请输入您的当前密码！",
+  "newPasswordRequired": "请输入您的新密码！",
+  "passwordValidationError": "密码必须至少包含8个字符，包括一个大写字母、一个数字和一个符号。",
+  "passwordMismatch": "密码不匹配！",
+  "passwordRequirements": "新密码应至少包含8个字符，包括一个大写字母、一个数字和一个符号。",
+  "updateButton": "更新密码"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/settings/clients.json b/worklenz-frontend/public/locales/zh/settings/clients.json
new file mode 100644
index 00000000..c06b1adc
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/settings/clients.json
@@ -0,0 +1,22 @@
+{
+  "nameColumn": "名称",
+  "projectColumn": "项目",
+  "noProjectsAvailable": "没有可用的项目",
+  "deleteConfirmationTitle": "您确定吗？",
+  "deleteConfirmationOk": "是",
+  "deleteConfirmationCancel": "取消",
+  "searchPlaceholder": "按名称搜索",
+  "createClient": "创建客户",
+  "pinTooltip": "点击将其固定到主菜单",
+  "createClientDrawerTitle": "创建客户",
+  "updateClientDrawerTitle": "更新客户",
+  "nameLabel": "名称",
+  "namePlaceholder": "名称",
+  "nameRequiredError": "请输入名称",
+  "createButton": "创建",
+  "updateButton": "更新",
+  "createClientSuccessMessage": "客户创建成功！",
+  "createClientErrorMessage": "客户创建失败！",
+  "updateClientSuccessMessage": "客户更新成功！",
+  "updateClientErrorMessage": "客户更新失败！"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/settings/job-titles.json b/worklenz-frontend/public/locales/zh/settings/job-titles.json
new file mode 100644
index 00000000..c0458bb6
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/settings/job-titles.json
@@ -0,0 +1,20 @@
+{
+  "nameColumn": "名称",
+  "deleteConfirmationTitle": "您确定吗？",
+  "deleteConfirmationOk": "是",
+  "deleteConfirmationCancel": "取消",
+  "searchPlaceholder": "按名称搜索",
+  "createJobTitleButton": "创建职位",
+  "pinTooltip": "点击将其固定到主菜单",
+  "createJobTitleDrawerTitle": "创建职位",
+  "updateJobTitleDrawerTitle": "更新职位",
+  "nameLabel": "名称",
+  "namePlaceholder": "名称",
+  "nameRequiredError": "请输入名称",
+  "createButton": "创建",
+  "updateButton": "更新",
+  "createJobTitleSuccessMessage": "职位创建成功！",
+  "createJobTitleErrorMessage": "职位创建失败！",
+  "updateJobTitleSuccessMessage": "职位更新成功！",
+  "updateJobTitleErrorMessage": "职位更新失败！"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/settings/labels.json b/worklenz-frontend/public/locales/zh/settings/labels.json
new file mode 100644
index 00000000..ab0d01cd
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/settings/labels.json
@@ -0,0 +1,11 @@
+{
+  "labelColumn": "标签",
+  "deleteConfirmationTitle": "您确定吗？",
+  "deleteConfirmationOk": "是",
+  "deleteConfirmationCancel": "取消",
+  "associatedTaskColumn": "关联任务计数",
+  "searchPlaceholder": "按名称搜索",
+  "emptyText": "标签可以在更新或创建任务时创建。",
+  "pinTooltip": "点击将其固定到主菜单",
+  "colorChangeTooltip": "点击更改颜色"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/settings/language.json b/worklenz-frontend/public/locales/zh/settings/language.json
new file mode 100644
index 00000000..631eac11
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/settings/language.json
@@ -0,0 +1,7 @@
+{
+  "language": "语言",
+  "language_required": "语言是必需的",
+  "time_zone": "时区",
+  "time_zone_required": "时区是必需的",
+  "save_changes": "保存更改"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/settings/notifications.json b/worklenz-frontend/public/locales/zh/settings/notifications.json
new file mode 100644
index 00000000..f15784bf
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/settings/notifications.json
@@ -0,0 +1,11 @@
+{
+  "title": "通知设置",
+  "emailTitle": "向我发送电子邮件通知",
+  "emailDescription": "包括新的任务分配",
+  "dailyDigestTitle": "向我发送每日摘要",
+  "dailyDigestDescription": "每天晚上，您将收到任务中最近活动的摘要。",
+  "popupTitle": "当Worklenz打开时，在我的电脑上弹出通知",
+  "popupDescription": "弹出通知可能会被您的浏览器禁用。更改您的浏览器设置以允许它们。",
+  "unreadItemsTitle": "显示未读项目的数量",
+  "unreadItemsDescription": "您将看到每个通知的计数。"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/settings/profile.json b/worklenz-frontend/public/locales/zh/settings/profile.json
new file mode 100644
index 00000000..79e670c6
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/settings/profile.json
@@ -0,0 +1,13 @@
+{
+  "uploadError": "您只能上传JPG/PNG文件！",
+  "uploadSizeError": "图片必须小于2MB！",
+  "upload": "上传",
+  "nameLabel": "名称",
+  "nameRequiredError": "名称是必需的",
+  "emailLabel": "电子邮件",
+  "emailRequiredError": "电子邮件是必需的",
+  "saveChanges": "保存更改",
+  "profileJoinedText": "一个月前加入",
+  "profileLastUpdatedText": "一个月前更新",
+  "avatarTooltip": "点击上传头像"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/settings/project-templates.json b/worklenz-frontend/public/locales/zh/settings/project-templates.json
new file mode 100644
index 00000000..5dcc866c
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/settings/project-templates.json
@@ -0,0 +1,8 @@
+{
+  "nameColumn": "名称",
+  "editToolTip": "编辑",
+  "deleteToolTip": "删除",
+  "confirmText": "您确定吗？",
+  "okText": "是",
+  "cancelText": "取消"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/settings/sidebar.json b/worklenz-frontend/public/locales/zh/settings/sidebar.json
new file mode 100644
index 00000000..ad5e9a7d
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/settings/sidebar.json
@@ -0,0 +1,14 @@
+{
+  "profile": "个人资料",
+  "notifications": "通知",
+  "clients": "客户",
+  "job-titles": "职位",
+  "labels": "标签",
+  "categories": "类别",
+  "project-templates": "项目模板",
+  "task-templates": "任务模板",
+  "team-members": "团队成员",
+  "teams": "团队",
+  "change-password": "更改密码",
+  "language-and-region": "语言和地区"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/settings/task-templates.json b/worklenz-frontend/public/locales/zh/settings/task-templates.json
new file mode 100644
index 00000000..3fd9124a
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/settings/task-templates.json
@@ -0,0 +1,9 @@
+{
+  "nameColumn": "名称",
+  "createdColumn": "创建时间",
+  "editToolTip": "编辑",
+  "deleteToolTip": "删除",
+  "confirmText": "您确定吗？",
+  "okText": "是",
+  "cancelText": "取消"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/settings/team-members.json b/worklenz-frontend/public/locales/zh/settings/team-members.json
new file mode 100644
index 00000000..5826c6ec
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/settings/team-members.json
@@ -0,0 +1,44 @@
+{
+  "nameColumn": "名称",
+  "projectsColumn": "项目",
+  "emailColumn": "电子邮件",
+  "teamAccessColumn": "团队访问",
+  "memberCount": "成员",
+  "membersCountPlural": "成员",
+  "searchPlaceholder": "按名称搜索成员",
+  "pinTooltip": "刷新成员列表",
+  "addMemberButton": "添加新成员",
+  "editTooltip": "编辑成员",
+  "deactivateTooltip": "停用成员",
+  "activateTooltip": "激活成员",
+  "deleteTooltip": "删除成员",
+  "confirmDeleteTitle": "您确定要删除此成员吗？",
+  "confirmActivateTitle": "您确定要更改此成员的状态吗？",
+  "okText": "是，继续",
+  "cancelText": "否，取消",
+  "deactivatedText": "（当前已停用）",
+  "pendingInvitationText": "（邀请待处理）",
+  "addMemberDrawerTitle": "添加新团队成员",
+  "updateMemberDrawerTitle": "更新团队成员",
+  "addMemberEmailHint": "无论是否接受邀请，成员都将被添加到团队中",
+  "memberEmailLabel": "电子邮件",
+  "memberEmailPlaceholder": "输入团队成员的电子邮件地址",
+  "memberEmailRequiredError": "请输入有效的电子邮件地址",
+  "jobTitleLabel": "职位",
+  "jobTitlePlaceholder": "选择或搜索职位（可选）",
+  "memberAccessLabel": "访问级别",
+  "addToTeamButton": "将成员添加到团队",
+  "updateButton": "保存更改",
+  "resendInvitationButton": "重新发送邀请邮件",
+  "invitationSentSuccessMessage": "团队邀请已成功发送！",
+  "createMemberSuccessMessage": "新团队成员已成功添加！",
+  "createMemberErrorMessage": "添加团队成员失败。请重试。",
+  "updateMemberSuccessMessage": "团队成员已成功更新！",
+  "updateMemberErrorMessage": "更新团队成员失败。请重试。",
+  "memberText": "成员",
+  "adminText": "管理员",
+  "ownerText": "团队所有者",
+  "addedText": "已添加",
+  "updatedText": "已更新",
+  "noResultFound": "输入电子邮件地址并按回车键..."
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/task-drawer/task-drawer-info-tab.json b/worklenz-frontend/public/locales/zh/task-drawer/task-drawer-info-tab.json
new file mode 100644
index 00000000..b0b36689
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/task-drawer/task-drawer-info-tab.json
@@ -0,0 +1,29 @@
+{
+  "details": {
+    "task-key": "任务ID",
+    "phase": "阶段",
+    "assignees": "受托人",
+    "due-date": "截止日期",
+    "time-estimation": "估计时间",
+    "priority": "优先级",
+    "labels": "标签",
+    "billable": "可计费",
+    "notify": "通知",
+    "when-done-notify": "完成时通知",
+    "start-date": "开始日期",
+    "end-date": "结束日期",
+    "hide-start-date": "隐藏开始日期",
+    "show-start-date": "显示开始日期",
+    "hours": "小时",
+    "minutes": "分钟"
+  },
+  "description": {
+    "title": "描述",
+    "placeholder": "添加更详细的描述..."
+  },
+  "subTasks": {
+    "title": "子任务",
+    "add-sub-task": "+ 添加子任务",
+    "refresh-sub-tasks": "刷新子任务"
+  }
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/task-drawer/task-drawer.json b/worklenz-frontend/public/locales/zh/task-drawer/task-drawer.json
new file mode 100644
index 00000000..8ac1c0d1
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/task-drawer/task-drawer.json
@@ -0,0 +1,78 @@
+{
+  "taskHeader": {
+    "taskNamePlaceholder": "输入您的任务",
+    "deleteTask": "删除任务"
+  },
+  "taskInfoTab": {
+    "title": "信息",
+    "details": {
+      "title": "详情",
+      "task-key": "任务ID",
+      "phase": "阶段",
+      "assignees": "受托人",
+      "due-date": "截止日期",
+      "time-estimation": "估计时间",
+      "priority": "优先级",
+      "labels": "标签",
+      "billable": "可计费",
+      "notify": "通知",
+      "when-done-notify": "完成时通知",
+      "start-date": "开始日期",
+      "end-date": "结束日期",
+      "hide-start-date": "隐藏开始日期",
+      "show-start-date": "显示开始日期",
+      "hours": "小时",
+      "minutes": "分钟"
+    },
+    "labels": {
+      "labelInputPlaceholder": "搜索或创建",
+      "labelsSelectorInputTip": "按回车键创建"
+    },
+    "description": {
+      "title": "描述",
+      "placeholder": "添加更详细的描述..."
+    },
+    "subTasks": {
+      "title": "子任务",
+      "addSubTask": "+ 添加子任务",
+      "addSubTaskInputPlaceholder": "输入您的任务并按回车键",
+      "refreshSubTasks": "刷新子任务",
+      "edit": "编辑",
+      "delete": "删除",
+      "confirmDeleteSubTask": "您确定要删除此子任务吗？",
+      "deleteSubTask": "删除子任务"
+    },
+    "dependencies": {
+      "title": "依赖关系",
+      "addDependency": "+ 添加新依赖",
+      "blockedBy": "被阻塞",
+      "searchTask": "输入以搜索任务",
+      "noTasksFound": "未找到任务",
+      "confirmDeleteDependency": "您确定要删除吗？"
+    },
+    "attachments": {
+      "title": "附件",
+      "chooseOrDropFileToUpload": "选择或拖放文件上传",
+      "uploading": "上传中..."
+    },
+    "comments": {
+      "title": "评论",
+      "addComment": "+ 添加新评论",
+      "noComments": "尚无评论。成为第一个评论的人！",
+      "delete": "删除",
+      "confirmDeleteComment": "您确定要删除此评论吗？"
+    },
+    "searchInputPlaceholder": "按名称搜索",
+    "pendingInvitation": "待处理邀请"
+  },
+  "taskTimeLogTab": {
+    "title": "时间日志",
+    "addTimeLog": "添加新时间日志",
+    "totalLogged": "总记录",
+    "exportToExcel": "导出到Excel",
+    "noTimeLogsFound": "未找到时间日志"
+  },
+  "taskActivityLogTab": {
+    "title": "活动日志"
+  }
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/task-list-filters.json b/worklenz-frontend/public/locales/zh/task-list-filters.json
new file mode 100644
index 00000000..300c8eb0
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/task-list-filters.json
@@ -0,0 +1,54 @@
+{
+  "searchButton": "搜索",
+  "resetButton": "重置",
+  "searchInputPlaceholder": "按名称搜索",
+  "sortText": "排序",
+  "statusText": "状态",
+  "phaseText": "阶段",
+  "memberText": "成员",
+  "assigneesText": "受托人",
+  "priorityText": "优先级",
+  "labelsText": "标签",
+  "membersText": "成员",
+  "groupByText": "分组依据",
+  "showArchivedText": "显示已归档的任务",
+  "showFieldsText": "显示字段",
+  "keyText": "ID",
+  "taskText": "任务",
+  "descriptionText": "描述",
+  "phasesText": "阶段",
+  "listText": "列表",
+  "progressText": "进度",
+  "timeTrackingText": "时间跟踪",
+  "timetrackingText": "时间跟踪",
+  "estimationText": "估计",
+  "startDateText": "开始日期",
+  "startdateText": "开始日期",
+  "endDateText": "结束日期",
+  "dueDateText": "截止日期",
+  "duedateText": "截止日期",
+  "completedDateText": "完成日期",
+  "completeddateText": "完成日期",
+  "createdDateText": "创建日期",
+  "createddateText": "创建日期",
+  "lastUpdatedText": "最后更新",
+  "lastupdatedText": "最后更新",
+  "reporterText": "报告人",
+  "dueTimeText": "截止时间",
+  "duetimeText": "截止时间",
+  "lowText": "低",
+  "mediumText": "中",
+  "highText": "高",
+  "createStatusButtonTooltip": "状态设置",
+  "configPhaseButtonTooltip": "阶段设置",
+  "noLabelsFound": "未找到标签",
+  "addStatusButton": "添加状态",
+  "addPhaseButton": "添加阶段",
+  "createStatus": "创建状态",
+  "name": "名称",
+  "category": "类别",
+  "selectCategory": "选择类别",
+  "pleaseEnterAName": "请输入名称",
+  "pleaseSelectACategory": "请选择类别",
+  "create": "创建"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/task-list-table.json b/worklenz-frontend/public/locales/zh/task-list-table.json
new file mode 100644
index 00000000..c380963e
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/task-list-table.json
@@ -0,0 +1,56 @@
+{
+  "keyColumn": "ID",
+  "taskColumn": "任务",
+  "descriptionColumn": "描述",
+  "progressColumn": "进度",
+  "membersColumn": "成员",
+  "assigneesColumn": "受托人",
+  "labelsColumn": "标签",
+  "phasesColumn": "阶段",
+  "phaseColumn": "阶段",
+  "statusColumn": "状态",
+  "priorityColumn": "优先级",
+  "timeTrackingColumn": "时间追踪",
+  "timetrackingColumn": "时间追踪",
+  "estimationColumn": "估算",
+  "startDateColumn": "开始日期",
+  "startdateColumn": "开始日期",
+  "dueDateColumn": "截止日期",
+  "duedateColumn": "截止日期",
+  "completedDateColumn": "完成日期",
+  "completeddateColumn": "完成日期",
+  "createdDateColumn": "创建日期",
+  "createddateColumn": "创建日期",
+  "lastUpdatedColumn": "最后更新",
+  "lastupdatedColumn": "最后更新",
+  "reporterColumn": "报告人",
+  "dueTimeColumn": "截止时间",
+  "todoSelectorText": "待办",
+  "doingSelectorText": "进行中",
+  "doneSelectorText": "已完成",
+  "lowSelectorText": "低",
+  "mediumSelectorText": "中",
+  "highSelectorText": "高",
+  "selectText": "选择",
+  "labelsSelectorInputTip": "按回车键创建！",
+  "addTaskText": "+ 添加任务",
+  "addSubTaskText": "+ 添加子任务",
+  "addTaskInputPlaceholder": "输入任务并按回车键",
+  "openButton": "打开",
+  "okButton": "确定",
+  "noLabelsFound": "未找到标签",
+  "searchInputPlaceholder": "搜索或创建",
+  "assigneeSelectorInviteButton": "通过电子邮件邀请新成员",
+  "labelInputPlaceholder": "搜索或创建",
+  "pendingInvitation": "待处理邀请",
+  "contextMenu": {
+    "assignToMe": "分配给我",
+    "moveTo": "移动到",
+    "unarchive": "取消归档",
+    "archive": "归档",
+    "convertToSubTask": "转换为子任务",
+    "convertToTask": "转换为任务",
+    "delete": "删除",
+    "searchByNameInputPlaceholder": "按名称搜索"
+  }
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/task-template-drawer.json b/worklenz-frontend/public/locales/zh/task-template-drawer.json
new file mode 100644
index 00000000..53e99119
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/task-template-drawer.json
@@ -0,0 +1,11 @@
+{
+  "createTaskTemplate": "创建任务模板",
+  "editTaskTemplate": "编辑任务模板",
+  "cancelText": "取消",
+  "saveText": "保存",
+  "templateNameText": "模板名称",
+  "selectedTasks": "已选任务",
+  "removeTask": "移除",
+  "cancelButton": "取消",
+  "saveButton": "保存"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/tasks/task-table-bulk-actions.json b/worklenz-frontend/public/locales/zh/tasks/task-table-bulk-actions.json
new file mode 100644
index 00000000..2a4c89d6
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/tasks/task-table-bulk-actions.json
@@ -0,0 +1,24 @@
+{
+    "taskSelected": "任务已选择",
+    "tasksSelected": "任务已选择",
+    "changeStatus": "更改状态/优先级/阶段",
+    "changeLabel": "更改标签",
+    "assignToMe": "分配给我",
+    "changeAssignees": "更改受托人",
+    "archive": "归档",
+    "unarchive": "取消归档",
+    "delete": "删除",
+    "moreOptions": "更多选项",
+    "deselectAll": "取消全选",
+    "status": "状态",
+    "priority": "优先级",
+    "phase": "阶段",
+    "member": "成员",
+    "createTaskTemplate": "创建任务模板",
+    "apply": "应用",
+    "createLabel": "+ 创建标签",
+    "hitEnterToCreate": "按回车键创建",
+    "pendingInvitation": "待处理邀请",
+    "noMatchingLabels": "没有匹配的标签",
+    "noLabels": "没有标签"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/template-drawer.json b/worklenz-frontend/public/locales/zh/template-drawer.json
new file mode 100644
index 00000000..64fd242f
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/template-drawer.json
@@ -0,0 +1,19 @@
+{
+  "title": "编辑任务模板",
+  "cancelText": "取消",
+  "saveText": "保存",
+  "templateNameText": "模板名称",
+  "selectedTasks": "已选任务",
+  "removeTask": "移除",
+  "description": "描述",
+  "phase": "阶段",
+  "statuses": "状态",
+  "priorities": "优先级",
+  "labels": "标签",
+  "tasks": "任务",
+  "noTemplateSelected": "未选择模板",
+  "noDescription": "无描述",
+  "worklenzTemplates": "Worklenz模板",
+  "yourTemplatesLibrary": "您的模板库",
+  "searchTemplates": "搜索模板"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/templateDrawer.json b/worklenz-frontend/public/locales/zh/templateDrawer.json
new file mode 100644
index 00000000..8405f8ab
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/templateDrawer.json
@@ -0,0 +1,23 @@
+{
+  "bugTracking": "错误跟踪",
+  "construction": "建筑与施工",
+  "designCreative": "设计与创意",
+  "education": "教育",
+  "finance": "金融",
+  "hrRecruiting": "人力资源与招聘",
+  "informationTechnology": "信息技术",
+  "legal": "法律",
+  "manufacturing": "制造业",
+  "marketing": "市场营销",
+  "nonprofit": "非营利",
+  "personalUse": "个人使用",
+  "salesCRM": "销售与客户关系管理",
+  "serviceConsulting": "服务与咨询",
+  "softwareDevelopment": "软件开发",
+  "description": "描述",
+  "phase": "阶段",
+  "statuses": "状态",
+  "priorities": "优先级",
+  "labels": "标签",
+  "tasks": "任务"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/time-report.json b/worklenz-frontend/public/locales/zh/time-report.json
new file mode 100644
index 00000000..c376954a
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/time-report.json
@@ -0,0 +1,33 @@
+{
+  "includeArchivedProjects": "包含已归档项目",
+  "export": "导出",
+  "timeSheet": "时间表",
+  "searchByName": "按名称搜索",
+  "selectAll": "全选",
+  "teams": "团队",
+  "searchByProject": "按项目名称搜索",
+  "projects": "项目",
+  "searchByCategory": "按类别名称搜索",
+  "categories": "类别",
+  "billable": "可计费",
+  "nonBillable": "不可计费",
+  "total": "总计",
+  "projectsTimeSheet": "项目时间表",
+  "loggedTime": "已记录时间（小时）",
+  "exportToExcel": "导出到Excel",
+  "logged": "已记录",
+  "for": "为",
+  "membersTimeSheet": "成员时间表",
+  "member": "成员",
+  "estimatedVsActual": "预计用时 vs 实际用时",
+  "workingDays": "工作日",
+  "manDays": "人天",
+  "days": "天",
+  "estimatedDays": "预计天数",
+  "actualDays": "实际天数",
+  "noCategories": "未找到类别",
+  "noCategory": "无类别",
+  "noProjects": "未找到项目",
+  "noTeams": "未找到团队",
+  "noData": "未找到数据"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/public/locales/zh/unauthorized.json b/worklenz-frontend/public/locales/zh/unauthorized.json
new file mode 100644
index 00000000..985b1d08
--- /dev/null
+++ b/worklenz-frontend/public/locales/zh/unauthorized.json
@@ -0,0 +1,5 @@
+{
+    "title": "未授权！",
+    "subtitle": "您无权访问此页面",
+    "button": "返回首页"
+}
\ No newline at end of file
diff --git a/worklenz-frontend/src/features/i18n/language-selector.tsx b/worklenz-frontend/src/features/i18n/language-selector.tsx
index 7af61f85..fd61c8c0 100644
--- a/worklenz-frontend/src/features/i18n/language-selector.tsx
+++ b/worklenz-frontend/src/features/i18n/language-selector.tsx
@@ -17,6 +17,7 @@ const LanguageSelector = () => {
     { key: 'pt', label: 'Português' },
     { key: 'alb', label: 'Shqip' },
     { key: 'de', label: 'Deutsch' },
+    { key: 'zh_cn', label: '简体中文' },
   ];
 
   const languageLabels = {
@@ -25,6 +26,7 @@ const LanguageSelector = () => {
     pt: 'Pt',
     alb: 'Sq',
     de: 'de',
+    zh_cn: 'zh_cn',
   };
 
   return (
diff --git a/worklenz-frontend/src/features/i18n/localesSlice.ts b/worklenz-frontend/src/features/i18n/localesSlice.ts
index 045f385e..9177ad70 100644
--- a/worklenz-frontend/src/features/i18n/localesSlice.ts
+++ b/worklenz-frontend/src/features/i18n/localesSlice.ts
@@ -7,6 +7,7 @@ export enum Language {
   PT = 'pt',
   ALB = 'alb',
   DE = 'de',
+  ZH_CN = 'zh_cn',
 }
 
 export type ILanguageType = `${Language}`;
diff --git a/worklenz-frontend/src/pages/settings/language-and-region/language-and-region-settings.tsx b/worklenz-frontend/src/pages/settings/language-and-region/language-and-region-settings.tsx
index a043ac95..2bc4bf2f 100644
--- a/worklenz-frontend/src/pages/settings/language-and-region/language-and-region-settings.tsx
+++ b/worklenz-frontend/src/pages/settings/language-and-region/language-and-region-settings.tsx
@@ -55,6 +55,10 @@ const LanguageAndRegionSettings = () => {
       value: Language.DE,
       label: 'Deutsch',
     },
+    {
+      value: Language.ZH_CN,
+      label: "简体中文"
+    }
   ];
 
   const handleLanguageChange = async (values: { language?: ILanguageType; timezone?: string }) => {
@@ -150,7 +154,7 @@ const LanguageAndRegionSettings = () => {
             {t('save_changes')}
           </Button>
         </Form.Item>
-      </Form>): (
+      </Form>) : (
         <Skeleton />
       )}
     </Card>
diff --git a/worklenz-frontend/src/utils/greetingString.ts b/worklenz-frontend/src/utils/greetingString.ts
index 1e122f6a..d81bd1f2 100644
--- a/worklenz-frontend/src/utils/greetingString.ts
+++ b/worklenz-frontend/src/utils/greetingString.ts
@@ -41,6 +41,12 @@ export const greetingString = (name: string): string => {
     morning = 'Morgen';
     afternoon = 'Tag';
     evening = 'Abend';
+  } else if (language === 'zh_cn') {
+    greetingPrefix = '你好';
+    greetingSuffix = '';
+    morning = '早上好';
+    afternoon = '下午好';
+    evening = '晚上好';
   }
 
   return `${greetingPrefix} ${name}, ${greetingSuffix} ${greet}!`;