[Fix] Conflicts

This commit is contained in:
Quentin
2020-04-08 15:05:17 +02:00
211 changed files with 4896 additions and 2103 deletions

View File

@@ -183,7 +183,7 @@ void MainController::willDisplayCellForIndex(HighlightCell * cell, int index) {
MessageTableCell * myCell = (MessageTableCell *)cell;
myCell->setMessage(title);
if (model()->children(index)->label() == I18n::Message::Language) {
int index = (int)globalPreferences->language()-1;
int index = (int)(globalPreferences->language());
static_cast<MessageTableCellWithChevronAndMessage *>(cell)->setSubtitle(I18n::LanguageNames[index]);
return;
}