diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index 0e8e37b07d..6827cb8517 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -1387,6 +1387,9 @@ Off=Off [ScreenOptionsMemoryCard] Error mounting card: %s=Error mounting card: %s +(no label)=(no label) +size ???=size ??? +%dMB=%dMB [ScreenOptionsService] HeaderText=Options diff --git a/src/ScreenOptionsMemoryCard.cpp b/src/ScreenOptionsMemoryCard.cpp index c4b7b186a1..81b0ff8cc3 100644 --- a/src/ScreenOptionsMemoryCard.cpp +++ b/src/ScreenOptionsMemoryCard.cpp @@ -9,7 +9,6 @@ #include "LocalizedString.h" #include "OptionRowHandler.h" - REGISTER_SCREEN_CLASS( ScreenOptionsMemoryCard ); void ScreenOptionsMemoryCard::Init() @@ -42,22 +41,24 @@ bool ScreenOptionsMemoryCard::UpdateCurrentUsbStorageDevices() return aOldDevices != m_CurrentUsbStorageDevices; } +static LocalizedString NO_LABEL ("ScreenOptionsMemoryCard", "(no label)" ); +static LocalizedString SIZE_UNKNOWN ("ScreenOptionsMemoryCard", "size ???" ); +static LocalizedString VOLUME_SIZE ("ScreenOptionsMemoryCard", "%dMB" ); void ScreenOptionsMemoryCard::CreateMenu() { vector vHands; FOREACH_CONST( UsbStorageDevice, m_CurrentUsbStorageDevices, iter ) { - // TODO: Make these strings themable vector vs; if( iter->sVolumeLabel.empty() ) - vs.push_back( "(no label)" ); + vs.push_back( NO_LABEL ); else vs.push_back( iter->sVolumeLabel ); if( iter->iVolumeSizeMB == 0 ) - vs.push_back( "size ???" ); + vs.push_back( SIZE_UNKNOWN ); else - vs.push_back( ssprintf("%dMB",iter->iVolumeSizeMB) ); + vs.push_back( ssprintf(VOLUME_SIZE,iter->iVolumeSizeMB) ); vHands.push_back( OptionRowHandlerUtil::MakeNull() );