yaclf
This commit is contained in:
@@ -24,8 +24,7 @@ bool mapIanaTimezone(const std::string& tz, uint8_t& outSetting) {
|
|||||||
outSetting = TZ::TZ_UTC;
|
outSetting = TZ::TZ_UTC;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (tz == "Europe/London" || tz == "Europe/Guernsey" || tz == "Europe/Isle_of_Man" ||
|
if (tz == "Europe/London" || tz == "Europe/Guernsey" || tz == "Europe/Isle_of_Man" || tz == "Europe/Jersey") {
|
||||||
tz == "Europe/Jersey") {
|
|
||||||
outSetting = TZ::TZ_UTC;
|
outSetting = TZ::TZ_UTC;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -274,8 +273,7 @@ void DetectTimezoneActivity::render(RenderLock&&) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (state == SUCCESS) {
|
if (state == SUCCESS) {
|
||||||
renderer.drawCenteredText(UI_10_FONT_ID, pageHeight / 2 - 20, tr(STR_TIMEZONE_DETECTED), true,
|
renderer.drawCenteredText(UI_10_FONT_ID, pageHeight / 2 - 20, tr(STR_TIMEZONE_DETECTED), true, EpdFontFamily::BOLD);
|
||||||
EpdFontFamily::BOLD);
|
|
||||||
|
|
||||||
if (!detectedTimezone.empty()) {
|
if (!detectedTimezone.empty()) {
|
||||||
renderer.drawCenteredText(UI_10_FONT_ID, pageHeight / 2 + 5, detectedTimezone.c_str());
|
renderer.drawCenteredText(UI_10_FONT_ID, pageHeight / 2 + 5, detectedTimezone.c_str());
|
||||||
@@ -289,8 +287,7 @@ void DetectTimezoneActivity::render(RenderLock&&) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (state == FAILED) {
|
if (state == FAILED) {
|
||||||
renderer.drawCenteredText(UI_10_FONT_ID, pageHeight / 2, tr(STR_TIMEZONE_DETECT_FAILED), true,
|
renderer.drawCenteredText(UI_10_FONT_ID, pageHeight / 2, tr(STR_TIMEZONE_DETECT_FAILED), true, EpdFontFamily::BOLD);
|
||||||
EpdFontFamily::BOLD);
|
|
||||||
|
|
||||||
const auto labels = mappedInput.mapLabels(tr(STR_BACK), "", "", "");
|
const auto labels = mappedInput.mapLabels(tr(STR_BACK), "", "", "");
|
||||||
GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
|
GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
|
||||||
|
|||||||
Reference in New Issue
Block a user