Better skeleton flip toggle/header text (using the device's name)

KinectToVR · Feb 21, 2023 · 1fa150d · 1fa150d
1 parent 91c9ec1
commit 1fa150d
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 22 deletions.
diff --git a/Amethyst/Assets/Strings/de.json b/Amethyst/Assets/Strings/de.json
@@ -22,10 +22,10 @@
   "/GeneralPage/Calibration/Captions/Captured": "Position gespeichert!",
   "/GeneralPage/Calibration/Captions/Done": "Kalibrierung erfolgreich!",
   "/GeneralPage/Calibration/Captions/Manual": "Bewege deine Tracker mithilfe deiner VR-Controller.",
-  "/GeneralPage/Calibration/Captions/Move": "Position {1} von {2}\nBewege dich woanders",
+  "/GeneralPage/Calibration/Captions/Move": "Position {0} von {1}\nBewege dich woanders",
   "/GeneralPage/Calibration/Captions/Points": "Versuche die Erfassungspunkte zu erhöhen, falls sich deine Tracker auf der falschen Stelle befinden.",
   "/GeneralPage/Calibration/Captions/Recommended": "Empfohlen",
-  "/GeneralPage/Calibration/Captions/Stand": "Position {1} of {2}\nBleibe bitte stehen!",
+  "/GeneralPage/Calibration/Captions/Stand": "Position {0} von {1}\nBleibe bitte stehen!",
   "/GeneralPage/Calibration/Captions/Start": "Start des Kalibrationsprozesses",
   "/GeneralPage/Calibration/Headers/Automatic": "Automatische Kalibrierung",
   "/GeneralPage/Calibration/Headers/Manual": "Manuelle Kalibrierung",
@@ -98,7 +98,7 @@
   "/SettingsPage/Captions/FaceTheKinect": "Schaue auf die Richtung der Kinect!",
   "/SettingsPage/Captions/Filters/Orientation": "Rotationstracking:",
   "/SettingsPage/Captions/Filters/Position": "Positionstracking-Filter:",
-  "/SettingsPage/Captions/SkeletonFlip": "Tracker spiegeln wenn sie sich von der Kinect abwenden",
+  "/SettingsPage/Captions/SkeletonFlip": "Tracker spiegeln wenn sie sich von {0} abwenden",
   "/SettingsPage/Captions/Sounds": "App-Sound aktivieren",
   "/SettingsPage/Captions/TrackerPairs": "Tracker-Paare verwenden",
   "/SettingsPage/Captions/TrackersAutoCheck": "Nach bereits vorhandene Tracker suchen und diese deaktivieren",

diff --git a/Amethyst/Assets/Strings/en.json b/Amethyst/Assets/Strings/en.json
@@ -22,10 +22,10 @@
   "/GeneralPage/Calibration/Captions/Captured": "Position captured!",
   "/GeneralPage/Calibration/Captions/Done": "Calibration done!",
   "/GeneralPage/Calibration/Captions/Manual": "Move trackers using your VR controllers.",
-  "/GeneralPage/Calibration/Captions/Move": "Position {1} of {2}\nMove somewhere else",
+  "/GeneralPage/Calibration/Captions/Move": "Position {0} of {1}\nMove somewhere else",
   "/GeneralPage/Calibration/Captions/Points": "Try increasing capture points if the calibration puts the trackers in the wrong place.",
   "/GeneralPage/Calibration/Captions/Recommended": "Recommended",
-  "/GeneralPage/Calibration/Captions/Stand": "Position {1} of {2}\nPlease stand still!",
+  "/GeneralPage/Calibration/Captions/Stand": "Position {0} of {1}\nPlease stand still!",
   "/GeneralPage/Calibration/Captions/Start": "Start the calibration",
   "/GeneralPage/Calibration/Headers/Automatic": "Automatic Calibration",
   "/GeneralPage/Calibration/Headers/Manual": "Manual Calibration",
@@ -98,7 +98,7 @@
   "/SettingsPage/Captions/FaceTheKinect": "Face the Kinect!",
   "/SettingsPage/Captions/Filters/Orientation": "Orientation Tracking:",
   "/SettingsPage/Captions/Filters/Position": "Position Tracking Filter:",
-  "/SettingsPage/Captions/SkeletonFlip": "Mirror trackers when turning away from the Kinect",
+  "/SettingsPage/Captions/SkeletonFlip": "Mirror trackers when turning away from {0}",
   "/SettingsPage/Captions/Sounds": "Enable app sounds",
   "/SettingsPage/Captions/TrackerPairs": "Use Tracker Pairs",
   "/SettingsPage/Captions/TrackersAutoCheck": "Check for and disable already existing trackers",

diff --git a/Amethyst/Assets/Strings/fr.json b/Amethyst/Assets/Strings/fr.json
@@ -22,10 +22,10 @@
   "/GeneralPage/Calibration/Captions/Captured": "Position capturée!",
   "/GeneralPage/Calibration/Captions/Done": "Calibration terminée!",
   "/GeneralPage/Calibration/Captions/Manual": "Déplacez les trackers avec vos manettes de VR.",
-  "/GeneralPage/Calibration/Captions/Move": "Position {1} de {2}\nChangez d'endroit",
+  "/GeneralPage/Calibration/Captions/Move": "Position {0} de {1}\nChangez d'endroit",
   "/GeneralPage/Calibration/Captions/Points": "Essayez d'augmenter le nombre de points de calibration si les trackers ne sont pas bien alignés après la calibration.",
   "/GeneralPage/Calibration/Captions/Recommended": "Recommandé",
-  "/GeneralPage/Calibration/Captions/Stand": "Position {1} de {2}\nNe bougez pas!",
+  "/GeneralPage/Calibration/Captions/Stand": "Position {0} de {1}\nNe bougez pas!",
   "/GeneralPage/Calibration/Captions/Start": "En attente...",
   "/GeneralPage/Calibration/Headers/Automatic": "Calibration Automatique",
   "/GeneralPage/Calibration/Headers/Manual": "Calibration Manuelle",
@@ -98,7 +98,7 @@
   "/SettingsPage/Captions/FaceTheKinect": "Faites face à la Kinect!",
   "/SettingsPage/Captions/Filters/Orientation": "Options de rotation:",
   "/SettingsPage/Captions/Filters/Position": "Filtres de position:",
-  "/SettingsPage/Captions/SkeletonFlip": "Retourner les trackers quand vous êtes dos à la Kinect.",
+  "/SettingsPage/Captions/SkeletonFlip": "Retourner les trackers quand vous êtes dos à {0}.",
   "/SettingsPage/Captions/Sounds": "Activer les sons de l'app",
   "/SettingsPage/Captions/TrackerPairs": "Combiner les trackers en paires",
   "/SettingsPage/Captions/TrackersAutoCheck": "Désactiver les trackers qui existent déjà",

diff --git a/Amethyst/Assets/Strings/ru.json b/Amethyst/Assets/Strings/ru.json
@@ -22,10 +22,10 @@
   "/GeneralPage/Calibration/Captions/Captured": "Положение зафиксировано!",
   "/GeneralPage/Calibration/Captions/Done": "Калибровка завершена!",
   "/GeneralPage/Calibration/Captions/Manual": "Перемещайте трекеры при помощи ваших VR контроллеров.",
-  "/GeneralPage/Calibration/Captions/Move": "Положение {1} из {2}\nПерейдите в другую точку",
+  "/GeneralPage/Calibration/Captions/Move": "Положение {0} из {1}\nПерейдите в другую точку",
   "/GeneralPage/Calibration/Captions/Points": "Попробуйте увеличить точки захвата, если после калибровки трекеры находятся в неправильных местах.",
   "/GeneralPage/Calibration/Captions/Recommended": "Рекомендуемое",
-  "/GeneralPage/Calibration/Captions/Stand": "Положение {1} из {2}\nПожалуйста, стойте неподвижно!",
+  "/GeneralPage/Calibration/Captions/Stand": "Положение {0} из {1}\nПожалуйста, стойте неподвижно!",
   "/GeneralPage/Calibration/Captions/Start": "Начать калибровку",
   "/GeneralPage/Calibration/Headers/Automatic": "Автоматическая калибровка",
   "/GeneralPage/Calibration/Headers/Manual": "Ручная калибровка",
@@ -98,7 +98,7 @@
   "/SettingsPage/Captions/FaceTheKinect": "Повернитесь лицом к Kinect!",
   "/SettingsPage/Captions/Filters/Orientation": "Трекинг вращения:",
   "/SettingsPage/Captions/Filters/Position": "Фильтрация трекинга положения:",
-  "/SettingsPage/Captions/SkeletonFlip": "Отражение трекеров, если отвернуться от Kinect",
+  "/SettingsPage/Captions/SkeletonFlip": "Отражение трекеров, если отвернуться от {0}",
   "/SettingsPage/Captions/Sounds": "Включить звуки приложения",
   "/SettingsPage/Captions/TrackerPairs": "Использовать трекеры",
   "/SettingsPage/Captions/TrackersAutoCheck": "Проверьте трекеры и отключите уже существующие.",

diff --git a/Amethyst/Pages/General.xaml.cs b/Amethyst/Pages/General.xaml.cs
@@ -389,7 +389,7 @@ private async void StartAutoCalibrationButton_Click(object sender, RoutedEventAr
         for (var point = 0; point < AppData.Settings.CalibrationPointsNumber; point++)
         {
             // Wait for the user to move
-            CalibrationInstructionsLabel.Text = CalibrationPointsFormat(
+            CalibrationInstructionsLabel.Text = string.Format(
                 Interfacing.LocalizedJsonString("/GeneralPage/Calibration/Captions/Move"),
                 point + 1, AppData.Settings.CalibrationPointsNumber);
 
@@ -411,7 +411,7 @@ private async void StartAutoCalibrationButton_Click(object sender, RoutedEventAr
                 if (!_calibrationPending) break; // Check for exiting
             }
 
-            CalibrationInstructionsLabel.Text = CalibrationPointsFormat(
+            CalibrationInstructionsLabel.Text = string.Format(
                 Interfacing.LocalizedJsonString("/GeneralPage/Calibration/Captions/Stand"),
                 point + 1, AppData.Settings.CalibrationPointsNumber);
 
@@ -1664,13 +1664,7 @@ private void SetSkeletonForce(bool visibility)
         if (!Shared.General.GeneralTabSetupFinished) return;
         Shared.General.ForceRenderCheckBox.IsChecked = visibility;
     }
-
-    private string CalibrationPointsFormat(string format, int p1, uint p2)
-    {
-        return format.Replace("{1}", p1.ToString())
-            .Replace("{2}", p2.ToString());
-    }
-
+
     private void AllowNavigation(bool allow)
     {
         Shared.Main.NavigationBlockerGrid.IsHitTestVisible = !allow;

diff --git a/Amethyst/Pages/Settings.xaml b/Amethyst/Pages/Settings.xaml
@@ -207,7 +207,7 @@
                             </Grid.ColumnDefinitions>
 
                             <TextBlock FontWeight="SemiBold" FontSize="14" Margin="0,-3,0,0"
-                                       Text="{x:Bind util:Translator.Get.String('/SettingsPage/Captions/SkeletonFlip'), Mode=OneWay}"
+                                       Text="{x:Bind FlipDropDownHeader, Mode=OneWay}"
                                        Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center" />
 
                             <!--This is needed only for the teachingtip-->

diff --git a/Amethyst/Pages/Settings.xaml.cs b/Amethyst/Pages/Settings.xaml.cs
@@ -182,6 +182,9 @@ private string[] ServiceStatusText
     private string AutoStartTipContent => string.Format(Interfacing.LocalizedJsonString(
         "/NUX/Tip7/Content"), TrackingDevices.CurrentServiceEndpoint.Name);
 
+    private string FlipDropDownHeader => string.Format(Interfacing.LocalizedJsonString(
+        "/SettingsPage/Captions/SkeletonFlip"), TrackingDevices.BaseTrackingDevice.Name);
+
     private string ManageTrackersText
     {
         get