Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-03 06:03:13 +02:00
Code Issues Releases Wiki Activity

Don't concatenate ":" onto user-visible strings...

Browse Source 
... include it in the msgid intead, to get appropriate translations.  For
instance some locales use the same character but prefer to insert a space
before it.
This commit is contained in:
Paul Licameli 2019-12-04 15:56:48 -05:00
parent 674ac42de9
commit ca70cc940f
10 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/effects/NoiseReduction.cpp
View File

@ -1752,7 +1752,7 @@ void EffectNoiseReduction::Dialog::PopulateOrExchange(ShuttleGui & S)
{
S.StartMultiColumn(2);
{
S.TieChoice(_("&Window types") + wxString(wxT(":")),
S.TieChoice(_("&Window types:"),
mTempSettings.mWindowTypes,
[]{
wxArrayStringEx windowTypeChoices;
@ -1762,7 +1762,7 @@ void EffectNoiseReduction::Dialog::PopulateOrExchange(ShuttleGui & S)
}()
);
S.TieChoice(_("Window si&ze") + wxString(wxT(":")),
S.TieChoice(_("Window si&ze:")),
mTempSettings.mWindowSizeChoice,
{
_("8") ,
@ -1780,7 +1780,7 @@ void EffectNoiseReduction::Dialog::PopulateOrExchange(ShuttleGui & S)
}
);
S.TieChoice(_("S&teps per window") + wxString(wxT(":")),
S.TieChoice(_("S&teps per window:"),
mTempSettings.mStepsPerWindowChoice,
{
_("2") ,
@ -1793,7 +1793,7 @@ void EffectNoiseReduction::Dialog::PopulateOrExchange(ShuttleGui & S)
);
S.Id(ID_CHOICE_METHOD)
.TieChoice(_("Discrimination &method") + wxString(wxT(":")),
.TieChoice(_("Discrimination &method:"),
mTempSettings.mMethod,
[]{
wxArrayStringEx methodChoices;

13
src/effects/Reverb.cpp
View File

@ -543,12 +543,9 @@ SpinSliderHandlers(StereoWidth)
void EffectReverb::SetTitle(const wxString & name)
{
wxString title(_("Reverb"));
if (!name.empty())
{
title += wxT(": ") + name;
}
mUIDialog->SetTitle(title);
mUIDialog->SetTitle(
name.empty()
? _("Reverb")
: wxString::Format( _("Reverb: %s"), name )
);
}

4
src/effects/ladspa/LadspaEffect.cpp
View File

@ -1266,7 +1266,7 @@ bool LadspaEffect::PopulateUI(wxWindow *parent)
}
wxString labelText = LAT1CTOWX(mData->PortNames[p]);
item = safenew wxStaticText(w, 0, labelText + wxT(":"));
item = safenew wxStaticText(w, 0, wxString::Format(_("%s:"), labelText));
gridSizer->Add(item, 0, wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 5);
wxString fieldText;
@ -1442,7 +1442,7 @@ bool LadspaEffect::PopulateUI(wxWindow *parent)
}
wxString labelText = LAT1CTOWX(mData->PortNames[p]);
item = safenew wxStaticText(w, 0, labelText + wxT(":"));
item = safenew wxStaticText(w, 0, wxString::Format(_("%s:"), labelText));
gridSizer->Add(item, 0, wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 5);
//LADSPA_PortRangeHint hint = mData->PortRangeHints[p];

2
src/effects/lv2/LV2Effect.cpp
View File

@ -1632,7 +1632,7 @@ bool LV2Effect::BuildPlain()
continue;
}
wxWindow *item = safenew wxStaticText(w, wxID_ANY, labelText + wxT(":"),
wxWindow *item = safenew wxStaticText(w, wxID_ANY, wxString::Format(_("%s:"), labelText),
wxDefaultPosition, wxDefaultSize,
wxALIGN_RIGHT);
gridSizer->Add(item, 0, wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT);

2
src/effects/nyquist/Nyquist.cpp
View File

@ -2627,7 +2627,7 @@ void NyquistEffect::BuildEffectWindow(ShuttleGui & S)
}
else
{
wxString prompt = ctrl.name + wxT(":");
auto prompt = wxString::Format(_("%s:"), ctrl.name);
S.AddPrompt(prompt);
if (ctrl.type == NYQ_CTRL_STRING)

4
src/effects/vamp/VampEffect.cpp
View File

@ -597,7 +597,9 @@ void VampEffect::PopulateOrExchange(ShuttleGui & S)
{
labelText += wxT(" (") + unit + wxT(")");
}
S.AddPrompt(labelText + wxT(":"));
/* i18n-hint: An item name introducing a value, which is not part of the string but
appears in a following text box window; translate with appropriate punctuation */
S.AddPrompt(wxString::Format(_("%s:"), labelText));
if (mParameters[p].isQuantized &&
mParameters[p].quantizeStep == 1.0 &&

11
src/menus/PluginMenus.cpp
View File

@ -334,12 +334,11 @@ void AddEffectMenuItems(
group = wxEmptyString;
}
if (!group.empty())
{
group += wxT(": ");
}
groupNames.push_back(group + name);
groupNames.push_back(
group.empty()
? name
: wxString::Format(_("%s: %s"), group, name)
);
vHasDialog.push_back(hasDialog);
groupPlugs.push_back(plug->GetID());
groupFlags.push_back(

6
src/prefs/SpectrumPrefs.cpp
View File

@ -188,7 +188,7 @@ void SpectrumPrefs::PopulateOrExchange(ShuttleGui & S)
{
S.SetStretchyCol( 0 );
S.SetStretchyCol( 1 );
S.Id(ID_SCALE).TieChoice(_("S&cale") + wxString(wxT(":")),
S.Id(ID_SCALE).TieChoice(_("S&cale:"),
mTempSettings.scaleType,
SpectrogramSettings::GetScaleNames());
mMinFreq =
@ -238,7 +238,7 @@ void SpectrumPrefs::PopulateOrExchange(ShuttleGui & S)
S.StartMultiColumn(2);
{
mAlgorithmChoice =
S.Id(ID_ALGORITHM).TieChoice(_("A&lgorithm") + wxString(wxT(":")),
S.Id(ID_ALGORITHM).TieChoice(_("A&lgorithm:"),
mTempSettings.algorithm,
SpectrogramSettings::GetAlgorithmNames());
@ -267,7 +267,7 @@ void SpectrumPrefs::PopulateOrExchange(ShuttleGui & S)
#ifdef EXPERIMENTAL_ZERO_PADDED_SPECTROGRAMS
mZeroPaddingChoiceCtrl =
S.Id(ID_PADDING_SIZE).TieChoice(_("&Zero padding factor") + wxString(wxT(":")),
S.Id(ID_PADDING_SIZE).TieChoice(_("&Zero padding factor:"),
mTempSettings.zeroPaddingFactor,
mZeroPaddingChoices);
#endif

4
src/prefs/WaveformPrefs.cpp
View File

@ -108,12 +108,12 @@ void WaveformPrefs::PopulateOrExchange(ShuttleGui & S)
S.StartTwoColumn();
{
mScaleChoice =
S.Id(ID_SCALE).TieChoice(_("S&cale") + wxString(wxT(":")),
S.Id(ID_SCALE).TieChoice(_("S&cale:"),
mTempSettings.scaleType,
WaveformSettings::GetScaleNames());
mRangeChoice =
S.Id(ID_RANGE).TieChoice(_("Waveform dB &range") + wxString(wxT(":")),
S.Id(ID_RANGE).TieChoice(_("Waveform dB &range:"),
mTempSettings.dBRange,
mRangeChoices);
}

3
src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp
View File

@ -819,7 +819,8 @@ void WaveTrackMenuTable::OnSpectrogramSettings(wxCommandEvent &)
// (pTrack->GetDisplay() == WaveTrack::Spectrum) ? 1 :
0;
wxString title(pTrack->GetName() + wxT(": "));
/* i18n-hint: An item name followed by a value, with appropriate separating punctuation */
auto title = wxString::Format(_("%s: %s"), pTrack->GetName(), wxT(""));
ViewSettingsDialog dialog(mpData->pParent, title, factories, page);
if (0 != dialog.ShowModal()) {