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-05-04 22:49:10 +00:00
parent 54c896346b
commit ce10c4afc8
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1606,7 +1606,7 @@ namespace AyaNova.PlugIn.V8
int CurrentLocaleHash = util.GetOrderIndependentHashCode<string>(allStrings); int CurrentLocaleHash = util.GetOrderIndependentHashCode<string>(allStrings);
allStrings.Clear(); allStrings.Clear();
if (StockLocaleHashes.Contains(CurrentLocaleHash)) continue; if (StockLocaleHashes.Contains(CurrentLocaleHash)) continue;
progress.Op("Locale " + i.Locale + " is customized; exporting"); progress.Append("Locale " + i.Locale + " is customized [signature: "+CurrentLocaleHash.ToString()+"]; exporting");
//collection to hold items sent to server //collection to hold items sent to server
List<UpdateTranslationItem> exportItems = new List<UpdateTranslationItem>(); List<UpdateTranslationItem> exportItems = new List<UpdateTranslationItem>();
@@ -2037,7 +2037,9 @@ namespace AyaNova.PlugIn.V8
private async System.Threading.Tasks.Task<List<int>> ExportCustomFieldSchema(ObjectCustomFields ocf, string v7CustomFieldObjectName, string RavenCustomTranslationKeyObjectName) private async System.Threading.Tasks.Task<List<int>> ExportCustomFieldSchema(ObjectCustomFields ocf, string v7CustomFieldObjectName, string RavenCustomTranslationKeyObjectName)
{ {
var ret = new List<int>(); var ret = new List<int>();
if (ocf == null) return ret;
//NOTE: this code inspired by winforApp::Util.cs PrepareCustomFieldsGrid method //NOTE: this code inspired by winforApp::Util.cs PrepareCustomFieldsGrid method
dynamic d = new JObject(); dynamic d = new JObject();
d.formkey = RavenCustomTranslationKeyObjectName; d.formkey = RavenCustomTranslationKeyObjectName;

2
source/WinFormApp/AssemblyInfo.cs
View File

@@ -62,4 +62,4 @@ using System.Runtime.InteropServices;
[assembly: log4net.Config.XmlConfigurator(ConfigFile="Log4Net.config",Watch=true)] [assembly: log4net.Config.XmlConfigurator(ConfigFile="Log4Net.config",Watch=true)]
//[assembly: log4net.Config.XmlConfigurator(Watch=true)] //[assembly: log4net.Config.XmlConfigurator(Watch=true)]
[assembly: ComVisibleAttribute(false)] [assembly: ComVisibleAttribute(false)]
[assembly: AssemblyFileVersionAttribute("7.6.2.0")] [assembly: AssemblyFileVersionAttribute("7.6.3.0")]

8
source/WinFormApp/config.txt
View File

@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<!-- Development test MSSQL DB--> <!-- Development test MSSQL DB
<ConnectionType>DataBase</ConnectionType> <ConnectionType>DataBase</ConnectionType>
<DataBaseType>MSSQL</DataBaseType> <DataBaseType>MSSQL</DataBaseType>
<DataBaseConnectionString>Server=DEV-V7-LAPTOP\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password = abraxis;</DataBaseConnectionString> <DataBaseConnectionString>Server=DEV-V7-LAPTOP\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password = abraxis;</DataBaseConnectionString>
-->
<!-- DEVELOPMENT embedded Firebird database <!-- DEVELOPMENT embedded Firebird database -->
<ConnectionType>DataBase</ConnectionType> <ConnectionType>DataBase</ConnectionType>
<DataBaseType>FireBird</DataBaseType> <DataBaseType>FireBird</DataBaseType>
<DataBaseConnectionString>ServerType=1;DataBase=C:\data\AyaNova\database\AYANOVA.fdb;Dialect=3;</DataBaseConnectionString> <DataBaseConnectionString>ServerType=1;DataBase=C:\data\AyaNova\database\AYANOVA.fdb;Dialect=3;</DataBaseConnectionString>
-->
<!-- DataPortal <!-- DataPortal