From 73ce722147148df40eab8df5eb1c45ad50a17911 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 6 Jun 2018 12:38:19 +0300 Subject: [PATCH] Use separate month lang keys with and without day. Fixes #4797. --- Telegram/Resources/langs/lang.strings | 15 +++++++++++++++ Telegram/SourceFiles/lang/lang_keys.h | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 60ce67f0e0..7d6c592f29 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_quit_from_tray" = "Quit Telegram"; "lng_tray_icon_text" = "Telegram is still running here,\nyou can change this from settings page.\nIf this icon disappears from tray menu,\nyou can drag it here from hidden icons."; +// For lng_month_year or plain month name. "lng_month1" = "January"; "lng_month2" = "February"; "lng_month3" = "March"; @@ -36,6 +37,20 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_month11" = "November"; "lng_month12" = "December"; +// For lng_month_day and lng_month_day_year. +"lng_month_day1" = "January"; +"lng_month_day2" = "February"; +"lng_month_day3" = "March"; +"lng_month_day4" = "April"; +"lng_month_day5" = "May"; +"lng_month_day6" = "June"; +"lng_month_day7" = "July"; +"lng_month_day8" = "August"; +"lng_month_day9" = "September"; +"lng_month_day10" = "October"; +"lng_month_day11" = "November"; +"lng_month_day12" = "December"; + "lng_month1_small" = "Jan"; "lng_month2_small" = "Feb"; "lng_month3_small" = "Mar"; diff --git a/Telegram/SourceFiles/lang/lang_keys.h b/Telegram/SourceFiles/lang/lang_keys.h index 3dc6d6090a..e80f13abe5 100644 --- a/Telegram/SourceFiles/lang/lang_keys.h +++ b/Telegram/SourceFiles/lang/lang_keys.h @@ -58,9 +58,9 @@ inline QString langDayOfMonth(const QDate &date) { inline QString langDayOfMonthFull(const QDate &date) { auto day = date.day(); return langDateMaybeWithYear(date, [day](int month, int year) { - return lng_month_day_year(lt_month, lang(LangKey(lng_month1 + month - 1)), lt_day, QString::number(day), lt_year, QString::number(year)); + return lng_month_day_year(lt_month, lang(LangKey(lng_month_day1 + month - 1)), lt_day, QString::number(day), lt_year, QString::number(year)); }, [day](int month, int year) { - return lng_month_day(lt_month, lang(LangKey(lng_month1 + month - 1)), lt_day, QString::number(day)); + return lng_month_day(lt_month, lang(LangKey(lng_month_day1 + month - 1)), lt_day, QString::number(day)); }); }