From 62835aad40133f74a199a79c170a15478185ee7f Mon Sep 17 00:00:00 2001 From: Yaroslav Date: Sun, 11 Aug 2013 22:25:50 +0700 Subject: [PATCH] Make more strings translatable. --- Core/Dialog/PSPSaveDialog.cpp | 2 +- UI/GameScreen.cpp | 5 +++-- UI/GameSettingsScreen.cpp | 9 +++++---- UI/MainScreen.cpp | 33 +++++++++++++++++++-------------- UI/MenuScreens.cpp | 8 +++++--- UI/PluginScreen.cpp | 2 +- 6 files changed, 34 insertions(+), 25 deletions(-) diff --git a/Core/Dialog/PSPSaveDialog.cpp b/Core/Dialog/PSPSaveDialog.cpp index d47d68a994..ae8f15ab5c 100755 --- a/Core/Dialog/PSPSaveDialog.cpp +++ b/Core/Dialog/PSPSaveDialog.cpp @@ -631,7 +631,7 @@ int PSPSaveDialog::Update() DisplaySaveIcon(); DisplaySaveDataInfo2(); - DisplayMessage(d->T("Do you want to overwrite the data?"), true); + DisplayMessage(d->T("Confirm Overwrite","Do you want to overwrite the data?"), true); DisplayButtons(DS_BUTTON_OK | DS_BUTTON_CANCEL); DisplayBanner(DB_SAVE); diff --git a/UI/GameScreen.cpp b/UI/GameScreen.cpp index 00928333b7..d990515908 100644 --- a/UI/GameScreen.cpp +++ b/UI/GameScreen.cpp @@ -100,6 +100,7 @@ void GameScreen::DrawBackground(UIContext &dc) { void GameScreen::update(InputState &input) { UIScreen::update(input); + I18NCategory *g = GetI18NCategory("General"); GameInfo *info = g_gameInfoCache.GetInfo(gamePath_, true); if (tvTitle_) @@ -112,9 +113,9 @@ void GameScreen::update(InputState &input) { if (info->gameSize) { char temp[256]; - sprintf(temp, "Game: %1.1f MB", (float)(info->gameSize) / 1024.f / 1024.f); + sprintf(temp, "%s: %1.1f %s", g->T("Game"), (float) (info->gameSize) / 1024.f / 1024.f, g->T("MB")); tvGameSize_->SetText(temp); - sprintf(temp, "SaveData: %1.2f MB", (float)(info->saveDataSize) / 1024.f / 1024.f); + sprintf(temp, "%s: %1.2f %s", g->T("SaveData"), (float) (info->saveDataSize) / 1024.f / 1024.f, g->T("MB")); tvSaveDataSize_->SetText(temp); } } diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 83baf7b788..c622886c7b 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -179,6 +179,7 @@ void GameSettingsScreen::CreateViews() { I18NCategory *c = GetI18NCategory("Controls"); I18NCategory *a = GetI18NCategory("Audio"); I18NCategory *s = GetI18NCategory("System"); + I18NCategory *ms = GetI18NCategory("MainSettings"); Margins actionMenuMargins(0, 0, 15, 0); @@ -200,7 +201,7 @@ void GameSettingsScreen::CreateViews() { ViewGroup *graphicsSettingsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT)); ViewGroup *graphicsSettings = new LinearLayout(ORIENT_VERTICAL); graphicsSettingsScroll->Add(graphicsSettings); - tabHolder->AddTab("Graphics", graphicsSettingsScroll); + tabHolder->AddTab(ms->T("Graphics"), graphicsSettingsScroll); graphicsSettings->Add(new ItemHeader(gs->T("Rendering Mode"))); #ifndef USING_GLES2 @@ -250,7 +251,7 @@ void GameSettingsScreen::CreateViews() { ViewGroup *audioSettingsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT)); ViewGroup *audioSettings = new LinearLayout(ORIENT_VERTICAL); audioSettingsScroll->Add(audioSettings); - tabHolder->AddTab("Audio", audioSettingsScroll); + tabHolder->AddTab(ms->T("Audio"), audioSettingsScroll); std::string atracString; atracString.assign(Atrac3plus_Decoder::IsInstalled() ? "Redownload Atrac3+ plugin" : "Download Atrac3+ plugin"); @@ -265,7 +266,7 @@ void GameSettingsScreen::CreateViews() { ViewGroup *controlsSettingsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT)); ViewGroup *controlsSettings = new LinearLayout(ORIENT_VERTICAL); controlsSettingsScroll->Add(controlsSettings); - tabHolder->AddTab("Controls", controlsSettingsScroll); + tabHolder->AddTab(ms->T("Controls"), controlsSettingsScroll); controlsSettings->Add(new CheckBox(&g_Config.bShowTouchControls, c->T("OnScreen", "On-Screen Touch Controls"))); controlsSettings->Add(new CheckBox(&g_Config.bShowAnalogStick, c->T("Show Left Analog Stick"))); controlsSettings->Add(new CheckBox(&g_Config.bAccelerometerToAnalogHoriz, c->T("Tilt", "Tilt to Analog (horizontal)"))); @@ -276,7 +277,7 @@ void GameSettingsScreen::CreateViews() { ViewGroup *systemSettingsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT)); ViewGroup *systemSettings = new LinearLayout(ORIENT_VERTICAL); systemSettingsScroll->Add(systemSettings); - tabHolder->AddTab("System", systemSettingsScroll); + tabHolder->AddTab(ms->T("System"), systemSettingsScroll); systemSettings->Add(new CheckBox(&g_Config.bJit, s->T("Dynarec", "Dynarec (JIT)"))); systemSettings->Add(new CheckBox(&g_Config.bSeparateCPUThread, s->T("Multithreaded (experimental)"))); systemSettings->Add(new CheckBox(&g_Config.bFastMemory, s->T("Fast Memory", "Fast Memory (Unstable)"))); diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp index 261cc619a1..c6b0aba134 100644 --- a/UI/MainScreen.cpp +++ b/UI/MainScreen.cpp @@ -35,6 +35,7 @@ #include "UI/ui_atlas.h" #include "Core/Config.h" #include "GPU/GPUInterface.h" +#include "i18n/i18n.h" #ifdef _WIN32 namespace MainWindow { @@ -338,6 +339,8 @@ void MainScreen::CreateViews() { // Scrolling action menu to the right. using namespace UI; + I18NCategory *m = GetI18NCategory("MainMenu"); + Margins actionMenuMargins(0, 100, 15, 0); root_ = new LinearLayout(ORIENT_HORIZONTAL); @@ -357,9 +360,9 @@ void MainScreen::CreateViews() { scrollAllGames->Add(tabAllGames); scrollHomebrew->Add(tabHomebrew); - leftColumn->AddTab("Recent", scrollRecentGames); - leftColumn->AddTab("Games", scrollAllGames); - leftColumn->AddTab("Homebrew & Demos", scrollHomebrew); + leftColumn->AddTab(m->T("Recent"), scrollRecentGames); + leftColumn->AddTab(m->T("Games"), scrollAllGames); + leftColumn->AddTab(m->T("Homebrew & Demos"), scrollHomebrew); tabRecentGames->OnChoice.Handle(this, &MainScreen::OnGameSelected); tabAllGames->OnChoice.Handle(this, &MainScreen::OnGameSelected); @@ -384,12 +387,12 @@ void MainScreen::CreateViews() { rightColumn->Add(rightColumnItems); #ifdef _WIN32 - rightColumnItems->Add(new Choice("Load..."))->OnClick.Handle(this, &MainScreen::OnLoadFile); + rightColumnItems->Add(new Choice(m->T("Load","Load...")))->OnClick.Handle(this, &MainScreen::OnLoadFile); #endif - rightColumnItems->Add(new Choice("Settings"))->OnClick.Handle(this, &MainScreen::OnSettings); - rightColumnItems->Add(new Choice("Exit"))->OnClick.Handle(this, &MainScreen::OnExit); - rightColumnItems->Add(new Choice("Credits"))->OnClick.Handle(this, &MainScreen::OnCredits); - rightColumnItems->Add(new Choice("Support PPSSPP"))->OnClick.Handle(this, &MainScreen::OnSupport); + rightColumnItems->Add(new Choice(m->T("Settings")))->OnClick.Handle(this, &MainScreen::OnSettings); + rightColumnItems->Add(new Choice(m->T("Exit")))->OnClick.Handle(this, &MainScreen::OnExit); + rightColumnItems->Add(new Choice(m->T("Credits")))->OnClick.Handle(this, &MainScreen::OnCredits); + rightColumnItems->Add(new Choice(m->T("Support PPSSPP")))->OnClick.Handle(this, &MainScreen::OnSupport); } void MainScreen::sendMessage(const char *message, const char *value) { @@ -479,6 +482,8 @@ GamePauseScreen::~GamePauseScreen() { void GamePauseScreen::CreateViews() { using namespace UI; Margins actionMenuMargins(0, 100, 15, 0); + I18NCategory *gs = GetI18NCategory("Graphics"); + I18NCategory *i = GetI18NCategory("Pause"); root_ = new LinearLayout(ORIENT_HORIZONTAL); @@ -497,8 +502,8 @@ void GamePauseScreen::CreateViews() { saveSlots_->AddChoice("4"); saveSlots_->SetSelection(g_Config.iCurrentStateSlot); - leftColumnItems->Add(new Choice("Save State"))->OnClick.Handle(this, &GamePauseScreen::OnSaveState); - leftColumnItems->Add(new Choice("Load State"))->OnClick.Handle(this, &GamePauseScreen::OnLoadState); + leftColumnItems->Add(new Choice(gs->T("Save State")))->OnClick.Handle(this, &GamePauseScreen::OnSaveState); + leftColumnItems->Add(new Choice(gs->T("Load State")))->OnClick.Handle(this, &GamePauseScreen::OnLoadState); ViewGroup *rightColumn = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(300, FILL_PARENT, actionMenuMargins)); root_->Add(rightColumn); @@ -506,10 +511,10 @@ void GamePauseScreen::CreateViews() { ViewGroup *rightColumnItems = new LinearLayout(ORIENT_VERTICAL); rightColumn->Add(rightColumnItems); - rightColumnItems->Add(new Choice("Continue"))->OnClick.Handle(this, &GamePauseScreen::OnContinue); - rightColumnItems->Add(new Choice("Game Settings"))->OnClick.Handle(this, &GamePauseScreen::OnGameSettings); - rightColumnItems->Add(new Choice("Main Settings"))->OnClick.Handle(this, &GamePauseScreen::OnMainSettings); - rightColumnItems->Add(new Choice("Exit to menu"))->OnClick.Handle(this, &GamePauseScreen::OnExitToMenu); + rightColumnItems->Add(new Choice(i->T("Continue")))->OnClick.Handle(this, &GamePauseScreen::OnContinue); + rightColumnItems->Add(new Choice(i->T("Game Settings")))->OnClick.Handle(this, &GamePauseScreen::OnGameSettings); + rightColumnItems->Add(new Choice(i->T("Main Settings")))->OnClick.Handle(this, &GamePauseScreen::OnMainSettings); + rightColumnItems->Add(new Choice(i->T("Exit to menu")))->OnClick.Handle(this, &GamePauseScreen::OnExitToMenu); } UI::EventReturn GamePauseScreen::OnMainSettings(UI::EventParams &e) { diff --git a/UI/MenuScreens.cpp b/UI/MenuScreens.cpp index 6cc89ff506..28843df509 100644 --- a/UI/MenuScreens.cpp +++ b/UI/MenuScreens.cpp @@ -253,6 +253,7 @@ void MenuScreen::render() { VLinear vlinear(dp_xres + xoff, 100, 20); I18NCategory *m = GetI18NCategory("MainMenu"); + I18NCategory *p = GetI18NCategory("Plugin"); if (UIButton(GEN_ID, vlinear, w, 0, m->T("Load", "Load..."), ALIGN_RIGHT)) { #if defined(USING_QT_UI) && !defined(MEEGO_EDITION_HARMATTAN) @@ -312,7 +313,7 @@ void MenuScreen::render() { } if (showAtracShortcut_) { - if (UIButton(GEN_ID, Pos(10,dp_yres - 10), 500, 50, "Download audio plugin", ALIGN_BOTTOMLEFT)) { + if (UIButton(GEN_ID, Pos(10, dp_yres - 10), 500, 50, p->T("Download audio plugin"), ALIGN_BOTTOMLEFT)) { screenManager()->push(new PluginScreen()); } } @@ -844,6 +845,7 @@ void AudioScreen::render() { I18NCategory *g = GetI18NCategory("General"); I18NCategory *a = GetI18NCategory("Audio"); + I18NCategory *p = GetI18NCategory("Plugin"); ui_draw2d.SetFontScale(1.5f, 1.5f); ui_draw2d.DrawTextShadow(UBUNTU24, a->T("Audio Settings"), dp_xres / 2, 10, 0xFFFFFFFF, ALIGN_HCENTER); @@ -866,7 +868,7 @@ void AudioScreen::render() { // Show the download button even if not installed - might want to upgrade. VLinear vlinear(30, 400, 20); std::string atracString; - atracString.assign(Atrac3plus_Decoder::IsInstalled() ? "Redownload Atrac3+ plugin" : "Download Atrac3+ plugin"); + atracString.assign(Atrac3plus_Decoder::IsInstalled() ? p->T("Redownload Atrac3+ plugin") : p->T("Download Atrac3+ plugin")); if (UIButton(GEN_ID, vlinear, 400, 0, a->T(atracString.c_str()), ALIGN_LEFT)) { screenManager()->push(new PluginScreen()); } @@ -1544,7 +1546,7 @@ void SystemScreen::render() { char nickname[512]; memset(nickname, 0, sizeof(nickname)); - sprintf(nickname, "%s %s", s->T("System Nickname: "), g_Config.sNickName.c_str()); + sprintf(nickname, "%s %s", s->T("System Nickname:"), g_Config.sNickName.c_str()); ui_draw2d.DrawTextShadow(UBUNTU24, nickname, x, y += stride, 0xFFFFFFFF, ALIGN_LEFT); HLinear hlinearNick(x + 400, y, 10); diff --git a/UI/PluginScreen.cpp b/UI/PluginScreen.cpp index 185e2092f9..72466a1cf1 100644 --- a/UI/PluginScreen.cpp +++ b/UI/PluginScreen.cpp @@ -48,7 +48,7 @@ void PluginScreen::CreateViews() { Margins textMargins(20,17); Margins buttonMargins(10,10); - root_->Add(new TextView(UBUNTU24, "Atrac3+ Audio Support", ALIGN_HCENTER, 1.5f, new LinearLayoutParams(textMargins))); + root_->Add(new TextView(UBUNTU24, p->T("Atrac3+ Audio Support"), ALIGN_HCENTER, 1.5f, new LinearLayoutParams(textMargins))); ViewGroup *scroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(1.0)); LinearLayout *scrollContents = new LinearLayout(ORIENT_VERTICAL);