Add SourcePluralText support to cloud platform

nickprotop · nickprotop · commit 8033e1ef4818 · 2025-12-29T09:38:30.000+02:00
- Add source_plural_text column to ResourceKey entity with EF migration
- Add SourcePluralText to ResourceKeyDto and sync DTOs (EntryChangeDto, EntryDataDto)
- Update FileImportService to extract SourcePluralText from PO msgid_plural
- Update FileExportService to include SourcePluralText for round-trip export
- Update GitHubPullService to store SourcePluralText when syncing from GitHub
- Update KeySyncService to handle SourcePluralText in CLI push/pull sync
- Update ResourceService DTO mappings to include SourcePluralText
- Update editor UI to display source plural text in KeyDetailDrawer and KeyEditorDialog
- Update Editor.razor to populate SourcePluralText in TranslationGridRow
diff --git a/cloud/src/LrmCloud.Api/Data/Migrations/20251229072700_AddSourcePluralTextToResourceKey.Designer.cs b/cloud/src/LrmCloud.Api/Data/Migrations/20251229072700_AddSourcePluralTextToResourceKey.Designer.cs
diff --git a/cloud/src/LrmCloud.Api/Data/Migrations/20251229072700_AddSourcePluralTextToResourceKey.cs b/cloud/src/LrmCloud.Api/Data/Migrations/20251229072700_AddSourcePluralTextToResourceKey.cs
@@ -0,0 +1,28 @@
+﻿using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace LrmCloud.Api.Data.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddSourcePluralTextToResourceKey : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "source_plural_text",
+                table: "resource_keys",
+                type: "text",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "source_plural_text",
+                table: "resource_keys");
+        }
+    }
+}
diff --git a/cloud/src/LrmCloud.Api/Data/Migrations/AppDbContextModelSnapshot.cs b/cloud/src/LrmCloud.Api/Data/Migrations/AppDbContextModelSnapshot.cs
@@ -1201,6 +1201,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("project_id");
 
+                    b.Property<string>("SourcePluralText")
+                        .HasColumnType("text")
+                        .HasColumnName("source_plural_text");
+
                     b.Property<DateTime>("UpdatedAt")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("updated_at");
diff --git a/cloud/src/LrmCloud.Api/Services/FileExportService.cs b/cloud/src/LrmCloud.Api/Services/FileExportService.cs
@@ -2,7 +2,9 @@
 using LocalizationManager.Core.Backends.Android;
 using LocalizationManager.Core.Backends.iOS;
 using LocalizationManager.Core.Backends.Json;
+using LocalizationManager.Core.Backends.Po;
 using LocalizationManager.Core.Backends.Resx;
+using LocalizationManager.Core.Backends.Xliff;
 using LocalizationManager.Core.Configuration;
 using LocalizationManager.Core.Models;
 using LrmCloud.Api.Data;
@@ -151,7 +153,10 @@ private static ResourceFile BuildResourceFile(
                     Value = pluralForms.GetValueOrDefault("other", ""),
                     Comment = key.Comment,
                     IsPlural = true,
-                    PluralForms = pluralForms
+                    PluralForms = pluralForms,
+                    // For PO format: SourcePluralText is msgid_plural
+                    // For other formats: this is the "other" plural form from source language
+                    SourcePluralText = key.SourcePluralText
                 });
             }
             else
@@ -192,6 +197,8 @@ private static IResourceWriter GetWriter(string format)
             "i18next" => new JsonResourceWriter(new JsonFormatConfiguration { I18nextCompatible = true }),
             "android" => new AndroidResourceWriter(),
             "ios" => new IosResourceWriter(),
+            "po" or "gettext" => new PoResourceWriter(),
+            "xliff" or "xlf" => new XliffResourceWriter(),
             _ => throw new NotSupportedException($"Format '{format}' is not supported for export")
         };
     }
@@ -235,6 +242,16 @@ private static string GetFilePath(string basePath, string format, string languag
             // iOS: {basePath}/{lang}.lproj/Localizable.strings
             "ios" => $"{basePath}/{IosCultureMapper.CodeToLproj(hasLanguageCode ? languageCode : "Base")}/Localizable.strings",
 
+            // PO: {basePath}/messages.pot for default, {basePath}/{lang}.po for translations
+            "po" or "gettext" => useDefaultPath
+                ? $"{basePath}/messages.pot"
+                : $"{basePath}/{languageCode}.po",
+
+            // XLIFF: {basePath}/messages.xliff for default, {basePath}/messages.{lang}.xliff for translations
+            "xliff" or "xlf" => useDefaultPath
+                ? $"{basePath}/messages.xliff"
+                : $"{basePath}/messages.{languageCode}.xliff",
+
             _ => throw new NotSupportedException($"Format '{format}' is not supported")
         };
     }
diff --git a/cloud/src/LrmCloud.Api/Services/FileImportService.cs b/cloud/src/LrmCloud.Api/Services/FileImportService.cs
@@ -2,7 +2,9 @@
 using LocalizationManager.Core.Backends.Android;
 using LocalizationManager.Core.Backends.iOS;
 using LocalizationManager.Core.Backends.Json;
+using LocalizationManager.Core.Backends.Po;
 using LocalizationManager.Core.Backends.Resx;
+using LocalizationManager.Core.Backends.Xliff;
 using LocalizationManager.Core.Cloud;
 using LocalizationManager.Core.Configuration;
 using LocalizationManager.Core.Models;
@@ -67,6 +69,9 @@ public ParsedResourceFile ParseFile(
                         Comment = entry.Comment,
                         IsPlural = true,
                         PluralForms = entry.PluralForms,
+                        // For PO: SourcePluralText is msgid_plural
+                        // For other formats: use "other" form from source language
+                        SourcePluralText = entry.SourcePluralText ?? entry.PluralForms.GetValueOrDefault("other"),
                         Hash = pluralHash
                     });
                 }
@@ -207,6 +212,8 @@ private void ParseIosFilesWithPlurals(
                             Comment = null,
                             IsPlural = true,
                             PluralForms = entry.PluralForms,
+                            // iOS stringsdict: use "other" form as source plural text
+                            SourcePluralText = entry.PluralForms.GetValueOrDefault("other"),
                             Hash = pluralHash
                         };
                     }
@@ -247,6 +254,8 @@ private void ParseIosFilesWithPlurals(
             "i18next" => DetectI18nextLanguage(fileName, defaultLanguage),
             "android" => DetectAndroidLanguage(dirName, defaultLanguage),
             "ios" => DetectIosLanguage(dirName, defaultLanguage),
+            "po" or "gettext" => DetectPoLanguage(filePath, defaultLanguage),
+            "xliff" or "xlf" => DetectXliffLanguage(filePath, defaultLanguage),
             _ => throw new NotSupportedException($"Format '{format}' is not supported for import")
         };
     }
@@ -373,6 +382,74 @@ private static (string languageCode, bool isDefault) DetectIosLanguage(string di
         return (normalizedDefault, true);
     }
 
+    /// <summary>
+    /// Detects language from PO file path.
+    /// locale/fr/LC_MESSAGES/messages.po → fr
+    /// po/fr.po → fr
+    /// messages.pot → default (template)
+    /// </summary>
+    private static (string languageCode, bool isDefault) DetectPoLanguage(string filePath, string defaultLanguage)
+    {
+        var normalizedDefault = NormalizeLanguageCode(defaultLanguage);
+        var fileName = Path.GetFileName(filePath);
+
+        // POT files are templates (default language)
+        if (fileName.EndsWith(".pot", StringComparison.OrdinalIgnoreCase))
+            return (normalizedDefault, true);
+
+        // Check for GNU gettext structure: locale/{lang}/LC_MESSAGES/...
+        var parts = filePath.Replace("\\", "/").Split('/');
+        for (int i = 0; i < parts.Length - 1; i++)
+        {
+            if (parts[i].Equals("locale", StringComparison.OrdinalIgnoreCase) ||
+                parts[i].Equals("locales", StringComparison.OrdinalIgnoreCase))
+            {
+                if (i + 1 < parts.Length)
+                {
+                    var lang = NormalizeLanguageCode(parts[i + 1]);
+                    return (lang, lang.Equals(normalizedDefault, StringComparison.Ordinal));
+                }
+            }
+        }
+
+        // Check for flat structure: {lang}.po
+        var langFromFileName = Path.GetFileNameWithoutExtension(fileName);
+        if (!string.IsNullOrEmpty(langFromFileName) && langFromFileName.Length <= 5)
+        {
+            var lang = NormalizeLanguageCode(langFromFileName);
+            return (lang, lang.Equals(normalizedDefault, StringComparison.Ordinal));
+        }
+
+        return (normalizedDefault, true);
+    }
+
+    /// <summary>
+    /// Detects language from XLIFF file path or content.
+    /// messages.fr.xliff → fr
+    /// Extracts trgLang/target-language from content if available.
+    /// </summary>
+    private static (string languageCode, bool isDefault) DetectXliffLanguage(string filePath, string defaultLanguage)
+    {
+        var normalizedDefault = NormalizeLanguageCode(defaultLanguage);
+        var fileName = Path.GetFileName(filePath);
+        var nameWithoutExt = Path.GetFileNameWithoutExtension(fileName);
+
+        // Check for language code in filename: messages.fr.xliff or messages.fr.xlf
+        var parts = nameWithoutExt.Split('.');
+        if (parts.Length >= 2)
+        {
+            var possibleLang = parts[^1]; // Last part before extension
+            if (possibleLang.Length <= 5) // Reasonable language code length
+            {
+                var lang = NormalizeLanguageCode(possibleLang);
+                return (lang, lang.Equals(normalizedDefault, StringComparison.Ordinal));
+            }
+        }
+
+        // Default to project default language
+        return (normalizedDefault, true);
+    }
+
     /// <summary>
     /// Gets the appropriate reader for the format.
     /// </summary>
@@ -385,6 +462,8 @@ private static IResourceReader GetReader(string format)
             "i18next" => new JsonResourceReader(new JsonFormatConfiguration { I18nextCompatible = true }),
             "android" => new AndroidResourceReader(),
             "ios" => new IosResourceReader(),
+            "po" or "gettext" => new PoResourceReader(),
+            "xliff" or "xlf" => new XliffResourceReader(),
             _ => throw new NotSupportedException($"Format '{format}' is not supported for import")
         };
     }
diff --git a/cloud/src/LrmCloud.Api/Services/GitHubPullService.cs b/cloud/src/LrmCloud.Api/Services/GitHubPullService.cs
@@ -30,7 +30,11 @@ public class GitHubPullService : IGitHubPullService
         ["json"] = new[] { ".json" },
         ["i18next"] = new[] { ".json" },
         ["android"] = new[] { "strings.xml" },
-        ["ios"] = new[] { "Localizable.strings", "Localizable.stringsdict" }
+        ["ios"] = new[] { "Localizable.strings", "Localizable.stringsdict" },
+        ["po"] = new[] { ".po", ".pot" },
+        ["gettext"] = new[] { ".po", ".pot" },
+        ["xliff"] = new[] { ".xliff", ".xlf" },
+        ["xlf"] = new[] { ".xliff", ".xlf" }
     };
 
     public GitHubPullService(
@@ -703,11 +707,18 @@ private async Task ApplyChangesAsync(int projectId, MergeResult result, int user
                     ProjectId = projectId,
                     KeyName = entry.Key,
                     IsPlural = entry.IsPlural,
-                    Comment = entry.Comment
+                    Comment = entry.Comment,
+                    // For plural keys, store the source plural text (PO msgid_plural or "other" form)
+                    SourcePluralText = entry.IsPlural ? entry.SourcePluralText : null
                 };
                 _db.ResourceKeys.Add(key);
                 await _db.SaveChangesAsync();
             }
+            else if (entry.IsPlural && key.SourcePluralText == null && entry.SourcePluralText != null)
+            {
+                // Update SourcePluralText if not set yet
+                key.SourcePluralText = entry.SourcePluralText;
+            }
 
             // Upsert translation with "pending" status
             await UpsertTranslationAsync(
diff --git a/cloud/src/LrmCloud.Api/Services/IFileImportService.cs b/cloud/src/LrmCloud.Api/Services/IFileImportService.cs
@@ -12,6 +12,10 @@ public class GitHubEntry
     public string? Comment { get; init; }
     public bool IsPlural { get; init; }
     public Dictionary<string, string>? PluralForms { get; init; }
+    /// <summary>
+    /// For plural keys, the source plural text pattern (PO msgid_plural or "other" form).
+    /// </summary>
+    public string? SourcePluralText { get; init; }
     public required string Hash { get; init; }
 }
 
diff --git a/cloud/src/LrmCloud.Api/Services/KeySyncService.cs b/cloud/src/LrmCloud.Api/Services/KeySyncService.cs
@@ -234,7 +234,8 @@ public async Task<KeySyncPullResponse> PullAsync(
             {
                 Key = key.KeyName,
                 Comment = key.Comment,
-                IsPlural = key.IsPlural
+                IsPlural = key.IsPlural,
+                SourcePluralText = key.SourcePluralText
             };
 
             if (key.IsPlural)
@@ -381,6 +382,8 @@ private async Task<EntryChangeResult> ApplyEntryChangeAsync(
                 KeyName = entry.Key,
                 IsPlural = entry.IsPlural,
                 Comment = entry.Comment,
+                // For plural keys, store source plural text (PO msgid_plural or "other" form)
+                SourcePluralText = entry.IsPlural ? entry.SourcePluralText : null,
                 Version = 1,
                 CreatedAt = DateTime.UtcNow,
                 UpdatedAt = DateTime.UtcNow
@@ -396,6 +399,12 @@ 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)
+            {
+                resourceKey.SourcePluralText = entry.SourcePluralText;
+                resourceKey.UpdatedAt = DateTime.UtcNow;
+            }
         }
 
         // For plural entries, store each plural form as a separate Translation row
diff --git a/cloud/src/LrmCloud.Api/Services/ResourceService.cs b/cloud/src/LrmCloud.Api/Services/ResourceService.cs
@@ -854,6 +854,7 @@ private ResourceKeyDto MapToResourceKeyDto(ResourceKey key)
             KeyName = key.KeyName,
             KeyPath = key.KeyPath,
             IsPlural = key.IsPlural,
+            SourcePluralText = key.SourcePluralText,
             Comment = key.Comment,
             Version = key.Version,
             TranslationCount = key.Translations.Count,
@@ -875,6 +876,7 @@ private ResourceKeyDetailDto MapToResourceKeyDetailDto(ResourceKey key, string?
             KeyName = key.KeyName,
             KeyPath = key.KeyPath,
             IsPlural = key.IsPlural,
+            SourcePluralText = key.SourcePluralText,
             Comment = key.Comment,
             Version = key.Version,
             TranslationCount = key.Translations.Count,
diff --git a/cloud/src/LrmCloud.Shared/DTOs/Resources/ResourceKeyDto.cs b/cloud/src/LrmCloud.Shared/DTOs/Resources/ResourceKeyDto.cs
@@ -9,6 +9,10 @@ public class ResourceKeyDto
     public required string KeyName { get; set; }
     public string? KeyPath { get; set; }
     public bool IsPlural { get; set; }
+    /// <summary>
+    /// For plural keys, the source plural text pattern (PO msgid_plural or "other" form).
+    /// </summary>
+    public string? SourcePluralText { get; set; }
     public string? Comment { get; set; }
     public int Version { get; set; }
     public int TranslationCount { get; set; }
diff --git a/cloud/src/LrmCloud.Shared/DTOs/Sync/KeySyncDtos.cs b/cloud/src/LrmCloud.Shared/DTOs/Sync/KeySyncDtos.cs
@@ -68,6 +68,12 @@ public class EntryChangeDto
     /// </summary>
     public Dictionary<string, string>? PluralForms { get; set; }
 
+    /// <summary>
+    /// For plural keys, the source plural text pattern (PO msgid_plural or "other" form).
+    /// Only set when pushing from source/default language.
+    /// </summary>
+    public string? SourcePluralText { get; set; }
+
     /// <summary>
     /// Hash of the entry from last sync (for conflict detection).
     /// Null if this is a new entry.
@@ -259,6 +265,11 @@ public class EntryDataDto
     /// </summary>
     public bool IsPlural { get; set; }
 
+    /// <summary>
+    /// For plural keys, the source plural text pattern (PO msgid_plural or "other" form).
+    /// </summary>
+    public string? SourcePluralText { get; set; }
+
     /// <summary>
     /// Translations by language code.
     /// </summary>
diff --git a/cloud/src/LrmCloud.Shared/Entities/ResourceKey.cs b/cloud/src/LrmCloud.Shared/Entities/ResourceKey.cs
@@ -32,6 +32,15 @@ public class ResourceKey
     [Column("is_plural")]
     public bool IsPlural { get; set; }
 
+    /// <summary>
+    /// For plural keys, stores the source plural text pattern.
+    /// For PO format: this is the msgid_plural value.
+    /// For other formats: this is the "other" plural form from the source language.
+    /// Used to display the correct source text for translators.
+    /// </summary>
+    [Column("source_plural_text")]
+    public string? SourcePluralText { get; set; }
+
     [Column("comment")]
     public string? Comment { get; set; }
 
diff --git a/cloud/src/LrmCloud.Web/Components/KeyDetailDrawer.razor b/cloud/src/LrmCloud.Web/Components/KeyDetailDrawer.razor
@@ -19,6 +19,17 @@
         }
     </RadzenStack>
 
+    @* Source Plural Text (for PO format - shows msgid_plural for translators) *@
+    @if (Row.IsPlural && !string.IsNullOrEmpty(Row.SourcePluralText))
+    {
+        <RadzenStack Gap="0">
+            <RadzenText TextStyle="TextStyle.Overline" class="rz-color-secondary">Source Plural Text</RadzenText>
+            <RadzenText TextStyle="TextStyle.Body2" Style="background: var(--rz-base-200); padding: 0.5rem; border-radius: 4px; font-family: monospace;">
+                @Row.SourcePluralText
+            </RadzenText>
+        </RadzenStack>
+    }
+
     @* Comment Preview *@
     @if (!string.IsNullOrEmpty(Row.Comment))
     {
diff --git a/cloud/src/LrmCloud.Web/Components/KeyEditorDialog.razor b/cloud/src/LrmCloud.Web/Components/KeyEditorDialog.razor
@@ -63,6 +63,21 @@
         </Helper>
     </RadzenFormField>
 
+    @* Source Plural Text (for PO format - shows msgid_plural for translators) *@
+    @if (Row.IsPlural && !string.IsNullOrEmpty(Row.SourcePluralText))
+    {
+        <RadzenCard Style="background-color: var(--rz-info-lighter); padding: 0.75rem;">
+            <RadzenStack Gap="0.25rem">
+                <RadzenText TextStyle="TextStyle.Caption" class="rz-color-secondary" Style="font-weight: 500;">
+                    Source Plural Text
+                </RadzenText>
+                <RadzenText TextStyle="TextStyle.Body2" Style="font-family: monospace;">
+                    @Row.SourcePluralText
+                </RadzenText>
+            </RadzenStack>
+        </RadzenCard>
+    }
+
     @* Translations Section Header *@
     <RadzenStack Orientation="Radzen.Orientation.Horizontal" JustifyContent="JustifyContent.SpaceBetween" AlignItems="Radzen.AlignItems.Center">
         <RadzenText TextStyle="TextStyle.H6">Translations</RadzenText>
diff --git a/cloud/src/LrmCloud.Web/Models/TranslationGridRow.cs b/cloud/src/LrmCloud.Web/Models/TranslationGridRow.cs
diff --git a/cloud/src/LrmCloud.Web/Pages/Projects/Editor.razor b/cloud/src/LrmCloud.Web/Pages/Projects/Editor.razor
