M image/system_a/data/lang/Polski.json => image/system_a/data/lang/Polski.json +7 -7
@@ 47,13 47,13 @@
"common_fr": "PT",
"common_sa": "SB",
"common_su": "ND",
- "common_mon": "Pon",
- "common_tue": "Wto",
- "common_wed": "Śro",
- "common_thu": "Czw",
- "common_fri": "Pią",
- "common_sat": "Sob",
- "common_sun": "Nie",
+ "common_mon": "Pon.",
+ "common_tue": "Wt.",
+ "common_wed": "Śr.",
+ "common_thu": "Czw.",
+ "common_fri": "Pt.",
+ "common_sat": "Sob.",
+ "common_sun": "Niedz.",
"common_monday": "Poniedziałek",
"common_tuesday": "Wtorek",
"common_wednesday": "Środa",
M module-apps/application-alarm-clock/widgets/AlarmRRuleOptionsItem.cpp => module-apps/application-alarm-clock/widgets/AlarmRRuleOptionsItem.cpp +4 -3
@@ 37,7 37,7 @@ namespace gui
focusChangedCallback = [&](Item &item) {
setFocusItem(focus ? optionSpinner : nullptr);
- if (getRRuleOption(optionSpinner->getCurrentValue()) == RRule::Custom) {
+ if (focus && (getRRuleOption(optionSpinner->getCurrentValue()) == RRule::Custom)) {
this->navBarTemporaryMode(utils::translate(style::strings::common::edit));
}
else {
@@ 79,12 79,13 @@ namespace gui
void AlarmRRuleOptionsItem::checkCustomOption(const std::string &selectedOption)
{
- if (rRuleOptions.back().second != "Custom")
+ if (rRuleOptions.back().second != utils::translate("app_alarm_clock_repeat_custom")) {
if (const auto days = getPresenter()->getCustomDays();
std::none_of(days.cbegin(), days.cend(), [](const auto &day) { return day.second; })) {
- rRuleOptions.back().second = "Custom";
+ rRuleOptions.back().second = utils::translate("app_alarm_clock_repeat_custom");
printOptions();
}
+ }
for (auto const &option : rRuleOptions) {
if (selectedOption.empty() || option.second == selectedOption) {
M module-utils/time/time/time_locale.hpp => module-utils/time/time/time_locale.hpp +15 -15
@@ 23,8 23,8 @@ namespace utils
static constexpr int num_days = 7;
private:
- static const int num_monts = 12;
- static const int num_formatters = 11;
+ static constexpr int num_months = 12;
+ static constexpr int num_formatters = 11;
// imo it would be nicer to have datetime locales in different json with thiny bit nicer and more effective
// getters
const std::array<std::string, num_days> daysShort = {
@@ 38,18 38,18 @@ namespace utils
"common_friday",
"common_saturday"};
- const std::array<std::string, num_monts> months = {"common_january",
- "common_february",
- "common_march",
- "common_april",
- "common_may",
- "common_june",
- "common_july",
- "common_august",
- "common_september",
- "common_october",
- "common_november",
- "common_december"};
+ const std::array<std::string, num_months> months = {"common_january",
+ "common_february",
+ "common_march",
+ "common_april",
+ "common_may",
+ "common_june",
+ "common_july",
+ "common_august",
+ "common_september",
+ "common_october",
+ "common_november",
+ "common_december"};
const std::array<std::string, num_formatters> time_formats{"locale_12hour_min",
"locale_12hour_min_short",
@@ 184,7 184,7 @@ namespace utils
static const UTF8 get_month(enum Month mon)
{
- if (mon >= num_monts) {
+ if (mon >= num_months) {
LOG_ERROR("Bad value %d", mon);
return "";
}
M pure_changelog.md => pure_changelog.md +1 -0
@@ 75,6 75,7 @@
* Fixed going back to Messages instead of Contacts in case message thread was previously opened from Contacts
* Fixed autoconnecting other BT devices when another one is already connected
* Fixed going to Calls instead of Contacts after aborted or confirmed attempt to create contact from Calls
+* Fix misleading "Nie" abbreviation for word "Niedziela" (Sunday) in new alarm window
## [1.6.0 2023-02-27]