Merge pull request #2294 from sbwalker/dev

use package name as a convention for identifying satellite assemblies

Oqtane.Client/Modules/Admin/Languages/Add.razor

@@ -52,7 +52,7 @@ else
                 </form>
             }
         </TabPanel>
-        <TabPanel Name="Download" ResourceKey="Download" Security="SecurityAccessLevel.Host">
+		<TabPanel Name="Translations" Heading="Translations" ResourceKey="Download" Security="SecurityAccessLevel.Host">
             <div class="row justify-content-center mb-3">
                 <div class="col-sm-6">
                     <div class="input-group">
@@ -115,7 +115,7 @@ else
         <TabPanel Name="Upload" ResourceKey="Upload" Security="SecurityAccessLevel.Host">
             <div class="container">
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" HelpText="Upload one or more translations. Once they are uploaded click Install to complete the installation." ResourceKey="LanguageUpload">Language: </Label>
+                    <Label Class="col-sm-3" HelpText="Upload one or more translations. Once they are uploaded click Install to complete the installation." ResourceKey="LanguageUpload">Translation: </Label>
                     <div class="col-sm-9">
                         <FileManager Folder="@Constants.PackagesFolder" UploadMultiple="true" />
                     </div>

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);

Oqtane.Client/Resources/Modules/Admin/Languages/Add.resx

@@ -154,13 +154,13 @@
     <value>No Translations Match The Criteria Provided Or Package Service Is Disabled</value>
   </data>
   <data name="Download.Heading" xml:space="preserve">
-    <value>Download</value>
+    <value>Translations</value>
   </data>
   <data name="LanguageUpload.HelpText" xml:space="preserve">
-    <value>Upload one or more translations. Once they are uploaded click Install to complete the installation.</value>
+    <value>Upload one or more translation packages. Once they are uploaded click Install to complete the installation.</value>
   </data>
   <data name="LanguageUpload.Text" xml:space="preserve">
-    <value>Upload Language</value>
+    <value>Translation</value>
   </data>
   <data name="Manage.Heading" xml:space="preserve">
     <value>Manage</value>

Oqtane.Client/Services/Interfaces/ILanguageService.cs

@@ -18,12 +18,12 @@ namespace Oqtane.Services
         Task<List<Language>> GetLanguagesAsync(int siteId);
 
         /// <summary>
-        /// Returns a list of all available languages for the given <see cref="Site" /> and client assembly
+        /// Returns a list of all available languages for the given <see cref="Site" /> and package
         /// </summary>
         /// <param name="siteId"></param>
-        /// <param name="clientAssemblyName"></param>
+        /// <param name="packageName"></param>
         /// <returns></returns>
-        Task<List<Language>> GetLanguagesAsync(int siteId, string clientAssemblyName);
+        Task<List<Language>> GetLanguagesAsync(int siteId, string packageName);
 
         /// <summary>
         /// Returns the given language

Oqtane.Client/Services/LanguageService.cs

@@ -20,9 +20,9 @@ namespace Oqtane.Services
             return await GetLanguagesAsync(siteId, "");
         }
 
-        public async Task<List<Language>> GetLanguagesAsync(int siteId, string clientAssemblyName)
+        public async Task<List<Language>> GetLanguagesAsync(int siteId, string packageName)
         {
-            return await GetJsonAsync<List<Language>>($"{Apiurl}?siteid={siteId}&clientassemblyname={clientAssemblyName}");
+            return await GetJsonAsync<List<Language>>($"{Apiurl}?siteid={siteId}&packagename={packageName}");
         }
 
         public async Task<Language> GetLanguageAsync(int languageId)

Oqtane.Server/Controllers/LanguageController.cs

@@ -32,17 +32,17 @@ namespace Oqtane.Controllers
         }
 
         [HttpGet]
-        public IEnumerable<Language> Get(string siteid, string clientassemblyname)
+        public IEnumerable<Language> 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))

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";