diff --git a/projects/mtg/src/DeckMetaData.cpp b/projects/mtg/src/DeckMetaData.cpp index 6753160dd..b53b98008 100644 --- a/projects/mtg/src/DeckMetaData.cpp +++ b/projects/mtg/src/DeckMetaData.cpp @@ -166,14 +166,14 @@ int DeckMetaData::getDifficulty() string DeckMetaData::getDifficultyString() { - string difficultyString = "Normal"; + string difficultyString = _("Normal").c_str(); switch (mDifficulty) { case HARD: - difficultyString = "Hard"; + difficultyString = _("Hard").c_str(); break; case EASY: - difficultyString = "Easy"; + difficultyString = _("Easy").c_str(); break; } @@ -190,9 +190,9 @@ string DeckMetaData::getStatsSummary() LoadStats(); ostringstream statsSummary; - statsSummary << _("Difficulty: ") << _(getDifficultyString()) << endl - << _("Victory %: ") << getVictoryPercentage() << endl - << _("Games Played: ") << getGamesPlayed() << endl; + statsSummary << _("Difficulty: ").c_str() << _(getDifficultyString()) << endl + << _("Victory %: ").c_str() << getVictoryPercentage() << endl + << _("Games Played: ").c_str() << getGamesPlayed() << endl; return statsSummary.str(); } diff --git a/projects/mtg/src/GameStateDeckViewer.cpp b/projects/mtg/src/GameStateDeckViewer.cpp index 263ba58ba..314341140 100644 --- a/projects/mtg/src/GameStateDeckViewer.cpp +++ b/projects/mtg/src/GameStateDeckViewer.cpp @@ -197,7 +197,7 @@ void GameStateDeckViewer::updateDecks() void GameStateDeckViewer::buildEditorMenu() { ostringstream deckSummaryInformation; - deckSummaryInformation << "All changes are final." << endl; + deckSummaryInformation << _("All changes are final.").c_str() << endl; if (menu) SAFE_DELETE( menu ); @@ -205,13 +205,13 @@ void GameStateDeckViewer::buildEditorMenu() JRenderer::GetInstance()->FillRoundRect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 100, ARGB(0, 0, 0, 0) ); menu = NEW DeckEditorMenu(MENU_DECK_BUILDER, this, Fonts::OPTION_FONT, "Deck Editor", myDeck, stw); - menu->Add(MENU_ITEM_FILTER_BY, "Filter By...", "Narrow down the list of cards. "); - menu->Add(MENU_ITEM_SWITCH_DECKS_NO_SAVE, "Switch Decks", "Do not make any changes.\nView another deck."); - menu->Add(MENU_ITEM_SAVE_RENAME, "Rename Deck", "Change the name of the deck"); - menu->Add(MENU_ITEM_SAVE_RETURN_MAIN_MENU, "Save & Quit Editor", "Save changes.\nReturn to the main menu"); - menu->Add(MENU_ITEM_SAVE_AS_AI_DECK, "Save As AI Deck", deckSummaryInformation.str()); - menu->Add(MENU_ITEM_MAIN_MENU, "Quit Editor", "Do not make any changes to deck.\nReturn to the main menu."); - menu->Add(MENU_ITEM_EDITOR_CANCEL, "Cancel", "Close menu."); + menu->Add(MENU_ITEM_FILTER_BY, _("Filter By...").c_str(), _("Narrow down the list of cards. ").c_str()); + menu->Add(MENU_ITEM_SWITCH_DECKS_NO_SAVE, _("Switch Decks").c_str(), _("Do not make any changes.\nView another deck.").c_str()); + menu->Add(MENU_ITEM_SAVE_RENAME, _("Rename Deck").c_str(), _("Change the name of the deck").c_str()); + menu->Add(MENU_ITEM_SAVE_RETURN_MAIN_MENU, _("Save & Quit Editor").c_str(), _("Save changes.\nReturn to the main menu").c_str()); + menu->Add(MENU_ITEM_SAVE_AS_AI_DECK, _("Save As AI Deck").c_str(), deckSummaryInformation.str()); + menu->Add(MENU_ITEM_MAIN_MENU, _("Quit Editor").c_str(), _("Do not make any changes to deck.\nReturn to the main menu.").c_str()); + menu->Add(MENU_ITEM_EDITOR_CANCEL, _("Cancel").c_str(), _("Close menu.").c_str()); } diff --git a/projects/mtg/src/GameStateDuel.cpp b/projects/mtg/src/GameStateDuel.cpp index 0b445ba19..a222663a6 100644 --- a/projects/mtg/src/GameStateDuel.cpp +++ b/projects/mtg/src/GameStateDuel.cpp @@ -170,21 +170,21 @@ void GameStateDuel::Start() { //translate deck creating desc Translator * t = Translator::GetInstance(); - string desc = "Highly recommended to get\nthe full Wagic experience!"; - map::iterator it = t->deckValues.find("Create your Deck!"); + string desc = _("Highly recommended to get\nthe full Wagic experience!").c_str(); + map::iterator it = t->deckValues.find(_("Create your Deck!").c_str()); if (it != t->deckValues.end()) desc = it->second; - deckmenu->Add(MENUITEM_NEW_DECK, "Create your Deck!", desc); + deckmenu->Add(MENUITEM_NEW_DECK, _("Create your Deck!").c_str(), desc); } premadeDeck = true; - fillDeckMenu(deckmenu, "player/premade"); + fillDeckMenu(deckmenu, _("player/premade").c_str()); } else if (gModRules.general.hasDeckEditor()) { - deckmenu->Add(MENUITEM_NEW_DECK, "New Deck...", "Create a new deck to play with."); + deckmenu->Add(MENUITEM_NEW_DECK, _("New Deck...").c_str(), _("Create a new deck to play with.").c_str()); } - deckmenu->Add(MENUITEM_CANCEL, "Main Menu", "Return to Main Menu"); + deckmenu->Add(MENUITEM_CANCEL, _("Main Menu").c_str(), _("Return to Main Menu").c_str()); } mEngine->ResetInput(); @@ -696,7 +696,7 @@ void GameStateDuel::Render() { opponentMenu->Render(); // display the selected player deck name too - string selectedPlayerDeckName = "Player Deck: " + game->players[0]->deckName; + string selectedPlayerDeckName = _("Player Deck: ").c_str() + game->players[0]->deckName; mFont->DrawString( selectedPlayerDeckName.c_str(), 30, 40); } else if (deckmenu && !deckmenu->isClosed()) deckmenu->Render(); diff --git a/projects/mtg/src/GameStateMenu.cpp b/projects/mtg/src/GameStateMenu.cpp index b686e2472..0937650d5 100644 --- a/projects/mtg/src/GameStateMenu.cpp +++ b/projects/mtg/src/GameStateMenu.cpp @@ -731,9 +731,9 @@ void GameStateMenu::Render() else { if (primitivesLoadCounter <= (int) (primitives.size())) - sprintf(text, "LOADING PRIMITIVES"); + sprintf(text, _("LOADING PRIMITIVES").c_str()); else - sprintf(text, "LOADING..."); + sprintf(text, _("LOADING...").c_str()); } mFont->SetColor(ARGB(170,0,0,0)); mFont->DrawString(text, SCREEN_WIDTH / 2 + 2, SCREEN_HEIGHT - 50 + 2, JGETEXT_CENTER); @@ -792,15 +792,15 @@ void GameStateMenu::ButtonPressed(int controllerId, int controlId) #ifdef NETWORK_SUPPORT subMenuController->Add(SUBMENUITEM_1PLAYER, "1 Player"); #else - subMenuController->Add(SUBMENUITEM_1PLAYER, "Play Game"); + subMenuController->Add(SUBMENUITEM_1PLAYER, _("Play Game").c_str()); #endif // TODO Put 2 players mode back // This requires to fix the hand (to accept 2 players) OR to implement network game #ifdef NETWORK_SUPPORT subMenuController->Add(SUBMENUITEM_2PLAYERS, "2 Players"); #endif //NETWORK_SUPPORT - subMenuController->Add(SUBMENUITEM_DEMO, "Demo"); - subMenuController->Add(SUBMENUITEM_CANCEL, "Cancel"); + subMenuController->Add(SUBMENUITEM_DEMO, _("Demo").c_str()); + subMenuController->Add(SUBMENUITEM_CANCEL, _("Cancel").c_str()); #ifdef TESTSUITE if (Rules::getRulesByFilename("testsuite.txt")) subMenuController->Add(SUBMENUITEM_TESTSUITE, "Test Suite"); diff --git a/projects/mtg/src/GameStateShop.cpp b/projects/mtg/src/GameStateShop.cpp index 29d7042cc..2238105c9 100644 --- a/projects/mtg/src/GameStateShop.cpp +++ b/projects/mtg/src/GameStateShop.cpp @@ -222,7 +222,7 @@ void GameStateShop::beginPurchase(int controlId) menu->Add(-1, "Ok"); if (options[Options::CHEATMODE].number) { - menu->Add(-2, "Steal it"); + menu->Add(-2, _("Steal it").c_str()); } } else @@ -488,12 +488,12 @@ void GameStateShop::Update(float dt) else { menu = NEW SimpleMenu(JGE::GetInstance(), 11, this, Fonts::MENU_FONT, SCREEN_WIDTH / 2 - 100, 20); - menu->Add(22, "Ask about..."); - menu->Add(14, "Check task board"); + menu->Add(22, _("Ask about...").c_str()); + menu->Add(14, _("Check task board").c_str()); if (options[Options::CHEATMODE].number) - menu->Add(-2, "Steal 1,000 credits"); - menu->Add(12, "Save And Exit"); - menu->Add(kCancelMenuID, "Cancel"); + menu->Add(-2, _("Steal 1,000 credits").c_str()); + menu->Add(12, _("Save And Exit").c_str()); + menu->Add(kCancelMenuID, _("Cancel").c_str()); } break; case STAGE_SHOP_TASKS: