nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Revert "Reverted LocalizedString""

Browse source 
This reverts commit 7af81a54a8.
This commit is contained in:
Kevin Pope 2015-01-07 09:53:31 -08:00
parent 7af81a54a8
commit 886a73ac4e
6 changed files with 1899 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
LocalizedString.cs
View file

@ -34,8 +34,10 @@ using System.Collections.Generic;
using System.Text;
using System.IO;
using MatterHackers.Agg;
using MatterHackers.MatterControl;
using MatterHackers.MatterControl.DataStorage;
using MatterHackers.Agg.PlatformAbstract;
namespace MatterHackers.Localizations
{
@ -54,9 +56,8 @@ namespace MatterHackers.Localizations
if (MatterControlTranslationMap == null)
{
// The translation map is now written to disk in the AppUserDataPath
// TODO: Write tools to collect changes to this file and push them to a shared server for merging into the main Master.txt file
MatterControlTranslationMap = new TranslationMap(ApplicationDataStorage.Instance.ApplicationUserDataPath, language);
string pathToTranslationsFolder = Path.Combine(StaticData.Instance.MapPath("Translations"));
MatterControlTranslationMap = new TranslationMap(pathToTranslationsFolder, language);
}
#if DEBUG_SHOW_TRANSLATED_STRINGS && DEBUG
return "El " + englishText + " o";