From 3ab346c80dff3fe3f00556a1b253325b8d39a009 Mon Sep 17 00:00:00 2001 From: hop311 Date: Tue, 30 Jan 2024 17:49:43 +0000 Subject: Update openvic-simulation to OpenVicProject/OpenVic-Simulation@068c13e Update scripts to OpenVicProject/scripts@21d1427 --- extension/deps/openvic-simulation | 2 +- extension/src/openvic-extension/utility/Utilities.cpp | 6 +++--- scripts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extension/deps/openvic-simulation b/extension/deps/openvic-simulation index 93eaf0f..068c13e 160000 --- a/extension/deps/openvic-simulation +++ b/extension/deps/openvic-simulation @@ -1 +1 @@ -Subproject commit 93eaf0f4f2e812000316190c06e6614da2f841ee +Subproject commit 068c13ede817d17df599ca3481261bf17ed95604 diff --git a/extension/src/openvic-extension/utility/Utilities.cpp b/extension/src/openvic-extension/utility/Utilities.cpp index 4cf515f..a3fa40a 100644 --- a/extension/src/openvic-extension/utility/Utilities.cpp +++ b/extension/src/openvic-extension/utility/Utilities.cpp @@ -46,13 +46,13 @@ String Utilities::float_to_formatted_string(float val) { /* Date formatted like this: "January 1, 1836" (with the month localised, if possible). */ String Utilities::date_to_formatted_string(Date date) { - std::string const& month_name = date.get_month_name(); + const String month_name = std_view_to_godot_string_name(date.get_month_name()); const String day_and_year = " " + String::num_int64(date.get_day()) + ", " + String::num_int64(date.get_year()); TranslationServer const* server = TranslationServer::get_singleton(); if (server != nullptr) { - return server->translate(std_to_godot_string_name(month_name)) + day_and_year; + return server->translate(month_name) + day_and_year; } else { - return std_to_godot_string(month_name) + day_and_year; + return month_name + day_and_year; } } diff --git a/scripts b/scripts index 3a41905..21d1427 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit 3a4190526bde8e3fcd49c3ebcf77b5a87dc8ab62 +Subproject commit 21d142795539d65f30a1862502aae5aa43bd7650 -- cgit v1.2.3-56-ga3b1