From 557b30815e6c7e81f2caf003b6614d953275f22f Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Mon, 18 Jul 2022 13:14:34 -0400 Subject: [PATCH] use package name as a convention for identifying satellite assemblies --- Oqtane.Client/Modules/Admin/Languages/Add.razor | 4 ++-- Oqtane.Client/Modules/Admin/Languages/Index.razor | 2 +- Oqtane.Client/Resources/Modules/Admin/Languages/Add.resx | 6 +++--- Oqtane.Client/Services/Interfaces/ILanguageService.cs | 6 +++--- Oqtane.Client/Services/LanguageService.cs | 4 ++-- Oqtane.Server/Controllers/LanguageController.cs | 8 ++++---- Oqtane.Shared/Shared/Constants.cs | 1 - 7 files changed, 15 insertions(+), 16 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Languages/Add.razor b/Oqtane.Client/Modules/Admin/Languages/Add.razor index b5679740..1cd92ac3 100644 --- a/Oqtane.Client/Modules/Admin/Languages/Add.razor +++ b/Oqtane.Client/Modules/Admin/Languages/Add.razor @@ -52,7 +52,7 @@ else } - +
@@ -115,7 +115,7 @@ else
- +
diff --git a/Oqtane.Client/Modules/Admin/Languages/Index.razor b/Oqtane.Client/Modules/Admin/Languages/Index.razor index f6126beb..069948a7 100644 --- a/Oqtane.Client/Modules/Admin/Languages/Index.razor +++ b/Oqtane.Client/Modules/Admin/Languages/Index.razor @@ -80,7 +80,7 @@ else var upgradeavailable = false; if (_packages != null) { - var package = _packages.Where(item => item.PackageId == (Constants.ClientAssemblyName + "." + code)).FirstOrDefault(); + var package = _packages.Where(item => item.PackageId == ("Oqtane.Client." + code)).FirstOrDefault(); if (package != null) { upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(Constants.Version)) == 0); diff --git a/Oqtane.Client/Resources/Modules/Admin/Languages/Add.resx b/Oqtane.Client/Resources/Modules/Admin/Languages/Add.resx index 54d9910a..b4184c1f 100644 --- a/Oqtane.Client/Resources/Modules/Admin/Languages/Add.resx +++ b/Oqtane.Client/Resources/Modules/Admin/Languages/Add.resx @@ -154,13 +154,13 @@ No Translations Match The Criteria Provided Or Package Service Is Disabled - Download + Translations - Upload one or more translations. Once they are uploaded click Install to complete the installation. + Upload one or more translation packages. Once they are uploaded click Install to complete the installation. - Upload Language + Translation Manage diff --git a/Oqtane.Client/Services/Interfaces/ILanguageService.cs b/Oqtane.Client/Services/Interfaces/ILanguageService.cs index 7a57e203..a2da3a2f 100644 --- a/Oqtane.Client/Services/Interfaces/ILanguageService.cs +++ b/Oqtane.Client/Services/Interfaces/ILanguageService.cs @@ -18,12 +18,12 @@ namespace Oqtane.Services Task> GetLanguagesAsync(int siteId); /// - /// Returns a list of all available languages for the given and client assembly + /// Returns a list of all available languages for the given and package /// /// - /// + /// /// - Task> GetLanguagesAsync(int siteId, string clientAssemblyName); + Task> GetLanguagesAsync(int siteId, string packageName); /// /// Returns the given language diff --git a/Oqtane.Client/Services/LanguageService.cs b/Oqtane.Client/Services/LanguageService.cs index 413c568a..f8b432c8 100644 --- a/Oqtane.Client/Services/LanguageService.cs +++ b/Oqtane.Client/Services/LanguageService.cs @@ -20,9 +20,9 @@ namespace Oqtane.Services return await GetLanguagesAsync(siteId, ""); } - public async Task> GetLanguagesAsync(int siteId, string clientAssemblyName) + public async Task> GetLanguagesAsync(int siteId, string packageName) { - return await GetJsonAsync>($"{Apiurl}?siteid={siteId}&clientassemblyname={clientAssemblyName}"); + return await GetJsonAsync>($"{Apiurl}?siteid={siteId}&packagename={packageName}"); } public async Task GetLanguageAsync(int languageId) diff --git a/Oqtane.Server/Controllers/LanguageController.cs b/Oqtane.Server/Controllers/LanguageController.cs index 8ab3bf5b..c4683eae 100644 --- a/Oqtane.Server/Controllers/LanguageController.cs +++ b/Oqtane.Server/Controllers/LanguageController.cs @@ -32,17 +32,17 @@ namespace Oqtane.Controllers } [HttpGet] - public IEnumerable Get(string siteid, string clientassemblyname) + public IEnumerable Get(string siteid, string packagename) { int SiteId; if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId) { - if (string.IsNullOrEmpty(clientassemblyname)) + if (string.IsNullOrEmpty(packagename)) { - clientassemblyname = Constants.ClientAssemblyName; + packagename = "Oqtane"; } var languages = _languages.GetLanguages(SiteId).ToList(); - foreach (var file in Directory.EnumerateFiles(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), clientassemblyname + ".resources.dll", SearchOption.AllDirectories)) + foreach (var file in Directory.EnumerateFiles(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), packagename + ".Client.resources.dll", SearchOption.AllDirectories)) { var code = Path.GetFileName(Path.GetDirectoryName(file)); if (languages.Any(item => item.Code == code)) diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs index 087cec0d..1d1b4fe7 100644 --- a/Oqtane.Shared/Shared/Constants.cs +++ b/Oqtane.Shared/Shared/Constants.cs @@ -9,7 +9,6 @@ namespace Oqtane.Shared public const string PackageId = "Oqtane.Framework"; public const string UpdaterPackageId = "Oqtane.Updater"; public const string PackageRegistryUrl = "https://www.oqtane.net"; - public const string ClientAssemblyName = "Oqtane.Client"; public const string DefaultDBType = "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer";