Add PluralForm tracking and SourceText restoration to sync history

- Add PluralForm field to SyncChangeEntry for tracking plural form changes
- Update SyncHistoryService.RevertToAsync to restore SourceText/SourcePluralText
- Include PluralForm in change entries for KeySyncService and ResourceService
- Backward compatible: old history entries default to empty PluralForm

Author: nickprotop

cloud/src/LrmCloud.Api/Services/KeySyncService.cs

@@ -104,11 +104,12 @@ public async Task<KeySyncPushResponse> PushAsync(
                     }
                     response.NewEntryHashes[entry.Key][entry.Lang] = result.NewHash!;
 
-                    // Track change for history
+                    // Track change for history (PluralForm = "" for non-plural entries)
                     historyChanges.Add(new Entities.SyncChangeEntry
                     {
                         Key = entry.Key,
                         Lang = entry.Lang,
+                        PluralForm = "",
                         ChangeType = result.WasNew ? "added" : "modified",
                         BeforeValue = result.BeforeValue,
                         BeforeHash = result.BeforeHash,
@@ -133,11 +134,12 @@ public async Task<KeySyncPushResponse> PushAsync(
                 {
                     response.Deleted++;
 
-                    // Track deletion for history
+                    // Track deletion for history (PluralForm = "" for non-plural entries)
                     historyChanges.Add(new Entities.SyncChangeEntry
                     {
                         Key = deletion.Key,
                         Lang = deletion.Lang ?? result.DeletedLang ?? "all",
+                        PluralForm = "",
                         ChangeType = "deleted",
                         BeforeValue = result.DeletedValue,
                         BeforeHash = result.DeletedHash,
@@ -256,6 +258,7 @@ public async Task<KeySyncPullResponse> PullAsync(
                 Key = key.KeyName,
                 Comment = key.Comment,
                 IsPlural = key.IsPlural,
+                SourceText = key.SourceText,
                 SourcePluralText = key.SourcePluralText
             };
 
@@ -404,6 +407,8 @@ private async Task<EntryChangeResult> ApplyEntryChangeAsync(
                 KeyName = entry.Key,
                 IsPlural = entry.IsPlural,
                 Comment = entry.Comment,
+                // Store source text (from default language file, msgid for PO format)
+                SourceText = entry.SourceText,
                 // For plural keys, store source plural text (PO msgid_plural or "other" form)
                 SourcePluralText = entry.IsPlural ? entry.SourcePluralText : null,
                 Version = 1,
@@ -425,8 +430,14 @@ private async Task<EntryChangeResult> ApplyEntryChangeAsync(
                 resourceKey.IsPlural = entry.IsPlural;
                 resourceKey.UpdatedAt = DateTime.UtcNow;
             }
-            // Update SourcePluralText if not set yet
-            if (entry.IsPlural && resourceKey.SourcePluralText == null && entry.SourcePluralText != null)
+            // Update SourceText if provided (from source/default language push)
+            if (!string.IsNullOrEmpty(entry.SourceText) && resourceKey.SourceText != entry.SourceText)
+            {
+                resourceKey.SourceText = entry.SourceText;
+                resourceKey.UpdatedAt = DateTime.UtcNow;
+            }
+            // Update SourcePluralText if provided
+            if (entry.IsPlural && !string.IsNullOrEmpty(entry.SourcePluralText) && resourceKey.SourcePluralText != entry.SourcePluralText)
             {
                 resourceKey.SourcePluralText = entry.SourcePluralText;
                 resourceKey.UpdatedAt = DateTime.UtcNow;
@@ -771,6 +782,7 @@ private async Task ApplyEntryResolutionAsync(
     {
         var resourceKey = await _db.ResourceKeys
             .Include(k => k.Translations)
+            .Include(k => k.Project)
             .FirstOrDefaultAsync(k => k.ProjectId == projectId && k.KeyName == resolution.Key, ct);
 
         if (resourceKey == null)
@@ -781,6 +793,9 @@ private async Task ApplyEntryResolutionAsync(
         var translation = resourceKey.Translations
             .FirstOrDefault(t => t.LanguageCode == resolution.Lang && t.PluralForm == "");
 
+        // Check if this is the default language for SourceText updates
+        var isDefaultLanguage = resourceKey.Project?.DefaultLanguage == resolution.Lang;
+
         switch (resolution.Resolution)
         {
             case "Local":
@@ -793,6 +808,13 @@ private async Task ApplyEntryResolutionAsync(
                     translation.UpdatedAt = DateTime.UtcNow;
                     response.Applied++;
 
+                    // Update SourceText if this is the default language
+                    if (isDefaultLanguage)
+                    {
+                        resourceKey.SourceText = resolution.EditedValue;
+                        resourceKey.UpdatedAt = DateTime.UtcNow;
+                    }
+
                     AddToHashes(response.NewHashes, resolution.Key, resolution.Lang!, translation.Hash);
                 }
                 break;
@@ -833,6 +855,14 @@ private async Task ApplyEntryResolutionAsync(
                         translation.Version++;
                         translation.UpdatedAt = DateTime.UtcNow;
                     }
+
+                    // Update SourceText if this is the default language
+                    if (isDefaultLanguage)
+                    {
+                        resourceKey.SourceText = resolution.EditedValue;
+                        resourceKey.UpdatedAt = DateTime.UtcNow;
+                    }
+
                     response.Applied++;
                     AddToHashes(response.NewHashes, resolution.Key, resolution.Lang!, translation.Hash!);
                 }

cloud/src/LrmCloud.Api/Services/ResourceService.cs

@@ -297,6 +297,8 @@ private IQueryable<ResourceKey> ApplySingleLanguageFilter(IQueryable<ResourceKey
                 KeyPath = request.KeyPath,
                 IsPlural = request.IsPlural,
                 Comment = request.Comment,
+                // Store the default language value as SourceText for translation reference
+                SourceText = request.DefaultLanguageValue,
                 Version = 1,
                 CreatedAt = DateTime.UtcNow,
                 UpdatedAt = DateTime.UtcNow
@@ -467,6 +469,10 @@ private IQueryable<ResourceKey> ApplySingleLanguageFilter(IQueryable<ResourceKey
             var translation = resourceKey.Translations
                 .FirstOrDefault(t => t.LanguageCode == languageCode && t.PluralForm == request.PluralForm);
 
+            // Get project to check if we're updating the default language
+            var project = await _db.Projects.FindAsync(projectId);
+            var isDefaultLanguage = project != null && languageCode == project.DefaultLanguage;
+
             if (translation == null)
             {
                 // Create new translation
@@ -483,6 +489,18 @@ private IQueryable<ResourceKey> ApplySingleLanguageFilter(IQueryable<ResourceKey
                 };
 
                 _db.Translations.Add(translation);
+
+                // If creating translation for default language, also update SourceText
+                if (isDefaultLanguage && string.IsNullOrEmpty(request.PluralForm))
+                {
+                    resourceKey.SourceText = request.Value;
+                    resourceKey.UpdatedAt = DateTime.UtcNow;
+                }
+                else if (isDefaultLanguage && request.PluralForm == "other")
+                {
+                    resourceKey.SourcePluralText = request.Value;
+                    resourceKey.UpdatedAt = DateTime.UtcNow;
+                }
             }
             else
             {
@@ -498,6 +516,18 @@ private IQueryable<ResourceKey> ApplySingleLanguageFilter(IQueryable<ResourceKey
                 translation.Comment = request.Comment;
                 translation.UpdatedAt = DateTime.UtcNow;
                 translation.Version++;
+
+                // If updating the default language, also update SourceText
+                if (isDefaultLanguage && string.IsNullOrEmpty(request.PluralForm))
+                {
+                    resourceKey.SourceText = request.Value;
+                    resourceKey.UpdatedAt = DateTime.UtcNow;
+                }
+                else if (isDefaultLanguage && request.PluralForm == "other")
+                {
+                    resourceKey.SourcePluralText = request.Value;
+                    resourceKey.UpdatedAt = DateTime.UtcNow;
+                }
             }
 
             await _db.SaveChangesAsync();
@@ -529,6 +559,10 @@ private IQueryable<ResourceKey> ApplySingleLanguageFilter(IQueryable<ResourceKey
                 return (false, 0, "You don't have permission to manage resources in this project");
             }
 
+            // Get project to check if we're updating the default language
+            var project = await _db.Projects.FindAsync(projectId);
+            var isDefaultLanguage = project != null && languageCode == project.DefaultLanguage;
+
             var updatedCount = 0;
 
             foreach (var update in updates)
@@ -578,6 +612,18 @@ private IQueryable<ResourceKey> ApplySingleLanguageFilter(IQueryable<ResourceKey
                     translation.Version++;
                 }
 
+                // If updating the default language, also update SourceText
+                if (isDefaultLanguage && string.IsNullOrEmpty(update.PluralForm))
+                {
+                    resourceKey.SourceText = update.Value;
+                    resourceKey.UpdatedAt = DateTime.UtcNow;
+                }
+                else if (isDefaultLanguage && update.PluralForm == "other")
+                {
+                    resourceKey.SourcePluralText = update.Value;
+                    resourceKey.UpdatedAt = DateTime.UtcNow;
+                }
+
                 updatedCount++;
             }
 
@@ -1023,6 +1069,7 @@ private ResourceKeyDto MapToResourceKeyDto(ResourceKey key)
             KeyName = key.KeyName,
             KeyPath = key.KeyPath,
             IsPlural = key.IsPlural,
+            SourceText = key.SourceText,
             SourcePluralText = key.SourcePluralText,
             Comment = key.Comment,
             Version = key.Version,
@@ -1039,19 +1086,47 @@ private ResourceKeyDetailDto MapToResourceKeyDetailDto(ResourceKey key)
 
     private ResourceKeyDetailDto MapToResourceKeyDetailDto(ResourceKey key, string? defaultLanguage)
     {
+        var translations = key.Translations.Select(t => MapToTranslationDto(t, defaultLanguage)).ToList();
+
+        // Add virtual translation for source language display if SourceText exists
+        // but no translation exists for the default language (or empty LanguageCode)
+        if (!string.IsNullOrEmpty(defaultLanguage) && !string.IsNullOrEmpty(key.SourceText) && !key.IsPlural)
+        {
+            var hasDefaultLangTranslation = key.Translations.Any(t =>
+                (t.LanguageCode == defaultLanguage || string.IsNullOrEmpty(t.LanguageCode))
+                && string.IsNullOrEmpty(t.PluralForm));
+
+            if (!hasDefaultLangTranslation)
+            {
+                // Insert virtual source translation for grid display
+                translations.Insert(0, new TranslationDto
+                {
+                    Id = 0,
+                    LanguageCode = defaultLanguage,
+                    Value = key.SourceText,
+                    PluralForm = "",
+                    Status = "source",
+                    Version = 0,
+                    UpdatedAt = key.UpdatedAt,
+                    IsVirtual = true
+                });
+            }
+        }
+
         return new ResourceKeyDetailDto
         {
             Id = key.Id,
             KeyName = key.KeyName,
             KeyPath = key.KeyPath,
             IsPlural = key.IsPlural,
+            SourceText = key.SourceText,
             SourcePluralText = key.SourcePluralText,
             Comment = key.Comment,
             Version = key.Version,
             TranslationCount = key.Translations.Count,
             CreatedAt = key.CreatedAt,
             UpdatedAt = key.UpdatedAt,
-            Translations = key.Translations.Select(t => MapToTranslationDto(t, defaultLanguage)).ToList()
+            Translations = translations
         };
     }
 
@@ -1371,6 +1446,9 @@ public async Task<BatchSaveResponse> BatchSaveWithHistoryAsync(
         var response = new BatchSaveResponse();
         var changes = new List<SyncChangeEntry>();
 
+        // Get project to check default language for SourceText updates
+        var project = await _db.Projects.FindAsync(projectId);
+
         await using var transaction = await _db.Database.BeginTransactionAsync();
 
         try
@@ -1402,6 +1480,7 @@ public async Task<BatchSaveResponse> BatchSaveWithHistoryAsync(
                     {
                         Key = keyChange.KeyName,
                         Lang = "",
+                        PluralForm = "",
                         ChangeType = "modified",
                         BeforeComment = beforeComment,
                         AfterComment = keyChange.Comment
@@ -1483,13 +1562,29 @@ public async Task<BatchSaveResponse> BatchSaveWithHistoryAsync(
                     translation.Version++;
                 }
 
+                // If updating the default language, also update SourceText on ResourceKey
+                if (project != null && translationChange.LanguageCode == project.DefaultLanguage)
+                {
+                    if (string.IsNullOrEmpty(pluralForm))
+                    {
+                        resourceKey.SourceText = translation.Value;
+                        resourceKey.UpdatedAt = DateTime.UtcNow;
+                    }
+                    else if (pluralForm == "other")
+                    {
+                        resourceKey.SourcePluralText = translation.Value;
+                        resourceKey.UpdatedAt = DateTime.UtcNow;
+                    }
+                }
+
                 response.TranslationsModified++;
 
                 // Record the change
                 changes.Add(new SyncChangeEntry
                 {
                     Key = translationChange.KeyName,
                     Lang = translationChange.LanguageCode,
+                    PluralForm = pluralForm,
                     ChangeType = changeType,
                     BeforeValue = beforeValue,
                     AfterValue = translation.Value,