Merge branch 'main' into dev/p2s-pr

This commit is contained in:
Noisyfox
2025-11-08 17:17:31 +08:00
committed by GitHub
70 changed files with 1054 additions and 666 deletions

View File

@@ -147,7 +147,7 @@ void uiAmsPercentHumidityDryPopup::UpdateContents()
// table grid
const wxString& humidity_str = wxString::Format("%d%%", m_humidity_percent);
m_humidity_label->SetLabel(humidity_str);
const wxString& temp_str = wxString::Format(_L("%d \u2103"), (int)std::round(m_current_temperature));
const wxString& temp_str = wxString::Format(u8"%d\u2103" /* °C */, (int)std::round(m_current_temperature));
m_temperature_label->SetLabel(temp_str);
if (m_left_dry_time > 0)