Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initialize locale so we don't end up using the C one by default. #509

Merged
merged 3 commits into from
Aug 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ endif()
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11" CACHE STRING "Minimum OS X deployment version")

set(PROJECT_NAME FreeDV)
set(PROJECT_VERSION 1.9.1)
set(PROJECT_VERSION 1.9.2)
set(PROJECT_DESCRIPTION "HF Digital Voice for Radio Amateurs")
set(PROJECT_HOMEPAGE_URL "https://freedv.org")

Expand All @@ -42,7 +42,7 @@ endif(APPLE)

# Adds a tag to the end of the version string. Leave empty
# for official release builds.
set(FREEDV_VERSION_TAG "")
set(FREEDV_VERSION_TAG "devel")

# Prevent in-source builds to protect automake/autoconf config.
# If an in-source build is attempted, you will still need to clean up a few
Expand Down
5 changes: 5 additions & 0 deletions USER_MANUAL.md
Original file line number Diff line number Diff line change
Expand Up @@ -903,6 +903,11 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes

# Release Notes

## V1.9.2 TBD 2023

1. Bugfixes:
* Initialize locale so that times appear correctly. (PR #509)

## V1.9.1 August 2023

1. Bugfixes:
Expand Down
2 changes: 1 addition & 1 deletion src/freedv_reporter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ wxString FreeDVReporterDialog::makeValidTime_(std::string timeStr)
{
timeZone = wxDateTime::TimeZone(wxDateTime::TZ::Local);
}
return tmpDate.Format(wxDefaultDateTimeFormat, timeZone);
return tmpDate.Format(_("%x %X"), timeZone);
}
else
{
Expand Down
3 changes: 3 additions & 0 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,9 @@ bool MainApp::OnCmdLineParsed(wxCmdLineParser& parser)
//-------------------------------------------------------------------------
bool MainApp::OnInit()
{
// Initialize locale.
m_locale.Init();

for (auto& obj : m_reporters)
{
delete obj;
Expand Down
1 change: 1 addition & 0 deletions src/main.h
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ class MainApp : public wxApp

std::shared_ptr<LinkStep> linkStep;

wxLocale m_locale;
protected:
};

Expand Down