i18ntk 2.0.4 → 2.2.0

package/main/i18ntk-sizing.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 /**
  * I18n Sizing Analyzer
@@ -33,10 +33,12 @@
 
 const fs = require('fs');
 const path = require('path');
+const { performance } = require('perf_hooks');
 const { loadTranslations, t } = require('../utils/i18n-helper');
 const configManager = require('../settings/settings-manager');
 const SecurityUtils = require('../utils/security');
 const { getUnifiedConfig } = require('../utils/config-helper');
+const { logger } = require('../utils/logger');
 const { getGlobalReadline, closeGlobalReadline } = require('../utils/cli');
 const SetupEnforcer = require('../utils/setup-enforcer');
 
@@ -83,7 +85,7 @@ class I18nSizingAnalyzer {
     
     // Initialize i18n with UI language from config
     const uiLanguage = options.uiLanguage || config.uiLanguage || 'en';
-    loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));
+    loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'ui-locales'));
     this.stats = {
       files: {},
       languages: {},
@@ -165,7 +167,7 @@ class I18nSizingAnalyzer {
 
   // Analyze file sizes
   analyzeFileSizes(files) {
-    SecurityUtils.debugLog('info', t("sizing.analyzing_file_sizes"));
+      logger.info(t("sizing.analyzing_file_sizes"));
     
     files.forEach(({ language, file, path: filePath, files: langFiles }) => {
       if (langFiles) {
@@ -220,7 +222,7 @@ class I18nSizingAnalyzer {
 
   // Analyze translation content
   analyzeTranslationContent(files) {
-    SecurityUtils.debugLog('info', t("sizing.analyzing_translation_content"));
+      logger.info(t("sizing.analyzing_translation_content"));
     
     files.forEach(({ language, path: filePath, files: langFiles }) => {
       try {
@@ -266,7 +268,7 @@ class I18nSizingAnalyzer {
         });
         
       } catch (error) {
-        SecurityUtils.debugLog('error', t("sizing.failed_to_parse_language_error", { language, errorMessage: error.message }));
+          logger.error(t("sizing.failed_to_parse_language_error", { language, errorMessage: error.message }));
       }
     });
   }
@@ -316,14 +318,14 @@ class I18nSizingAnalyzer {
 
   // Generate size comparison analysis
   generateSizeComparison() {
-    SecurityUtils.debugLog('info', t("sizing.generating_size_comparisons"));
+      logger.info(t("sizing.generating_size_comparisons"));
     
     const languages = Object.keys(this.stats.languages);
     const baseLanguage = languages[0]; // Use first language as baseline
     
     if (!baseLanguage) {
-      SecurityUtils.debugLog('warn', t("sizing.no_languages_found_for_comparison"));
-      return;
+        logger.warn(t("sizing.no_languages_found_for_comparison"));
+        return;
     }
     
     this.stats.summary = {
@@ -495,7 +497,7 @@ class I18nSizingAnalyzer {
   async generateHumanReadableReport() {
     if (!this.outputReport) return;
     
-    SecurityUtils.debugLog('info', t("sizing.generating_detailed_report"));
+    logger.info(t("sizing.generating_detailed_report"));
     
     const validatedOutputDir = SecurityUtils.validatePath(this.outputDir, process.cwd());
     if (!validatedOutputDir) {
@@ -518,7 +520,7 @@ class I18nSizingAnalyzer {
     let textReport = this.generateTextReport(timestamp);
     const textSuccess = await SecurityUtils.safeWriteFile(textReportPath, textReport, process.cwd());
     if (textSuccess) {
-      SecurityUtils.debugLog('info', t("sizing.human_report_saved", { reportPath: textReportPath }));
+        logger.info(t("sizing.human_report_saved", { reportPath: textReportPath }));
     }
     
     // Generate JSON for programmatic access
@@ -664,8 +666,8 @@ Generated: ${new Date().toISOString()}
     
     const success = await SecurityUtils.safeWriteFile(csvPath, csvContent, process.cwd());
     if (success) {
-      SecurityUtils.debugLog('info', t("sizing.csv_report_saved_to", { csvPath }));
-      SecurityUtils.logSecurityEvent('CSV report saved', 'info', { csvPath });
+        logger.info(t("sizing.csv_report_saved_to", { csvPath }));
+        SecurityUtils.logSecurityEvent('CSV report saved', 'info', { csvPath });
     } else {
       throw new Error(t("sizing.failedToSaveCsvError"));
     }
@@ -673,21 +675,20 @@ Generated: ${new Date().toISOString()}
 
   // Main analysis method
   async analyze() {
-    const perfTimer = SecurityUtils.getPerformanceTimer();
-    const startTime = perfTimer.now();
+    const startTime = performance.now();
     
     try {
-      SecurityUtils.debugLog('info', t("sizing.starting_i18n_sizing_analysis"));
-      SecurityUtils.debugLog('info', t("sizing.source_directory", { sourceDir: this.sourceDir }));
+        logger.info(t("sizing.starting_i18n_sizing_analysis"));
+        logger.info(t("sizing.source_directory", { sourceDir: this.sourceDir }));
       
       const files = this.getLanguageFiles();
       
       if (files.length === 0) {
-        SecurityUtils.debugLog('warn', t("sizing.no_translation_files_found"));
-        return;
+          logger.warn(t("sizing.no_translation_files_found"));
+          return;
       }
       
-      SecurityUtils.debugLog('info', t("sizing.found_languages", { languages: files.map(f => f.language).join(', ') }));
+      logger.info(t("sizing.found_languages", { languages: files.map(f => f.language).join(', ') }));
       
       this.analyzeFileSizes(files);
       this.analyzeTranslationContent(files);
@@ -696,17 +697,17 @@ Generated: ${new Date().toISOString()}
       if (this.format === 'table') {
         this.displayFolderResults();
       } else if (this.format === 'json') {
-        SecurityUtils.debugLog('info', t("sizing.analysisStats", { stats: JSON.stringify(this.stats, null, 2) }));
+          logger.info(t("sizing.analysisStats", { stats: JSON.stringify(this.stats, null, 2) }));
       }
       
       await this.generateHumanReadableReport();
       
-      const endTime = perfTimer.now();
-      SecurityUtils.debugLog('info', t("sizing.analysis_completed", { duration: (endTime - startTime).toFixed(2) }));
+      const endTime = performance.now();
+      logger.info(t("sizing.analysis_completed", { duration: (endTime - startTime).toFixed(2) }));
       
     } catch (error) {
-      SecurityUtils.debugLog('error', t("sizing.analysis_failed", { errorMessage: error.message }));
-      process.exit(1);
+        logger.error(t("sizing.analysis_failed", { errorMessage: error.message }));
+        process.exit(1);
     }
   }
 
@@ -906,20 +907,19 @@ Options:
   // Main analysis method
   async analyze() {
     try {
-      SecurityUtils.debugLog('info', t("sizing.starting_analysis"));
-      SecurityUtils.debugLog('info', t("sizing.source_directory", { sourceDir: this.sourceDir }));
+        logger.info(t("sizing.starting_analysis"));
+        logger.info(t("sizing.source_directory", { sourceDir: this.sourceDir }));
       
-      const perfTimer = SecurityUtils.getPerformanceTimer();
-      const startTime = perfTimer.now();
+      const startTime = performance.now();
       
       // Get language files
       const files = this.getLanguageFiles();
       if (files.length === 0) {
-        SecurityUtils.debugLog('warn', t("sizing.no_translation_files_found"));
-        return { success: false, error: "No translation files found" };
+          logger.warn(t("sizing.no_translation_files_found"));
+          return { success: false, error: "No translation files found" };
       }
       
-      SecurityUtils.debugLog('info', t("sizing.found_files", { count: files.length }));
+      logger.info(t("sizing.found_files", { count: files.length }));
       
       // Analyze file sizes
       this.analyzeFileSizes(files);
@@ -936,16 +936,16 @@ Options:
       // Generate reports if requested
       await this.generateHumanReadableReport();
       
-      const endTime = perfTimer.now();
+      const endTime = performance.now();
       const duration = ((endTime - startTime) / 1000).toFixed(2);
       
-      SecurityUtils.debugLog('info', t("sizing.analysis_completed", { duration }));
+      logger.info(t("sizing.analysis_completed", { duration }));
       
       return { success: true, stats: this.stats };
       
     } catch (error) {
-      SecurityUtils.debugLog('error', t("sizing.analysis_failed", { errorMessage: error.message }));
-      return { success: false, error: error.message };
+        logger.error(t("sizing.analysis_failed", { errorMessage: error.message }));
+        return { success: false, error: error.message };
     }
   }
 }

package/main/i18ntk-summary.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 const fs = require('fs');
 const path = require('path');
@@ -19,7 +19,7 @@ const SetupEnforcer = require('../utils/setup-enforcer');
   }
 })();
 
-loadTranslations( 'en', path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));
+loadTranslations('en', path.resolve(__dirname, '..', 'ui-locales'));
 
 
 class I18nSummaryReporter {
@@ -54,7 +54,7 @@ class I18nSummaryReporter {
       this.config = baseConfig;
 
       const uiLanguage = this.config.uiLanguage || 'en';
-      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));
+      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'ui-locales'));
 
       this.sourceDir = this.config.sourceDir;
 
@@ -831,7 +831,7 @@ class I18nSummaryReporter {
     this.config = { ...this.config, ...baseConfig };
     
     const uiLanguage = this.config.uiLanguage || 'en';
-    loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));
+    loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'ui-locales'));
     if (!this.config.sourceDir) {
       this.config.sourceDir = this.detectI18nDirectory();
     }

package/main/i18ntk-ui.js

@@ -15,7 +15,7 @@ class UIi18n {
     constructor() {
         this.currentLanguage = 'en';
 this.translations = {};
-        this.uiLocalesDir = path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales');
+        this.uiLocalesDir = this.resolveUiLocalesDir();
         this.availableLanguages = [];
         this.configFile = path.resolve(configManager.configFile);
         
@@ -30,7 +30,7 @@ this.translations = {};
             const config = configManager.loadSettings ? configManager.loadSettings() : configManager.getConfig ? configManager.getConfig() : {};
             
             // Use safe defaults if config is not available
-            this.uiLocalesDir = path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales');
+            this.uiLocalesDir = this.resolveUiLocalesDir();
             this.availableLanguages = this.detectAvailableLanguages();
             
 
@@ -44,11 +44,56 @@ this.translations = {};
             }
         } catch (error) {
             console.warn('UIi18n: Failed to initialize with config, using defaults:', error.message);
-            this.uiLocalesDir = path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales');
+            this.uiLocalesDir = this.resolveUiLocalesDir();
             this.availableLanguages = this.detectAvailableLanguages();
             this.loadLanguage('en');
         }
     }
+
+    getValidationBase(targetPath) {
+        const fallbackBase = path.resolve(__dirname, '..');
+        if (!targetPath || typeof targetPath !== 'string') {
+            return fallbackBase;
+        }
+
+        let current = path.resolve(path.dirname(targetPath));
+        while (true) {
+            try {
+                if (fs.statSync(current).isDirectory()) {
+                    return current;
+                }
+            } catch (_) {
+                // Continue walking up until an existing directory is found.
+            }
+
+            const parent = path.dirname(current);
+            if (parent === current) {
+                break;
+            }
+            current = parent;
+        }
+
+        return fallbackBase;
+    }
+
+    resolveUiLocalesDir() {
+        const candidates = [
+          path.resolve(__dirname, '..', 'ui-locales')
+        ];
+
+        for (const candidate of candidates) {
+            try {
+                const stats = SecurityUtils.safeStatSync(candidate, this.getValidationBase(candidate));
+                if (stats && stats.isDirectory()) {
+                    return candidate;
+                }
+            } catch (_) {
+                // Try next candidate.
+            }
+        }
+
+        return candidates[0];
+    }
     /**
     /**
      * Detect which UI locales are currently installed
@@ -58,7 +103,7 @@ this.translations = {};
         const all = ['en', 'de', 'es', 'fr', 'ru', 'ja', 'zh'];
         return all.filter(lang => {
             const filePath = path.join(this.uiLocalesDir, `${lang}.json`);
-            return SecurityUtils.safeExistsSync(filePath);
+            return SecurityUtils.safeExistsSync(filePath, this.getValidationBase(filePath));
         });
     }
 
@@ -94,7 +139,7 @@ this.translations = {};
             // Primary: Use monolith JSON file (en.json, de.json, etc.)
             const monolithTranslationFile = path.join(this.uiLocalesDir, `${language}.json`);
             
-            if (SecurityUtils.safeExistsSync(monolithTranslationFile)) {
+            if (SecurityUtils.safeExistsSync(monolithTranslationFile, this.getValidationBase(monolithTranslationFile))) {
                 try {
                     const content = SecurityUtils.safeReadFileSync(monolithTranslationFile, path.dirname(monolithTranslationFile), 'utf8');
                     const fullTranslations = JSON.parse(content);
@@ -114,7 +159,8 @@ this.translations = {};
                 // Fallback: Use folder-based structure if monolith file doesn't exist
                 const langDir = path.join(this.uiLocalesDir, language);
                 
-                if (SecurityUtils.safeExistsSync(langDir) && fs.statSync(langDir).isDirectory()) {
+                const langDirStats = SecurityUtils.safeStatSync(langDir, this.getValidationBase(langDir));
+                if (langDirStats && langDirStats.isDirectory()) {
                     const files = fs.readdirSync(langDir).filter(file => file.endsWith('.json'));
                     if (debugEnabled) {
                         console.log(`UI: Found files in ${langDir}: ${files.join(', ')}`);
@@ -384,7 +430,7 @@ this.translations = {};
     getEnglishFallback(keyPath, replacements = {}) {
         try {
             const englishFile = path.join(this.uiLocalesDir, 'en.json');
-            if (SecurityUtils.safeExistsSync(englishFile)) {
+            if (SecurityUtils.safeExistsSync(englishFile, this.getValidationBase(englishFile))) {
                 const englishContent = SecurityUtils.safeReadFileSync(englishFile, path.dirname(englishFile), 'utf8');
                 const englishTranslations = JSON.parse(englishContent);
                 
@@ -523,4 +569,4 @@ this.translations = {};
 }
 
 // Export the class, not a singleton instance
-module.exports = UIi18n;
+module.exports = UIi18n;

package/main/i18ntk-usage.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 /**
  * I18NTK USAGE ANALYSIS TOOLKIT - Version 1.8.3
  * 
@@ -55,7 +55,7 @@ const SetupEnforcer = require('../utils/setup-enforcer');
   }
 })();
 
-loadTranslations( 'en', path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));
+loadTranslations('en', path.resolve(__dirname, '..', 'ui-locales'));
 
 async function getConfig() {
   return await getUnifiedConfig('usage');
@@ -120,7 +120,7 @@ class I18nUsageAnalyzer {
       
       // Load translations for UI
       const uiLanguage = (this.config && this.config.uiLanguage) || 'en';
-      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));
+      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'ui-locales'));
       const projectRoot = path.resolve(this.config.projectRoot || '.');
             const detected = detectFramework(projectRoot);
       if (detected) {
@@ -169,9 +169,9 @@ class I18nUsageAnalyzer {
         this.config.includeExtensions = ['.js', '.jsx', '.ts', '.tsx', '.py', '.pyx', '.pyi'];
       }
       
-      await SecurityUtils.logSecurityEvent(t('usage.analyzerInitialized'), { component: 'i18ntk-usage' });
+      await SecurityUtils.logSecurityEvent(t('usage.analyzerInitialized'), 'info', { component: 'i18ntk-usage' });
     } catch (error) {
-      await SecurityUtils.logSecurityEvent(t('usage.analyzerInitFailed'), { component: 'i18ntk-usage', error: error.message });
+      await SecurityUtils.logSecurityEvent(t('usage.analyzerInitFailed'), 'error', { component: 'i18ntk-usage', error: error.message });
       throw error;
     }
   }
@@ -276,7 +276,7 @@ class I18nUsageAnalyzer {
           }
         }
       } catch (error) {
-        await SecurityUtils.logSecurityEvent(t('usage.translationDiscoveryError'), { 
+        await SecurityUtils.logSecurityEvent(t('usage.translationDiscoveryError'), 'error', {
           component: 'i18ntk-usage', 
           directory: currentDir, 
           error: error.message 
@@ -350,7 +350,7 @@ class I18nUsageAnalyzer {
           }
         }
       } catch (error) {
-        await SecurityUtils.logSecurityEvent(t('usage.fileTraversalError'), { 
+        await SecurityUtils.logSecurityEvent(t('usage.fileTraversalError'), 'error', {
           component: 'i18ntk-usage', 
           directory: currentDir, 
           error: error.message 
@@ -393,7 +393,7 @@ class I18nUsageAnalyzer {
         this.config = { ...baseConfig, ...(this.config || {}) };
         
         const uiLanguage = (this.config && this.config.uiLanguage) || 'en';
-        loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));
+        loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'ui-locales'));
         if (!Array.isArray(this.config.translationPatterns)) {
           this.config.translationPatterns = [
             /t\(['"`]([^'"`]+)['"`]/g,
@@ -614,7 +614,7 @@ class I18nUsageAnalyzer {
     } catch (error) {
       console.error(t('usage.analysisFailedError'), error.message);
       this.closeReadline();
-      SecurityUtils.logSecurityEvent(t('usage.usageAnalysisFailed'), { 
+      SecurityUtils.logSecurityEvent(t('usage.usageAnalysisFailed'), 'error', {
         component: 'i18ntk-usage', 
         error: error.message 
       });
@@ -740,7 +740,7 @@ Analysis Features (v1.8.3):
           if (isDebug) {
             console.error(error.stack);
           }
-          await SecurityUtils.logSecurityEvent(t('usage.translationFileParseError'), {
+          await SecurityUtils.logSecurityEvent(t('usage.translationFileParseError'), 'error', {
             component: 'i18ntk-usage',
             file: fileInfo.filePath,
             error: error.message
@@ -748,7 +748,7 @@ Analysis Features (v1.8.3):
         }
       }
     } catch (error) {
-      await SecurityUtils.logSecurityEvent(t('usage.translationKeysLoadError'), {
+      await SecurityUtils.logSecurityEvent(t('usage.translationKeysLoadError'), 'error', {
         component: 'i18ntk-usage',
         error: error.message
       });
@@ -1543,7 +1543,7 @@ Analysis Features (v1.8.3):
         await this.initialize();
       }
       
-      await SecurityUtils.logSecurityEvent('analysis_started', { component: 'i18ntk-usage' });
+      await SecurityUtils.logSecurityEvent('analysis_started', 'info', { component: 'i18ntk-usage' });
       
       console.log(t('usage.checkUsage.title'));
       console.log(t("usage.checkUsage.message"));
@@ -1708,7 +1708,7 @@ Analysis Features (v1.8.3):
         outputLines.forEach(line => console.log(line));
       }
       
-      await SecurityUtils.logSecurityEvent('analysis_completed', {
+      await SecurityUtils.logSecurityEvent('analysis_completed', 'info', {
         component: 'i18ntk-usage',
         stats: {
           availableKeys: this.availableKeys.size,
@@ -1749,7 +1749,7 @@ Analysis Features (v1.8.3):
       console.error(t("checkUsage.usage_analysis_failed"));
       console.error(error.message);
       
-      await SecurityUtils.logSecurityEvent('analysis_failed', {
+      await SecurityUtils.logSecurityEvent('analysis_failed', 'error', {
         component: 'i18ntk-usage',
         error: error.message
       });

package/main/i18ntk-validate.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 /**
  * I18NTK TRANSLATION VALIDATION TOOLKIT
@@ -60,7 +60,7 @@ const SetupEnforcer = require('../utils/setup-enforcer');
   }
 })();
 
-loadTranslations( 'en', path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));
+loadTranslations('en', path.resolve(__dirname, '..', 'ui-locales'));
 
 class I18nValidator {
   constructor(config = {}) {
@@ -87,7 +87,7 @@ class I18nValidator {
       this.config = { ...baseConfig, ...(this.config || {}) };
       
       const uiLanguage = (this.config && this.config.uiLanguage) || 'en';
-      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));
+      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'ui-locales'));
       
       SecurityUtils.logSecurityEvent(
         'I18n validator initializing',
@@ -892,7 +892,8 @@ class I18nValidator {
       this.config = { ...baseConfig, ...(this.config || {}) };
       
       const uiLanguage = (this.config && this.config.uiLanguage) || 'en';
-      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));this.sourceDir = this.config.sourceDir;
+      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'ui-locales'));
+      this.sourceDir = this.config.sourceDir;
         this.sourceLanguageDir = path.join(this.sourceDir, this.config.sourceLanguage);
       } else {
         await this.initialize();
@@ -983,7 +984,7 @@ if (require.main === module) {
       // Initialize translations for CLI usage
       const config = configManager.getConfig();
       const uiLanguage = config.language || 'en';
-      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));
+      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'ui-locales'));
       
       SecurityUtils.logSecurityEvent(t('validate.scriptExecution'), 'info', {
         script: 'i18ntk-validate.js',

package/main/manage/commands/AnalyzeCommand.js

@@ -11,12 +11,12 @@ const path = require('path');
 const cliHelper = require('../../../utils/cli-helper');
 const { loadTranslations, t } = require('../../../utils/i18n-helper');
 const { getUnifiedConfig, parseCommonArgs, displayHelp } = require('../../../utils/config-helper');
-const SecurityUtils = require('../../../utils/security');
-const AdminCLI = require('../../../utils/admin-cli');
-const watchLocales = require('../../../utils/watch-locales');
-const JsonOutput = require('../../../utils/json-output');
-
-loadTranslations('en', path.resolve(__dirname, '../../../resources', 'i18n', 'ui-locales'));
+const SecurityUtils = require('../../../utils/security');
+const AdminCLI = require('../../../utils/admin-cli');
+const watchLocales = require('../../../utils/watch-locales');
+const JsonOutput = require('../../../utils/json-output');
+
+loadTranslations('en', path.resolve(__dirname, '../../../ui-locales'));
 
 const PROJECT_ROOT = process.cwd();
 
@@ -74,7 +74,7 @@ class AnalyzeCommand {
             this.config = { ...baseConfig, ...(this.config || {}) };
 
             const uiLanguage = (this.config && this.config.uiLanguage) || 'en';
-            loadTranslations(uiLanguage, path.resolve(__dirname, '../../../resources', 'i18n', 'ui-locales'));
+            loadTranslations(uiLanguage, path.resolve(__dirname, '../../../ui-locales'));
 
             this.sourceDir = this.config.sourceDir;
             this.sourceLanguageDir = path.join(this.sourceDir, this.config.sourceLanguage);
@@ -150,6 +150,17 @@ class AnalyzeCommand {
     }
 
     // Get all available languages
+    isValidLanguageCode(code) {
+        if (!code || typeof code !== 'string') return false;
+        return /^[a-z]{2}(?:-[A-Za-z0-9]{2,8})*$/i.test(code.trim());
+    }
+
+    isExcludedLanguageDirectory(name) {
+        if (!name || typeof name !== 'string') return true;
+        const lowered = name.toLowerCase();
+        return lowered.startsWith('backup-') || lowered === 'backup' || lowered === 'reports' || lowered === 'i18ntk-reports';
+    }
+
     getAvailableLanguages() {
         try {
             const items = SecurityUtils.safeReaddirSync(this.sourceDir, process.cwd(), { withFileTypes: true });
@@ -164,7 +175,18 @@ class AnalyzeCommand {
             const directories = items
                 .filter(item => item.isDirectory())
                 .map(item => item.name)
-                .filter(name => name !== 'node_modules' && !name.startsWith('.') && name !== this.config.sourceLanguage);
+                .filter(name =>
+                    name !== 'node_modules' &&
+                    !name.startsWith('.') &&
+                    name !== this.config.sourceLanguage &&
+                    !this.isExcludedLanguageDirectory(name) &&
+                    this.isValidLanguageCode(name)
+                )
+                .filter(name => {
+                    const dirPath = path.join(this.sourceDir, name);
+                    const dirItems = SecurityUtils.safeReaddirSync(dirPath, process.cwd(), { withFileTypes: true }) || [];
+                    return dirItems.some(item => item.isFile() && item.name.endsWith('.json'));
+                });
 
             // Check for monolith files (language.json files)
             const files = items
@@ -177,31 +199,14 @@ class AnalyzeCommand {
             // Add monolith files as languages (without .json extension)
             const monolithLanguages = files
                 .map(file => file.replace('.json', ''))
-                .filter(lang => !languages.includes(lang) && lang !== this.config.sourceLanguage);
+                .filter(lang =>
+                    !languages.includes(lang) &&
+                    lang !== this.config.sourceLanguage &&
+                    !this.isExcludedLanguageDirectory(lang) &&
+                    this.isValidLanguageCode(lang)
+                );
             languages.push(...monolithLanguages);
 
-            // Check for nested structures
-            for (const dir of directories) {
-                const dirPath = path.join(this.sourceDir, dir);
-                try {
-                    const dirItems = SecurityUtils.safeReaddirSync(dirPath, process.cwd(), { withFileTypes: true });
-                    if (dirItems) {
-                        const jsonFiles = dirItems
-                            .filter(item => item.isFile() && item.name.endsWith('.json'))
-                            .map(item => item.name.replace('.json', ''));
-
-                        // If directory contains JSON files, it's likely a language directory
-                        if (jsonFiles.length > 0) {
-                            if (!languages.includes(dir)) {
-                                languages.push(dir);
-                            }
-                        }
-                    }
-                } catch (error) {
-                    // Skip directories we can't read
-                }
-            }
-
             return [...new Set(languages)].sort();
         } catch (error) {
             console.error('Error reading source directory:', error.message);
@@ -714,7 +719,6 @@ class AnalyzeCommand {
                 throw new Error(t('analyze.failedToWriteReportFile') || 'Failed to write report file securely');
             }
 
-            console.log(`Report saved to: ${reportPath}`);
             return reportPath;
 
         } catch (error) {
@@ -787,13 +791,14 @@ class AnalyzeCommand {
 
                 // Save report
                 const reportPath = await this.saveReport(language, report);
+                const processedCount = results.length + 1;
 
                 if (!args.json) {
                     console.log(t('analyze.completed', { language }) || `✅ Analysis completed for ${language}`);
                     console.log(t('analyze.progress', {
-                        translated: results.length,
+                        translated: processedCount,
                         total: languages.length
-                    }) || `   Progress: ${results.length}/${languages.length} languages processed`);
+                    }) || `   Progress: ${processedCount}/${languages.length} languages processed`);
                     console.log(t('analyze.reportSaved', { reportPath }) || `   Report saved: ${reportPath}`);
                 }
 
@@ -891,7 +896,7 @@ class AnalyzeCommand {
                 this.config = { ...baseConfig, ...this.config };
 
                 const uiLanguage = this.config.uiLanguage || 'en';
-                loadTranslations(uiLanguage, path.resolve(__dirname, '../../../resources', 'i18n', 'ui-locales'));
+                loadTranslations(uiLanguage, path.resolve(__dirname, '../../../ui-locales'));
 
                 this.sourceDir = this.config.sourceDir;
                 this.sourceLanguageDir = path.join(this.sourceDir, this.config.sourceLanguage);

package/main/manage/commands/FixerCommand.js

@@ -64,7 +64,7 @@ class FixerCommand {
             this.config = { ...baseConfig, ...(this.config || {}) };
 
             const uiLanguage = (this.config && this.config.uiLanguage) || 'en';
-            loadTranslations(uiLanguage, path.resolve(__dirname, '../../../resources', 'i18n', 'ui-locales'));
+            loadTranslations(uiLanguage, path.resolve(__dirname, '../../../ui-locales'));
 
             this.sourceDir = this.config.sourceDir;
             this.outputDir = this.config.outputDir;
@@ -567,7 +567,7 @@ class FixerCommand {
                 this.config = { ...baseConfig, ...this.config };
 
                 const uiLanguage = this.config.uiLanguage || 'en';
-                loadTranslations(uiLanguage, path.resolve(__dirname, '../../../resources', 'i18n', 'ui-locales'));
+                loadTranslations(uiLanguage, path.resolve(__dirname, '../../../ui-locales'));
 
                 this.sourceDir = this.config.sourceDir;
                 this.outputDir = this.config.outputDir;