Rename "System Language" to just "Language".

This commit is contained in:
The Dax 2013-09-04 07:59:19 -04:00
parent e0b33d818f
commit 3f6361831e
2 changed files with 9 additions and 8 deletions

View file

@ -219,6 +219,7 @@ void GameSettingsScreen::CreateViews() {
I18NCategory *a = GetI18NCategory("Audio");
I18NCategory *s = GetI18NCategory("System");
I18NCategory *ms = GetI18NCategory("MainSettings");
I18NCategory *dev = GetI18NCategory("Developer");
root_ = new AnchorLayout(new LayoutParams(FILL_PARENT, FILL_PARENT));
@ -366,7 +367,7 @@ void GameSettingsScreen::CreateViews() {
LinearLayout *list = root_->Add(new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(1.0f)));
systemSettings->SetSpacing(0);
systemSettings->Add(new ItemHeader(s->T("General")));
systemSettings->Add(new Choice(s->T("System Language", "Language")))->OnClick.Handle(this, &GameSettingsScreen::OnLanguage);
systemSettings->Add(new Choice(dev->T("Language", "Language")))->OnClick.Handle(this, &GameSettingsScreen::OnLanguage);
#ifdef _WIN32
// Screenshot functionality is not yet available on non-Windows
systemSettings->Add(new CheckBox(&g_Config.bScreenshotsAsPNG, s->T("Screenshots as PNG")));

View file

@ -280,7 +280,7 @@ namespace MainWindow
// Emulation submenus
SUBMENU_RENDERING_BACKEND = 11,
SUBMENU_SYSTEM_LANGUAGE = 18,
SUBMENU_LANGUAGE = 18,
// Game Settings submenus
SUBMENU_RENDERING_RESOLUTION = 4,
@ -299,24 +299,24 @@ namespace MainWindow
HMENU emulationSubMenu = GetSubMenu(menu, MENU_EMULATION);
systemLangMenu = CreatePopupMenu();
// Add a separator one position above the System Language Menu.
// Add a separator one position above the Language Menu.
// Remove this line if we end up moving it elsewhere and there's a separator above it.
InsertMenu(emulationSubMenu, SUBMENU_SYSTEM_LANGUAGE - 1, MF_SEPARATOR, 0, 0);
InsertMenu(emulationSubMenu, SUBMENU_LANGUAGE - 1, MF_SEPARATOR, 0, 0);
I18NCategory *c = GetI18NCategory("DesktopUI");
// Don't translate this right here, translate it in TranslateMenus. Think of it as a string defined in ppsspp.rc.
const std::wstring languageKey = L"System Language";
const std::wstring languageKey = L"Language";
// Insert the new menu.
InsertMenu(emulationSubMenu, SUBMENU_SYSTEM_LANGUAGE, MF_POPUP | MF_STRING | MF_BYPOSITION, (UINT_PTR)systemLangMenu, languageKey.c_str());
InsertMenu(emulationSubMenu, SUBMENU_LANGUAGE, MF_POPUP | MF_STRING | MF_BYPOSITION, (UINT_PTR)systemLangMenu, languageKey.c_str());
// Get the new menu's info and then set its ID so we can have it be translatable.
MENUITEMINFO mii;
memset(&mii, 0, sizeof(MENUITEMINFO));
mii.cbSize = sizeof(MENUITEMINFO);
GetMenuItemInfo(emulationSubMenu, SUBMENU_SYSTEM_LANGUAGE, TRUE, &mii);
GetMenuItemInfo(emulationSubMenu, SUBMENU_LANGUAGE, TRUE, &mii);
mii.fMask = MIIM_ID;
mii.wID = ID_LANGUAGE_BASE;
SetMenuItemInfo(emulationSubMenu, SUBMENU_SYSTEM_LANGUAGE, TRUE, &mii);
SetMenuItemInfo(emulationSubMenu, SUBMENU_LANGUAGE, TRUE, &mii);
// Create the System Language menu items by creating a new menu item for each
// language with its full name("English", "Magyar", etc.) as the value.