From d8122e441e6ed201de914aa0e740660462abbdc2 Mon Sep 17 00:00:00 2001 From: linshier Date: Wed, 29 Sep 2010 08:18:09 +0000 Subject: [PATCH] Tweaked translation codes for deck and opponents choosing menus. --- projects/mtg/bin/Res/lang/cn.txt | 8 ++++++-- projects/mtg/src/GameState.cpp | 2 ++ projects/mtg/src/GameStateDeckViewer.cpp | 4 ++-- projects/mtg/src/GameStateDuel.cpp | 12 ++++++------ 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/projects/mtg/bin/Res/lang/cn.txt b/projects/mtg/bin/Res/lang/cn.txt index 5ce03031e..322c251d7 100644 --- a/projects/mtg/bin/Res/lang/cn.txt +++ b/projects/mtg/bin/Res/lang/cn.txt @@ -110,8 +110,10 @@ Random 2 Colors= # Player deck menu: Choose a Deck=选择一个套牌 Create your Deck!=创建属于自己的套牌 -Premade G/R=预置的红绿套牌 +##Premade G/R预置的红绿套牌 New Deck...=新建套牌…… +Main Menu=游戏主菜单 +Return to Main Menu=返回游戏主菜单 NO DECK AVAILABLE,=没有可用的套牌， PRESS CIRCLE TO GO TO THE DECK EDITOR!=按○键返回套牌编辑界面！ @@ -120,8 +122,10 @@ Choose Opponent=选 ##(easy)=（简单） ##(hard)=（困难） Random=随机 -Evil Twin=恶魔双子 +##Evil Twin恶魔双子 LOADING DECKS=加载套牌 +Can you play against yourself?=你能击败你自己吗？ +Choose a different player deck=重新选择一个套牌进行游戏 ########################## diff --git a/projects/mtg/src/GameState.cpp b/projects/mtg/src/GameState.cpp index bd6efa806..d4fc61286 100644 --- a/projects/mtg/src/GameState.cpp +++ b/projects/mtg/src/GameState.cpp @@ -14,9 +14,11 @@ // sortByName to do the sorting. This was done since the menu item display is done in insertion order. vector GameState::fillDeckMenu( SimpleMenu * _menu, string path, string smallDeckPrefix, Player * statsPlayer){ + bool translate = _menu->autoTranslate; _menu->autoTranslate = false; vector deckMetaDataVector = getValidDeckMetaData( path, smallDeckPrefix, statsPlayer ); renderDeckMenu( _menu, deckMetaDataVector); + _menu->autoTranslate = translate; return deckMetaDataVector; } diff --git a/projects/mtg/src/GameStateDeckViewer.cpp b/projects/mtg/src/GameStateDeckViewer.cpp index c110a856f..ebda3c7a0 100644 --- a/projects/mtg/src/GameStateDeckViewer.cpp +++ b/projects/mtg/src/GameStateDeckViewer.cpp @@ -139,10 +139,10 @@ void GameStateDeckViewer::updateDecks(){ deckNum = 0; newDeckname = ""; nbDecks = playerDeckList.size() + 1; - welcome_menu->Add( MENU_ITEM_NEW_DECK, _("--NEW--").c_str() ); + welcome_menu->Add( MENU_ITEM_NEW_DECK, "--NEW--"); if(options[Options::CHEATMODE].number && (!myCollection || myCollection->getCount(WSrcDeck::UNFILTERED_MIN_COPIES) < 4)) welcome_menu->Add( MENU_ITEM_CHEAT_MODE, "--UNLOCK CARDS--" ); - welcome_menu->Add( MENU_ITEM_CANCEL, _("Cancel").c_str() ); + welcome_menu->Add( MENU_ITEM_CANCEL, "Cancel"); // update the deckmanager with the latest information deckManager->updateMetaDataList( &playerDeckList, false); diff --git a/projects/mtg/src/GameStateDuel.cpp b/projects/mtg/src/GameStateDuel.cpp index 7896b094d..eaf6b8129 100644 --- a/projects/mtg/src/GameStateDuel.cpp +++ b/projects/mtg/src/GameStateDuel.cpp @@ -118,14 +118,14 @@ void GameStateDuel::Start() Translator * t = Translator::GetInstance(); map::iterator it = t->deckValues.find("Create your Deck!"); if (it != t->deckValues.end()) - deckmenu->Add( MENUITEM_NEW_DECK, _("Create your Deck!").c_str(), it->second); + deckmenu->Add( MENUITEM_NEW_DECK, "Create your Deck!", it->second); else - deckmenu->Add( MENUITEM_NEW_DECK, _("Create your Deck!").c_str(),"Highly recommended to get\nthe full Wagic experience!"); + deckmenu->Add( MENUITEM_NEW_DECK, "Create your Deck!", "Highly recommended to get\nthe full Wagic experience!"); premadeDeck = true; fillDeckMenu(deckmenu,RESPATH"/player/premade"); } - deckmenu->Add( MENUITEM_NEW_DECK, _("New Deck...").c_str()); - deckmenu->Add( MENUITEM_MAIN_MENU, "Main Menu", "Return to Main Menu" ); + deckmenu->Add( MENUITEM_NEW_DECK, "New Deck..."); + deckmenu->Add( MENUITEM_MAIN_MENU, "Main Menu", _("Return to Main Menu").c_str()); } for (int i = 0; i < 2; ++i){ @@ -239,11 +239,11 @@ void GameStateDuel::ensureOpponentMenu(){ opponentMenu = NEW SimpleMenu(DUEL_MENU_CHOOSE_OPPONENT, this, Constants::MENU_FONT, 35, 25, "Choose Opponent"); opponentMenu->Add( MENUITEM_RANDOM_AI, "Random"); if (options[Options::EVILTWIN_MODE_UNLOCKED].number) - opponentMenu->Add( MENUITEM_EVIL_TWIN, "Evil Twin", "Can you play against yourself?"); + opponentMenu->Add( MENUITEM_EVIL_TWIN, "Evil Twin", _("Can you play against yourself?").c_str()); DeckManager * deckManager = DeckManager::GetInstance(); vector opponentDeckList = fillDeckMenu( opponentMenu, RESPATH"/ai/baka", "ai_baka", mPlayers[0]); deckManager->updateMetaDataList(&opponentDeckList, true); - opponentMenu->Add( MENUITEM_CANCEL, "Cancel", "Choose a different player deck"); + opponentMenu->Add( MENUITEM_CANCEL, "Cancel", _("Choose a different player deck").c_str()); opponentDeckList.clear(); } }