From 68e5f1df88af3d67a6edede127993c4d78c00b16 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Fri, 20 Aug 2021 15:50:08 +0800 Subject: [PATCH] Better implementation of CN/TW date. --- radio/src/gui/colorlcd/layouts/topbar_impl.cpp | 2 +- radio/src/gui/colorlcd/themes/480_default.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/radio/src/gui/colorlcd/layouts/topbar_impl.cpp b/radio/src/gui/colorlcd/layouts/topbar_impl.cpp index 3006ccf97..d56a6a0fc 100644 --- a/radio/src/gui/colorlcd/layouts/topbar_impl.cpp +++ b/radio/src/gui/colorlcd/layouts/topbar_impl.cpp @@ -84,7 +84,7 @@ void TopbarImpl::paint(BitmapBuffer * dc) gettime(&t); char str[10]; #if defined(TRANSLATIONS_CN) || defined(TRANSLATIONS_TW) - sprintf(str, "%d" TR_MONTH "%d", t.tm_mon + 1, t.tm_mday); + sprintf(str, "%d-%d", t.tm_mon + 1, t.tm_mday); #else const char * const STR_MONTHS[] = TR_MONTHS; sprintf(str, "%d %s", t.tm_mday, STR_MONTHS[t.tm_mon]); diff --git a/radio/src/gui/colorlcd/themes/480_default.cpp b/radio/src/gui/colorlcd/themes/480_default.cpp index 6385fd7e8..386e3a97b 100644 --- a/radio/src/gui/colorlcd/themes/480_default.cpp +++ b/radio/src/gui/colorlcd/themes/480_default.cpp @@ -425,7 +425,7 @@ class Theme480: public OpenTxTheme gettime(&t); char str[10]; #if defined(TRANSLATIONS_CN) || defined(TRANSLATIONS_TW) - sprintf(str, "%d" TR_MONTH "%d", t.tm_mon + 1, t.tm_mday); + sprintf(str, "%d-%d", t.tm_mon + 1, t.tm_mday); #else const char * const STR_MONTHS[] = TR_MONTHS; sprintf(str, "%d %s", t.tm_mday, STR_MONTHS[t.tm_mon]);