admin/ayanova7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-11-25 18:10:58 +00:00
parent f9e3df6cb6
commit 59aad3350b
3 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AyaNovaSolution.sln
View File

@@ -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}" Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CSLA.Server.DataPortal", "source\csla10\CSLA.Server.DataPortal\CSLA.Server.DataPortal.vbproj", "{80828E2C-E9FB-4E73-A27C-7F9CDB96FCDE}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AyaNova", "source\WinFormApp\AyaNova.csproj", "{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}" 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 EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AyaImport", "utils\AyaImport\AyaImport.csproj", "{3A426361-1480-49A3-B596-53ABB98087F9}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AyaImport", "utils\AyaImport\AyaImport.csproj", "{3A426361-1480-49A3-B596-53ABB98087F9}"
EndProject EndProject

30
source/Plugins/AyaNova.Plugin.V8/V8.cs
View File

@@ -139,6 +139,7 @@ namespace AyaNova.PlugIn.V8
} }
//#endif //#endif
Auth d = new Auth(); Auth d = new Auth();
var res = d.ShowDialog(); ; var res = d.ShowDialog(); ;
if (res == DialogResult.Cancel) if (res == DialogResult.Cancel)
@@ -1826,10 +1827,27 @@ namespace AyaNova.PlugIn.V8
progress.SubOp(""); progress.SubOp("");
progress.Op("Exporting " + i.Locale + " to " + exportName); progress.Op("Exporting " + i.Locale + " to " + exportName);
var t = new util.NameIdItem { Name = exportName, Id = x }; // var t = new util.NameIdItem { Name = exportName, Id = x };
a = await util.PostAsync("translation/duplicate", JObject.FromObject(t).ToString()); a = await util.PostAsync("translation/duplicate/"+ x.ToString());
var targetTranslationId = util.IdFromResponse(a); 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 //add to maps so can set user to it on export
//going to default to the English based one because //going to default to the English based one because
//that's the majority of the users //that's the majority of the users
@@ -1865,7 +1883,7 @@ namespace AyaNova.PlugIn.V8
exportItems.Add(new UpdateTranslationItem exportItems.Add(new UpdateTranslationItem
{ {
Id = v8TransItem.Id, Id = v8TransItem.Id,
ConcurrencyToken = v8TransItem.ConcurrencyToken, Concurrency = v8TransItem.Concurrency,
NewText = v7item.Value NewText = v7item.Value
}); });
} }
@@ -1891,7 +1909,7 @@ namespace AyaNova.PlugIn.V8
public class TranslationItem public class TranslationItem
{ {
public long Id { get; set; } public long Id { get; set; }
public uint ConcurrencyToken { get; set; } public uint Concurrency { get; set; }
public string Key { get; set; } public string Key { get; set; }
public string Display { get; set; } public string Display { get; set; }
public long TranslationId { get; set; } public long TranslationId { get; set; }
@@ -1900,7 +1918,7 @@ namespace AyaNova.PlugIn.V8
public class UpdateTranslationItem public class UpdateTranslationItem
{ {
public long Id { get; set; } public long Id { get; set; }
public uint ConcurrencyToken { get; set; } public uint Concurrency { get; set; }
public string NewText { get; set; } public string NewText { get; set; }
} }

2
source/Plugins/AyaNova.Plugin.V8/util.cs
View File

@@ -261,7 +261,7 @@ namespace AyaNova.PlugIn.V8
public static uint CTokenFromResponse(ApiResponse a) public static uint CTokenFromResponse(ApiResponse a)
{ {
return a.ObjectResponse["data"]["concurrencyToken"].Value<uint>(); return a.ObjectResponse["data"]["concurrency"].Value<uint>();
} }
#endregion #endregion