From c6f471c7ca075e3437decacf658995f24c216215 Mon Sep 17 00:00:00 2001 From: larsbrubaker Date: Sat, 15 Mar 2014 14:02:43 -0700 Subject: [PATCH] Fixing up the localization file to always maintain the master file when in English added localized start and end to gcode view Made the TAZ baud rate correct Some new localizations --- Localizations/TranslationMap.cs | 18 ++++++--- LocalizedString.cs | 18 +++------ PartPreviewWindow/GcodeViewBasic.cs | 4 +- .../PrinterSettings/Lulzbot/TAZ ABS/setup.ini | 2 +- .../PrinterSettings/Lulzbot/TAZ PLA/setup.ini | 2 +- StaticData/Translations/Master.txt | 39 +++++++++++++++++++ 6 files changed, 61 insertions(+), 22 deletions(-) diff --git a/Localizations/TranslationMap.cs b/Localizations/TranslationMap.cs index cf9205c5e..1afc161c6 100644 --- a/Localizations/TranslationMap.cs +++ b/Localizations/TranslationMap.cs @@ -47,10 +47,12 @@ namespace MatterHackers.Localizations public void LoadTranslation(string pathToTranslationsFolder, string twoLetterIsoLanguageName) { + this.twoLetterIsoLanguageName = twoLetterIsoLanguageName; + this.pathToMasterFile = Path.Combine(pathToTranslationsFolder, "Master.txt"); ReadIntoDictonary(masterDictionary, pathToMasterFile); - this.pathToTranslationFile = Path.Combine(pathToTranslationsFolder, twoLetterIsoLanguageName, "Translation.txt"); + this.pathToTranslationFile = Path.Combine(pathToTranslationsFolder, TwoLetterIsoLanguageName, "Translation.txt"); if (File.Exists(pathToTranslationFile)) { ReadIntoDictonary(translationDictionary, pathToTranslationFile); @@ -64,11 +66,14 @@ namespace MatterHackers.Localizations } } - foreach (KeyValuePair keyValue in masterDictionary) + if (TwoLetterIsoLanguageName != "en") { - if (!translationDictionary.ContainsKey(keyValue.Key)) + foreach (KeyValuePair keyValue in masterDictionary) { - AddNewString(translationDictionary, pathToTranslationFile, keyValue.Key); + if (!translationDictionary.ContainsKey(keyValue.Key)) + { + AddNewString(translationDictionary, pathToTranslationFile, keyValue.Key); + } } } } @@ -122,7 +127,10 @@ namespace MatterHackers.Localizations string tranlatedString; if (!translationDictionary.TryGetValue(englishString, out tranlatedString)) { - AddNewString(translationDictionary, pathToTranslationFile, englishString); + if (TwoLetterIsoLanguageName != "en") + { + AddNewString(translationDictionary, pathToTranslationFile, englishString); + } AddNewString(masterDictionary, pathToMasterFile, englishString); return englishString; } diff --git a/LocalizedString.cs b/LocalizedString.cs index c0372b51d..fa64631a8 100644 --- a/LocalizedString.cs +++ b/LocalizedString.cs @@ -17,23 +17,15 @@ namespace MatterHackers.Localizations public static string Get(string EnglishText) { string language = "en"; - if (language == "en") + if (MatterControlTranslationMap == null) { - return EnglishText; + string pathToTranslationsFolder = Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath, "Translations"); + MatterControlTranslationMap = new TranslationMap(pathToTranslationsFolder, language); } - else - { - if (MatterControlTranslationMap == null) - { - string pathToTranslationsFolder = Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath, "Translations"); - MatterControlTranslationMap = new TranslationMap(pathToTranslationsFolder, language); - } #if DEBUG_SHOW_TRANSLATED_STRINGS && DEBUG - return "El " + EnglishText + " o"; -#else - return MatterControlTranslationMap.Translate(EnglishText); - } + return "El " + EnglishText + " o"; #endif + return MatterControlTranslationMap.Translate(EnglishText); } } } diff --git a/PartPreviewWindow/GcodeViewBasic.cs b/PartPreviewWindow/GcodeViewBasic.cs index 07d364b3c..11afdda72 100644 --- a/PartPreviewWindow/GcodeViewBasic.cs +++ b/PartPreviewWindow/GcodeViewBasic.cs @@ -517,12 +517,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow gcodeViewWidget.ActiveLayerChanged += new EventHandler(gcodeViewWidget_ActiveLayerChanged); AddChild(selectLayerSlider); - AddChild(new TextWidget("start:", 50, 77, 10, Agg.Font.Justification.Right)); + AddChild(new TextWidget(LocalizedString.Get("start:"), 50, 77, 10, Agg.Font.Justification.Right)); layerStartRenderRatioSlider = new Slider(new Vector2(), 10); layerStartRenderRatioSlider.ValueChanged += new EventHandler(layerStartRenderRatioSlider_ValueChanged); AddChild(layerStartRenderRatioSlider); - AddChild(new TextWidget("end:", 50, 57, 10, Agg.Font.Justification.Right)); + AddChild(new TextWidget(LocalizedString.Get("end:"), 50, 57, 10, Agg.Font.Justification.Right)); layerEndRenderRatioSlider = new Slider(new Vector2(), 10); layerEndRenderRatioSlider.Value = 1; layerEndRenderRatioSlider.ValueChanged += new EventHandler(layerEndRenderRatioSlider_ValueChanged); diff --git a/StaticData/PrinterSettings/Lulzbot/TAZ ABS/setup.ini b/StaticData/PrinterSettings/Lulzbot/TAZ ABS/setup.ini index 32ddd68d2..994ec9726 100644 --- a/StaticData/PrinterSettings/Lulzbot/TAZ ABS/setup.ini +++ b/StaticData/PrinterSettings/Lulzbot/TAZ ABS/setup.ini @@ -1 +1 @@ -baud_rate = 250000 +baud_rate = 115200 diff --git a/StaticData/PrinterSettings/Lulzbot/TAZ PLA/setup.ini b/StaticData/PrinterSettings/Lulzbot/TAZ PLA/setup.ini index 32ddd68d2..994ec9726 100644 --- a/StaticData/PrinterSettings/Lulzbot/TAZ PLA/setup.ini +++ b/StaticData/PrinterSettings/Lulzbot/TAZ PLA/setup.ini @@ -1 +1 @@ -baud_rate = 250000 +baud_rate = 115200 diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index c169519da..ba1f571e3 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -865,3 +865,42 @@ Translated:View Queue and Library English:Bed Temperature Translated:Bed Temperature +English:This gcode will be inserted when the print is canceled. +Translated:This gcode will be inserted when the print is canceled. + +English:This gcode will be inserted when the printer is paused. +Translated:This gcode will be inserted when the printer is paused. + +English:This gcode will be inserted when the printer is resumed. +Translated:This gcode will be inserted when the printer is resumed. + +English:Print Time +Translated:Print Time + +English:Filament Length +Translated:Filament Length + +English:Filament Volume +Translated:Filament Volume + +English:Weight +Translated:Weight + +English:Show Grid +Translated:Show Grid + +English:Show Moves +Translated:Show Moves + +English:Show Retractions +Translated:Show Retractions + +English:Go +Translated:Go + +English:start: +Translated:start: + +English:end: +Translated:end: +