Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-20 17:41:13 +02:00
Code Issues Releases Wiki Activity

Define TranslatableString::Strip()

Browse Source
This commit is contained in:
Paul Licameli
2019-12-15 11:56:01 -05:00
parent 911e278e60
commit f16709945b
3 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Internat.cpp
View File

@@ -312,6 +312,37 @@ bool TranslatableString::IsVerbatim() const
return DoGetContext( mFormatter ) == NullContextName;
}
TranslatableString &TranslatableString::Strip( unsigned codes ) &
{
auto prevFormatter = mFormatter;
mFormatter = [prevFormatter, codes]
( const wxString & str, TranslatableString::Request request ) -> wxString {
switch ( request ) {
case Request::Context:
return TranslatableString::DoGetContext( prevFormatter );
case Request::Format:
case Request::DebugFormat:
default: {
bool debug = request == Request::DebugFormat;
auto result =
TranslatableString::DoSubstitute( prevFormatter, str, debug );
if ( codes & MenuCodes )
result = wxStripMenuCodes( result );
if ( codes & Ellipses ) {
if (result.EndsWith(wxT("...")))
result = result.Left( result.length() - 3 );
// Also check for the single-character Unicode ellipsis
else if (result.EndsWith(wxT("\u2026")))
result = result.Left( result.length() - 1 );
}
return result;
}
}
};
return *this;
}
wxString TranslatableString::DoGetContext( const Formatter &formatter )
{
return formatter ? formatter( {}, Request::Context ) : wxString{};

2
src/ShuttleGui.cpp
View File

@@ -2091,7 +2091,7 @@ void ShuttleGuiBase::UpdateSizersCore(bool bPrepend, int Flags, bool prompt)
mpWind->SetToolTip( mItem.mToolTip.Translation() );
if ( !mItem.mName.empty() )
mpWind->SetName( wxStripMenuCodes( mItem.mName.Translation() ) );
mpWind->SetName( mItem.mName.Strip().Translation() );
if ( !mItem.mNameSuffix.empty() )
mpWind->SetName(