swcs/Archetype
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add locking to the file saving. Update casing on English lang files.

Browse Source
This commit is contained in:
Kevin Giszewski
2017-09-07 13:13:37 -04:00
parent 078f4a506e
commit 6a9c56df58
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Umbraco/Umbraco.Archetype/Models/ArchetypeGlobalSettings.cs
+10 -8
View File
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
using Newtonsoft.Json;
@@ -51,16 +50,19 @@ namespace Archetype.Models
public void Save()
{
//write to JSON
var configFileModel = new ArchetypeConfigFileModel
lock (_padLock)
{
Id = _instance.Id,
CheckForUpdates = _instance.CheckForUpdates
};
//write to JSON
var configFileModel = new ArchetypeConfigFileModel
{
Id = _instance.Id,
CheckForUpdates = _instance.CheckForUpdates
};
var serializedJson = JsonConvert.SerializeObject(configFileModel, Formatting.Indented);
var serializedJson = JsonConvert.SerializeObject(configFileModel, Formatting.Indented);
File.WriteAllText(_mappedPathToConfig, serializedJson);
File.WriteAllText(_mappedPathToConfig, serializedJson);
}
}
private static void _loadSettingsFromConfigFile()
app/langs/en-gb.js
+2 -2
View File
@@ -11,7 +11,7 @@
"maxFieldsets": "Max Fieldsets",
"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this Archetype.",
"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
"customWrapperClass": "Custom Wrapper Class",
@@ -23,7 +23,7 @@
"toggleDeveloperMode": "Toggle Developer Mode",
"toggleDeveloperModeDescription": "Turn on for developer options.",
"configModel": "Config Model",
"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
"configModelDescription": "Be careful editing the text below, it controls the schema for this Archetype.",
"helpText": "Help Text",
"defaultValue": "Default Value",
"dataType": "DataType",
app/langs/en-us.js
+2 -2
View File
@@ -11,7 +11,7 @@
"maxFieldsets": "Max Fieldsets",
"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this Archetype.",
"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
"customWrapperClass": "Custom Wrapper Class",
@@ -23,7 +23,7 @@
"toggleDeveloperMode": "Toggle Developer Mode",
"toggleDeveloperModeDescription": "Turn on for developer options.",
"configModel": "Config Model",
"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
"configModelDescription": "Be careful editing the text below, it controls the schema for this Archetype.",
"helpText": "Help Text",
"defaultValue": "Default Value",
"dataType": "DataType",
app/langs/en.js
+2 -2
View File
@@ -11,7 +11,7 @@
"maxFieldsets": "Max Fieldsets",
"maxFieldsetsDescription": "How many Fieldsets are allowed? Entering '1' will disable the controls. Default is unlimited.",
"enableMultipleFieldsets": "Enable Multiple Fieldsets?",
"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this archetype.",
"enableMultipleFieldsetsDescription": "Allows multiple types of fieldsets within this Archetype.",
"hideFieldsetToolbar": "Hide Fieldset Toolbar?",
"hideFieldsetToolbarDescription": "Hides the fieldset toolbar that appears when more than one fieldset model appears.",
"customWrapperClass": "Custom Wrapper Class",
@@ -23,7 +23,7 @@
"toggleDeveloperMode": "Toggle Developer Mode",
"toggleDeveloperModeDescription": "Turn on for developer options.",
"configModel": "Config Model",
"configModelDescription": "Be careful editing the text below, it controls the schema for this archetype.",
"configModelDescription": "Be careful editing the text below, it controls the schema for this Archetype.",
"helpText": "Help Text",
"defaultValue": "Default Value",
"dataType": "DataType",