fix localization

src/NuSocial.Blazor/MauiProgram.cs

@@ -1,4 +1,5 @@
-using Microsoft.Extensions.Logging;
+using CommunityToolkit.Maui;
+using Microsoft.Extensions.Logging;
 using NuSocial.Blazor.Data;
 
 namespace NuSocial.Blazor
@@ -10,6 +11,7 @@ public static MauiApp CreateMauiApp()
             var builder = MauiApp.CreateBuilder();
             builder
                 .UseMauiApp<App>()
+                .UseMauiCommunityToolkit()
                 .ConfigureFonts(fonts =>
                 {
                     fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");

src/NuSocial.Core/Localization/LocalizationResourceManager.cs

@@ -28,7 +28,13 @@ public LocalizedString GetValue(string resourceKey)
         CultureInfo.CurrentCulture = CurrentCulture;
         CultureInfo.CurrentUICulture = CurrentCulture;
 
-        return _localizer[resourceKey];
+        var loc = _localizer[resourceKey];
+        if (loc.ResourceNotFound)
+        {
+            Debug.WriteLine($"Resource not found: {resourceKey}");
+            loc = new LocalizedString(loc.Name, $"[{resourceKey}]", loc.ResourceNotFound);
+        }
+        return loc;
     }
 
     internal static object GetInstance(IServiceProvider serviceProvider)

src/NuSocial.Core/Localization/NuSocial/en.json

@@ -15,11 +15,19 @@
     "AboutPlaceholder": "Add something interesting about you ..",
     "AccountId": "Account ID",
     "AccountKeyPlaceholder": "nsec1...",
-    "NuSocial": "NuSocial",
+    "NuSocial": "NuSocial 123",
     "TapToRegenerate": "Tap to regenerate",
     "WelcomeText": "#nostr NuSocial: Your Universe, Nu Connections",
     "NoRecentPosts": "No recent posts",
     "Enum_My": "My",
-    "Enum_Mutual": "Mutual"
+    "Enum_Mutual": "Mutual",
+    "Unread": "Unread",
+    "Reply": "Reply",
+    "TestMode": "Test Mode",
+    "Logout": "Logout",
+    "Profile": "Profile",
+    "Home": "Home",
+    "Settings": "Settings",
+    "Messages": "Messages"
   }
 }

src/NuSocial.Core/Models/User.cs

@@ -77,17 +77,17 @@ public string PrivateKeyString
 
 public class Profile
 {
-    private string? _picture = "https://placehold.co/60x60";
+    private string? _picture = "https://placehold.co/60x60.png";
 
     public string Name { get; internal set; } = string.Empty;
     public string? DisplayName { get; internal set; }
     public string? Picture
     {
         get
         {
-            if (string.IsNullOrEmpty(_picture) || (_picture.Equals("https://placehold.co/60x60", StringComparison.OrdinalIgnoreCase) && !string.IsNullOrEmpty(Name)))
+            if (string.IsNullOrEmpty(_picture) || (_picture.Equals("https://placehold.co/60x60.png", StringComparison.OrdinalIgnoreCase) && !string.IsNullOrEmpty(Name)))
             {
-                _picture = $"https://placehold.co/60x60?text={Name}";
+                _picture = $"https://placehold.co/60x60.png?text={Name}";
             }
             return _picture;
         }

src/NuSocial.Core/NuSocial.Core.csproj

@@ -30,8 +30,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <EmbeddedResource Include="Localization\NuSocial\en.json" />
-	  <EmbeddedResource Include="Localization\NuSocial\fr.json" />
+		<EmbeddedResource Include="Localization\NuSocial\*.json" />
+		<Content Remove="Localization\NuSocial\*.json" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -60,10 +60,10 @@
 		<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.4" />
 		<PackageReference Include="System.Text.Json" Version="7.0.2" />
 		<PackageReference Include="Telerik.UI.for.Maui" Version="5.1.0" />
-		<PackageReference Include="Volo.Abp.Core" Version="7.1.1" />
-		<PackageReference Include="Volo.Abp.Localization" Version="7.1.1" />
-		<PackageReference Include="Volo.Abp.Localization.Abstractions" Version="7.1.1" />
-		<PackageReference Include="Volo.Abp.Validation" Version="7.1.1" />
+		<PackageReference Include="Volo.Abp.Core" Version="7.2.2" />
+		<PackageReference Include="Volo.Abp.Localization" Version="7.2.2" />
+		<PackageReference Include="Volo.Abp.Localization.Abstractions" Version="7.2.2" />
+		<PackageReference Include="Volo.Abp.Validation" Version="7.2.2" />
 		<PackageReference Include="Xam.Plugin.Media" Version="5.0.1" />
 	</ItemGroup>
 

src/NuSocial.Core/NuSocialCoreModule.cs

@@ -26,7 +26,7 @@ public override void ConfigureServices(ServiceConfigurationContext context)
             Configure<AbpVirtualFileSystemOptions>(options =>
             {
                 // "YourRootNameSpace" is the root namespace of your project. It can be empty if your root namespace is empty.
-                options.FileSets.AddEmbedded<NuSocialCoreModule>();
+                options.FileSets.AddEmbedded<NuSocialCoreModule>("NuSocial.Core");
             });
 
             Configure<AbpLocalizationOptions>(options =>

src/NuSocial.Core/ViewModels/AgreeViewModel.cs

@@ -1,4 +1,3 @@
-using NuSocial.Core.ViewModel;
 using Volo.Abp.DependencyInjection;
 
 namespace NuSocial.ViewModels;
@@ -7,7 +6,7 @@ public partial class AgreeViewModel : BaseViewModel, ITransientDependency
 {
     public AgreeViewModel(IDialogService dialogService, INavigationService navigationService) : base(dialogService, navigationService)
     {
-        Title = L["EULA"];
+
     }
 
     [ObservableProperty]
@@ -56,9 +55,10 @@ private Task DisagreeAsync()
         });
     }
 
-    public override Task OnFirstAppear()
+    public override Task InitializeAsync()
     {
+        Title = L["EULA"];
         Eula = L["AgreementText"];
-        return Task.CompletedTask;
+        return base.InitializeAsync();
     }
 }

src/NuSocial.Core/ViewModels/LoginViewModel.cs

@@ -23,7 +23,7 @@ public LoginViewModel(IDialogService dialogService,
                           IConfiguration configuration,
                           IDatabase db) : base(dialogService, navigationService)
     {
-        Title = L["Login"];
+
         _configuration = configuration;
         _db = db;
     }
@@ -80,8 +80,14 @@ private Task LoginAsync()
         });
     }
 
+    public override Task InitializeAsync()
+    {
+        Title = L["Login"];
+        return base.InitializeAsync();
+    }
     public override Task OnFirstAppear()
     {
+
         SetWhenDebug();
         return Task.CompletedTask;
     }

src/NuSocial.Core/ViewModels/RegisterViewModel.cs

@@ -14,7 +14,7 @@ public RegisterViewModel(IDialogService dialogService,
                              IDatabase db)
         : base(dialogService, navigationService)
     {
-        Title = L["CreateAccount"];
+
         _db = db;
     }
 
@@ -37,12 +37,19 @@ public RegisterViewModel(IDialogService dialogService,
 
     public override Task OnFirstAppear()
     {
+
         GenerateKeyPair();
 
         WeakReferenceMessenger.Default.Send<ResetNavMessage>(new("//start"));
         return Task.CompletedTask;
     }
 
+    public override Task InitializeAsync()
+    {
+        Title = L["CreateAccount"];
+        return base.InitializeAsync();
+    }
+
     private void GenerateKeyPair()
     {
         var keyPair = NostrKeyPair.GenerateNew();

src/NuSocial.Core/ViewModels/RelaysViewModel.cs

@@ -31,12 +31,14 @@ public RelaysViewModel(IDialogService dialogService,
                            IDatabase db)
         : base(dialogService, navigationService)
     {
-        Title = L["Relays"];
+
         _db = db;
     }
 
     public override async Task InitializeAsync()
     {
+        Title = L["Relays"];
+
         // We need to cancel any work currently handling nostr information, so fire that message.
         WeakReferenceMessenger.Default.Send<NostrStateChangeMessage>(new(false));
 

src/NuSocial.Core/ViewModels/ShellViewModel.cs

@@ -1,6 +1,7 @@
 using CommunityToolkit.Mvvm.DependencyInjection;
 using CommunityToolkit.Mvvm.Messaging;
 using NuSocial.Core.ViewModel;
+using NuSocial.Localization;
 using NuSocial.Messages;
 using Volo.Abp.DependencyInjection;
 
@@ -24,7 +25,7 @@ public partial class ShellViewModel : BaseViewModel, ISingletonDependency
 
     private IRedirectService? _redirectService;
 
-    public ShellViewModel(IAppInfo appInfo)
+    public ShellViewModel(IAppInfo appInfo, LocalizationResourceManager localizationManager)
     {
         if (appInfo is null)
         {
@@ -42,10 +43,20 @@ public ShellViewModel(IAppInfo appInfo)
         {
             RefreshMenuItems(false);
         });
+
+        localizationManager.PropertyChanged += (_, _) =>
+        {
+            UpdateProperties();
+        };
+    }
+
+    private void UpdateProperties()
+    {
+        throw new NotImplementedException();
     }
 
-    public ShellViewModel()
-        : this(AppInfo.Current)
+    public ShellViewModel(LocalizationResourceManager localizationManager)
+        : this(AppInfo.Current, localizationManager)
     {
     }
 

src/NuSocial.Core/ViewModels/StartViewModel.cs

@@ -6,8 +6,14 @@ namespace NuSocial.ViewModels;
 public partial class StartViewModel : BaseViewModel, ITransientDependency
 {
     public StartViewModel(IDialogService dialogService, INavigationService navigationService) : base(dialogService, navigationService)
+    {
+
+    }
+
+    public override Task InitializeAsync()
     {
         Title = L["NuSocial"];
+        return base.InitializeAsync();
     }
 
     [RelayCommand(CanExecute = nameof(IsNotBusy))]