From a09555daaaefaae0abbf4b0f867223ee8f6457ef Mon Sep 17 00:00:00 2001 From: sum2012 Date: Sun, 17 Aug 2014 21:15:51 +0800 Subject: [PATCH] Remove chinese forum --- UI/MiscScreens.cpp | 16 ++-------------- Windows/WndMainWindow.cpp | 4 ---- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp index 560536210a..e91c6ea952 100644 --- a/UI/MiscScreens.cpp +++ b/UI/MiscScreens.cpp @@ -451,15 +451,8 @@ void CreditsScreen::CreateViews() { #ifndef GOLD root_->Add(new Button(c->T("Buy Gold"), new AnchorLayoutParams(260, 64, 10, NONE, NONE, 10, false)))->OnClick.Handle(this, &CreditsScreen::OnSupport); #endif - if (g_Config.sLanguageIni == "zh_CN" ||g_Config.sLanguageIni == "zh_TW") { - root_->Add(new Button(c->T("PPSSPP Chinese Forum"), new AnchorLayoutParams(260, 64, 10, NONE, NONE, 84, false)))->OnClick.Handle(this, &CreditsScreen::OnChineseForum); - root_->Add(new Button(c->T("PPSSPP Forums"), new AnchorLayoutParams(260, 64, 10, NONE, NONE, 154, false)))->OnClick.Handle(this, &CreditsScreen::OnForums); - root_->Add(new Button("www.ppsspp.org", new AnchorLayoutParams(260, 64, 10, NONE, NONE, 228, false)))->OnClick.Handle(this, &CreditsScreen::OnPPSSPPOrg); - } - else { - root_->Add(new Button(c->T("PPSSPP Forums"), new AnchorLayoutParams(260, 64, 10, NONE, NONE, 84, false)))->OnClick.Handle(this, &CreditsScreen::OnForums); - root_->Add(new Button("www.ppsspp.org", new AnchorLayoutParams(260, 64, 10, NONE, NONE, 158, false)))->OnClick.Handle(this, &CreditsScreen::OnPPSSPPOrg); - } + root_->Add(new Button(c->T("PPSSPP Forums"), new AnchorLayoutParams(260, 64, 10, NONE, NONE, 84, false)))->OnClick.Handle(this, &CreditsScreen::OnForums); + root_->Add(new Button("www.ppsspp.org", new AnchorLayoutParams(260, 64, 10, NONE, NONE, 158, false)))->OnClick.Handle(this, &CreditsScreen::OnPPSSPPOrg); #ifdef ANDROID root_->Add(new Button(c->T("Share PPSSPP"), new AnchorLayoutParams(260, 64, NONE, NONE, 10, 84, false)))->OnClick.Handle(this, &CreditsScreen::OnShare); root_->Add(new Button(c->T("Twitter @PPSSPP_emu"), new AnchorLayoutParams(260, 64, NONE, NONE, 10, 154, false)))->OnClick.Handle(this, &CreditsScreen::OnTwitter); @@ -499,11 +492,6 @@ UI::EventReturn CreditsScreen::OnForums(UI::EventParams &e) { return UI::EVENT_DONE; } -UI::EventReturn CreditsScreen::OnChineseForum(UI::EventParams &e) { - LaunchBrowser("http://tieba.baidu.com/f?ie=utf-8&kw=ppsspp"); - return UI::EVENT_DONE; -} - UI::EventReturn CreditsScreen::OnShare(UI::EventParams &e) { I18NCategory *c = GetI18NCategory("PSPCredits"); System_SendMessage("sharetext", c->T("CheckOutPPSSPP", "Check out PPSSPP, the awesome PSP emulator: http://www.ppsspp.org/")); diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp index ad1e418adb..29b68e9d2c 100644 --- a/Windows/WndMainWindow.cpp +++ b/Windows/WndMainWindow.cpp @@ -515,10 +515,6 @@ namespace MainWindow AppendMenu(helpMenu, MF_STRING | MF_BYCOMMAND, ID_HELP_OPENWEBSITE, visitMainWebsite.c_str()); AppendMenu(helpMenu, MF_STRING | MF_BYCOMMAND, ID_HELP_OPENFORUM, visitForum.c_str()); // Repeat the process for other languages, if necessary. - if(g_Config.sLanguageIni == "zh_CN" || g_Config.sLanguageIni == "zh_TW") { - const std::wstring visitChineseForum = ConvertUTF8ToWString(des->T("PPSSPP Chinese Forum")); - AppendMenu(helpMenu, MF_STRING | MF_BYCOMMAND, ID_HELP_CHINESE_FORUM, visitChineseForum.c_str()); - } AppendMenu(helpMenu, MF_STRING | MF_BYCOMMAND, ID_HELP_BUYGOLD, buyGold.c_str()); AppendMenu(helpMenu, MF_SEPARATOR, 0, 0); AppendMenu(helpMenu, MF_STRING | MF_BYCOMMAND, ID_HELP_ABOUT, aboutPPSSPP.c_str());