[chronojump] Fixed untranslated encoder combo since last commits



commit b825869925227df128600e88087e08b57599f7ab
Author: Xavier de Blas <xaviblas gmail com>
Date:   Sat Dec 15 17:11:58 2018 +0100

    Fixed untranslated encoder combo since last commits

 src/gui/cjCombo.cs | 2 +-
 src/gui/encoder.cs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/gui/cjCombo.cs b/src/gui/cjCombo.cs
index effd3296..473b982c 100644
--- a/src/gui/cjCombo.cs
+++ b/src/gui/cjCombo.cs
@@ -50,7 +50,7 @@ public partial class ChronoJumpWindow
 
        int getExerciseIDFromAnyCombo(Gtk.ComboBox combo, string [] comboArrayString, bool 
comboWithTranslation)
        {
-               return getExerciseIDFromName(comboArrayString, UtilGtk.ComboGetActive(combo), false);
+               return getExerciseIDFromName(comboArrayString, UtilGtk.ComboGetActive(combo), 
comboWithTranslation);
        }
 }
 
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 73feddfb..3af32747 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -4607,9 +4607,9 @@ public partial class ChronoJumpWindow
                int i =0;
                foreach(EncoderExercise ex in encoderExercises) {
                        string nameTranslated = ex.name;
-                       //do not translated user created exercises
-                       //this names are in SqliteEncoder.initializeTableEncoderExercise()
-                       if(ex.name == "Bench press" || ex.name == "Squat" || ex.name == "Jump")
+                       //Translate Chronojump already created exercises in 
SqliteEncoder.initializeTableEncoderExercise()
+                       //but do not translate user created exercises
+                       if(ex.name == "Bench press" || ex.name == "Squat" || ex.name == "Jump" || ex.name == 
"Free")
                                nameTranslated = Catalog.GetString(ex.name);
                        encoderExercisesTranslationAndBodyPWeight[i] =
                                ex.uniqueID + ":" + ex.name + ":" + nameTranslated + ":" + 
ex.percentBodyWeight;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]