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

Revise TranslationMap, UserSettings

Browse source 
- Move Master.txt translation file to Translations/en/Translation.txt
 - Threadsafe MatterControlTranslationMap initialization
 - Refactor UserSettings:
     - Threadsafe initialization
     - Concise initialization
     - UseTryGetValue for dictionary lookups
     - Use backing fields
     - Cache frequently accessed Language value as local property
This commit is contained in:
John Lewin 2016-01-05 12:58:20 -08:00
parent f5488b04b9
commit 8600a35576
4 changed files with 66 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

29
LocalizedString.cs
View file

@ -38,29 +38,30 @@ namespace MatterHackers.Localizations
{
private static TranslationMap MatterControlTranslationMap;
private static readonly object syncRoot = new object();
static LocalizedString()
{
lock(syncRoot)
{
if (MatterControlTranslationMap == null)
{
MatterControlTranslationMap = new TranslationMap("Translations", UserSettings.Instance.Language);
}
}
}
public static string Get(string englishText)
{
string language = UserSettings.Instance.get("Language");
if (language == null)
{
language = "en";
UserSettings.Instance.set("Language", "en");
}
if (MatterControlTranslationMap == null)
{
string pathToTranslationsFolder = "Translations";
MatterControlTranslationMap = new TranslationMap(pathToTranslationsFolder, language);
}
#if DEBUG_SHOW_TRANSLATED_STRINGS && DEBUG
return "El " + englishText + " o";
return "El " + englishText + " o";
#endif
return MatterControlTranslationMap.Translate(englishText);
}
public static void ResetTranslationMap()
{
MatterControlTranslationMap = null;
MatterControlTranslationMap = new TranslationMap("Translations", UserSettings.Instance.Language);
}
public static string Localize(this string englishString)