diff options
author | Hop311 <Hop3114@gmail.com> | 2024-01-31 00:16:29 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-31 00:16:29 +0100 |
commit | ab5fc2696b026e75d307e07925761dd771f16a08 (patch) | |
tree | 90f772bc6f3fea8c86a82452ff3914831c0a0349 | |
parent | 069f07a16daf04982677182caf39498e1539f3f0 (diff) | |
parent | 3ab346c80dff3fe3f00556a1b253325b8d39a009 (diff) |
Merge pull request #199 from OpenVicProject/update-sim
Update sim and script submodules
m--------- | extension/deps/openvic-simulation | 0 | ||||
-rw-r--r-- | extension/src/openvic-extension/utility/Utilities.cpp | 6 | ||||
m--------- | scripts | 0 |
3 files changed, 3 insertions, 3 deletions
diff --git a/extension/deps/openvic-simulation b/extension/deps/openvic-simulation -Subproject 93eaf0f4f2e812000316190c06e6614da2f841e +Subproject 068c13ede817d17df599ca3481261bf17ed9560 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 -Subproject 3a4190526bde8e3fcd49c3ebcf77b5a87dc8ab6 +Subproject 21d142795539d65f30a1862502aae5aa43bd765 |