From 59aad3350b52dc3e2b12556d904ad4833533837a Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 25 Nov 2020 18:10:58 +0000 Subject: [PATCH] --- AyaNovaSolution.sln | 3 +++ source/Plugins/AyaNova.Plugin.V8/V8.cs | 30 +++++++++++++++++++----- source/Plugins/AyaNova.Plugin.V8/util.cs | 2 +- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/AyaNovaSolution.sln b/AyaNovaSolution.sln index 0357f81..ae6a9be 100644 --- a/AyaNovaSolution.sln +++ b/AyaNovaSolution.sln @@ -41,6 +41,9 @@ EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CSLA.Server.DataPortal", "source\csla10\CSLA.Server.DataPortal\CSLA.Server.DataPortal.vbproj", "{80828E2C-E9FB-4E73-A27C-7F9CDB96FCDE}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AyaNova", "source\WinFormApp\AyaNova.csproj", "{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}" + ProjectSection(ProjectDependencies) = postProject + {A2A29280-0267-4B9B-A122-C3ECDFC3CFC7} = {A2A29280-0267-4B9B-A122-C3ECDFC3CFC7} + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AyaImport", "utils\AyaImport\AyaImport.csproj", "{3A426361-1480-49A3-B596-53ABB98087F9}" EndProject diff --git a/source/Plugins/AyaNova.Plugin.V8/V8.cs b/source/Plugins/AyaNova.Plugin.V8/V8.cs index 43f5ed5..c23f5a8 100644 --- a/source/Plugins/AyaNova.Plugin.V8/V8.cs +++ b/source/Plugins/AyaNova.Plugin.V8/V8.cs @@ -139,6 +139,7 @@ namespace AyaNova.PlugIn.V8 } //#endif + Auth d = new Auth(); var res = d.ShowDialog(); ; if (res == DialogResult.Cancel) @@ -1826,10 +1827,27 @@ namespace AyaNova.PlugIn.V8 progress.SubOp(""); progress.Op("Exporting " + i.Locale + " to " + exportName); - var t = new util.NameIdItem { Name = exportName, Id = x }; - a = await util.PostAsync("translation/duplicate", JObject.FromObject(t).ToString()); + // var t = new util.NameIdItem { Name = exportName, Id = x }; + a = await util.PostAsync("translation/duplicate/"+ x.ToString()); var targetTranslationId = util.IdFromResponse(a); - var ctoken = util.CTokenFromResponse(a); + // var ctoken = util.CTokenFromResponse(a); + + //now set the name + dynamic dTransName = new JObject(); + dTransName.id=a.ObjectResponse["data"]["id"]; + dTransName.concurrency = a.ObjectResponse["data"]["concurrency"]; + dTransName.name=exportName; + dTransName.stock=false; + dTransName.cjkIndex = a.ObjectResponse["data"]["cjkIndex"]; + var vtemp=await util.PutAsync("translation", dTransName.ToString()); + // vtemp["data"]["concurrency"] + var ctoken = util.CTokenFromResponse(vtemp); + // "id": 5, + //"concurrency": 92149, + //"name": "en-1", + //"stock": false, + //"cjkIndex": false, + //add to maps so can set user to it on export //going to default to the English based one because //that's the majority of the users @@ -1865,7 +1883,7 @@ namespace AyaNova.PlugIn.V8 exportItems.Add(new UpdateTranslationItem { Id = v8TransItem.Id, - ConcurrencyToken = v8TransItem.ConcurrencyToken, + Concurrency = v8TransItem.Concurrency, NewText = v7item.Value }); } @@ -1891,7 +1909,7 @@ namespace AyaNova.PlugIn.V8 public class TranslationItem { public long Id { get; set; } - public uint ConcurrencyToken { get; set; } + public uint Concurrency { get; set; } public string Key { get; set; } public string Display { get; set; } public long TranslationId { get; set; } @@ -1900,7 +1918,7 @@ namespace AyaNova.PlugIn.V8 public class UpdateTranslationItem { public long Id { get; set; } - public uint ConcurrencyToken { get; set; } + public uint Concurrency { get; set; } public string NewText { get; set; } } diff --git a/source/Plugins/AyaNova.Plugin.V8/util.cs b/source/Plugins/AyaNova.Plugin.V8/util.cs index a9e4083..eebb726 100644 --- a/source/Plugins/AyaNova.Plugin.V8/util.cs +++ b/source/Plugins/AyaNova.Plugin.V8/util.cs @@ -261,7 +261,7 @@ namespace AyaNova.PlugIn.V8 public static uint CTokenFromResponse(ApiResponse a) { - return a.ObjectResponse["data"]["concurrencyToken"].Value(); + return a.ObjectResponse["data"]["concurrency"].Value(); } #endregion