Skip to content

Commit 9ea6b22

Browse files
committed
overlays: localize shader compilation dialogs
1 parent a7a3e4f commit 9ea6b22

4 files changed

Lines changed: 19 additions & 9 deletions

File tree

rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include "Emu/RSX/rsx_methods.h"
99
#include "Emu/RSX/Overlays/Shaders/shader_loading_dialog.h"
1010
#include "Emu/RSX/Program/GLSLCommon.h"
11+
#include "Emu/localized_string.h"
1112

1213
namespace gl
1314
{
@@ -17,7 +18,7 @@ namespace gl
1718

1819
void shader_interpreter::create(rsx::shader_loading_dialog* dlg)
1920
{
20-
dlg->create("Precompiling interpreter variants.\nPlease wait...", "Shader Compilation");
21+
dlg->create(get_localized_string(localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS), get_localized_string(localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS_TITLE));
2122

2223
const auto variants = program_common::interpreter::get_interpreter_variants();
2324
const u32 limit1 = ::size32(variants.base_pipelines);
@@ -32,7 +33,7 @@ namespace gl
3233
{
3334
const auto completed = ctr.load();
3435
const auto limit = stage ? limit2 : limit1;
35-
const auto message = fmt::format("%s variant %u of %u...", stage ? "Linking" : "Building", ctr.load(), limit);
36+
const auto message = get_localized_string(stage ? localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS_OPENGL_LINK : localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS_OPENGL_BUILD, "%u %s %u", ctr.load(), get_localized_string(localized_string_id::PROGRESS_DIALOG_OF), limit);
3637
dlg->update_msg(stage, message);
3738
dlg->set_value(stage, completed);
3839
};

rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
#include "VKHelpers.h"
77
#include "VKRenderPass.h"
88

9-
#include "../Overlays/Shaders/shader_loading_dialog.h"
10-
#include "../Program/GLSLCommon.h"
11-
#include "../Program/ShaderInterpreter.h"
12-
#include "../rsx_methods.h"
9+
#include "Emu/RSX/Overlays/Shaders/shader_loading_dialog.h"
10+
#include "Emu/RSX/Program/GLSLCommon.h"
11+
#include "Emu/RSX/Program/ShaderInterpreter.h"
12+
#include "Emu/RSX/rsx_methods.h"
13+
#include "Emu/localized_string.h"
1314

1415
#include <thread>
1516

@@ -719,7 +720,7 @@ namespace vk
719720

720721
void shader_interpreter::preload(rsx::shader_loading_dialog* dlg)
721722
{
722-
dlg->create("Precompiling interpreter variants.\nPlease wait...", "Shader Compilation");
723+
dlg->create(get_localized_string(localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS), get_localized_string(localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS_TITLE));
723724

724725
// Create some basic pipelines that we'll use to seed the base pipeline queue
725726
std::vector<vk::pipeline_props> pipe_properties;
@@ -778,7 +779,7 @@ namespace vk
778779
std::this_thread::sleep_for(16ms);
779780

780781
const auto completed = ctr.load();
781-
dlg->update_msg(0, fmt::format("Building base variant %u of %u...", completed, limit1));
782+
dlg->update_msg(0, get_localized_string(localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS_VULKAN, "%u %s %u", completed, get_localized_string(localized_string_id::PROGRESS_DIALOG_OF), limit1));
782783
dlg->set_value(0, completed);
783784
}
784785
while (ctr.load() < limit1);

rpcs3/Emu/localized_string_id.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ enum class localized_string_id
1010
RSX_OVERLAYS_TROPHY_GOLD,
1111
RSX_OVERLAYS_TROPHY_PLATINUM,
1212
RSX_OVERLAYS_COMPILING_SHADERS,
13+
RSX_OVERLAYS_COMPILING_SHADERS_TITLE,
14+
RSX_OVERLAYS_COMPILING_SHADERS_VULKAN,
15+
RSX_OVERLAYS_COMPILING_SHADERS_OPENGL_BUILD,
16+
RSX_OVERLAYS_COMPILING_SHADERS_OPENGL_LINK,
1317
RSX_OVERLAYS_COMPILING_PPU_MODULES,
1418
RSX_OVERLAYS_MSG_DIALOG_YES,
1519
RSX_OVERLAYS_MSG_DIALOG_NO,

rpcs3/rpcs3qt/localized_emu.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,11 @@ class localized_emu : public QObject
4343
case localized_string_id::RSX_OVERLAYS_TROPHY_SILVER: return tr("You have earned a silver trophy.\n%0", "Trophy text").arg(std::forward<Args>(args)...);
4444
case localized_string_id::RSX_OVERLAYS_TROPHY_GOLD: return tr("You have earned a gold trophy.\n%0", "Trophy text").arg(std::forward<Args>(args)...);
4545
case localized_string_id::RSX_OVERLAYS_TROPHY_PLATINUM: return tr("You have earned a platinum trophy.\n%0", "Trophy text").arg(std::forward<Args>(args)...);
46-
case localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS: return tr("Compiling shaders");
46+
case localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS: return tr("Precompiling shader interpreter variants.\nPlease wait...");
47+
case localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS_TITLE: return tr("Shader Compilation");
48+
case localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS_VULKAN: return tr("Building base variant %0...").arg(std::forward<Args>(args)...);
49+
case localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS_OPENGL_BUILD: return tr("Building variant %0...").arg(std::forward<Args>(args)...);
50+
case localized_string_id::RSX_OVERLAYS_COMPILING_SHADERS_OPENGL_LINK: return tr("Linking variant %0...").arg(std::forward<Args>(args)...);
4751
case localized_string_id::RSX_OVERLAYS_COMPILING_PPU_MODULES: return tr("Compiling PPU Modules");
4852
case localized_string_id::RSX_OVERLAYS_MSG_DIALOG_YES: return tr("Yes", "Message Dialog");
4953
case localized_string_id::RSX_OVERLAYS_MSG_DIALOG_NO: return tr("No", "Message Dialog");

0 commit comments

Comments
 (0)