MrBesen/tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use separate month lang keys with and without day.

Browse Source 
Fixes #4797.
This commit is contained in:
John Preston 2018-06-06 12:38:19 +03:00
parent 233be5ec13
commit 73ce722147
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Telegram/Resources/langs/lang.strings
View File

@ -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";

4
Telegram/SourceFiles/lang/lang_keys.h
View File

@ -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));
});
}