TranslatableString for more scale and algorithm names

src/prefs/SpectrogramSettings.cpp

@@ -159,25 +159,17 @@ const TranslatableStrings &SpectrogramSettings::GetScaleNames()
 }
 
 //static
-const wxArrayStringEx &SpectrogramSettings::GetAlgorithmNames()
+const TranslatableStrings &SpectrogramSettings::GetAlgorithmNames()
 {
-   class AlgorithmNamesArray final : public TranslatableStringArray
+   static const TranslatableStrings results{
-   {
+      // Keep in correspondence with enum SpectrogramSettings::Algorithm:
-      void Populate() override
+      XO("Frequencies") ,
-      {
+      /* i18n-hint: the Reassignment algorithm for spectrograms */
-         mContents.insert( mContents.end(), {
+      XO("Reassignment") ,
-            // Keep in correspondence with enum SpectrogramSettings::Algorithm:
+      /* i18n-hint: EAC abbreviates "Enhanced Autocorrelation" */
-            _("Frequencies") ,
+      XO("Pitch (EAC)") ,
-            /* i18n-hint: the Reassignment algorithm for spectrograms */
-            _("Reassignment") ,
-            /* i18n-hint: EAC abbreviates "Enhanced Autocorrelation" */
-            _("Pitch (EAC)") ,
-         } );
-      }
    };
-
+   return results;
-   static AlgorithmNamesArray theArray;
-   return theArray.Get();
 }
 
 bool SpectrogramSettings::Validate(bool quiet)

src/prefs/SpectrogramSettings.h

@@ -67,7 +67,7 @@ public:
    };
 
    static const TranslatableStrings &GetScaleNames();
-   static const wxArrayStringEx &GetAlgorithmNames();
+   static const TranslatableStrings &GetAlgorithmNames();
 
    static SpectrogramSettings &defaults();
    SpectrogramSettings();

src/prefs/SpectrumPrefs.cpp

@@ -242,7 +242,9 @@ void SpectrumPrefs::PopulateOrExchange(ShuttleGui & S)
          mAlgorithmChoice =
             S.Id(ID_ALGORITHM).TieChoice(_("A&lgorithm:"),
             mTempSettings.algorithm,
-            SpectrogramSettings::GetAlgorithmNames());
+            transform_container<wxArrayStringEx>(
+               SpectrogramSettings::GetAlgorithmNames(),
+               std::mem_fn( &TranslatableString::Translation ) ) );
 
          S.Id(ID_WINDOW_SIZE).TieChoice(_("Window &size:"),
             mTempSettings.windowSize,

src/prefs/WaveformPrefs.cpp

@@ -110,7 +110,9 @@ void WaveformPrefs::PopulateOrExchange(ShuttleGui & S)
             mScaleChoice =
                S.Id(ID_SCALE).TieChoice(_("S&cale:"),
                   mTempSettings.scaleType,
-                  WaveformSettings::GetScaleNames());
+                  transform_container<wxArrayStringEx>(
+                     WaveformSettings::GetScaleNames(),
+                     std::mem_fn( &TranslatableString::Translation ) ) );
 
             mRangeChoice =
                S.Id(ID_RANGE).TieChoice(_("Waveform dB &range:"),

src/prefs/WaveformSettings.cpp

@@ -147,20 +147,14 @@ void WaveformSettings::NextHigherDBRange()
 }
 
 //static
-const wxArrayStringEx &WaveformSettings::GetScaleNames()
+const TranslatableStrings &WaveformSettings::GetScaleNames()
 {
-   class ScaleNamesArray final : public TranslatableStringArray
+   static const TranslatableStrings result{
-   {
+      // Keep in correspondence with enum WaveTrack::WaveTrackDisplay:
-      void Populate() override
+      XO("Linear"),
-      {
+      XO("Logarithmic"),
-         // Keep in correspondence with enum WaveTrack::WaveTrackDisplay:
-         mContents.push_back(_("Linear"));
-         mContents.push_back(_("Logarithmic"));
-      }
    };
-
+   return result;
-   static ScaleNamesArray theArray;
-   return theArray.Get();
 }
 
 WaveformSettings::~WaveformSettings()

src/prefs/WaveformSettings.h

@@ -11,7 +11,7 @@ Paul Licameli
 #ifndef __AUDACITY_WAVEFORM_SETTINGS__
 #define __AUDACITY_WAVEFORM_SETTINGS__
 
-class wxArrayStringEx;
+#include "../Internat.h" // for TranslatableStrings
 
 class WaveformSettings
 {
@@ -58,7 +58,7 @@ public:
       stNumScaleTypes,
    };
 
-   static const wxArrayStringEx &GetScaleNames();
+   static const TranslatableStrings &GetScaleNames();
 
    ScaleType scaleType;
    int dBRange;