From 9a551c85ca70f114219ae974038eb67f26bd6fc4 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Mon, 20 May 2019 21:06:08 +0200 Subject: [PATCH] Load Korean fonts when needed --- src/QGCApplication.cc | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc index 0f8cb9d6d..8c4cf014c 100644 --- a/src/QGCApplication.cc +++ b/src/QGCApplication.cc @@ -391,12 +391,6 @@ void QGCApplication::setLanguage() break; case 12: locale = QLocale(QLocale::Korean); - if(QFontDatabase::addApplicationFont(":/fonts/NanumGothic-Regular") < 0) { - qWarning() << "Could not load /fonts/NanumGothic-Regular font"; - } - if(QFontDatabase::addApplicationFont(":/fonts/NanumGothic-Bold") < 0) { - qWarning() << "Could not load /fonts/NanumGothic-Bold font"; - } break; case 13: locale = QLocale(QLocale::Norwegian); @@ -421,6 +415,16 @@ void QGCApplication::setLanguage() break; } } + //-- We have specific fonts for Korean + if(locale == QLocale::Korean) { + qDebug() << "Loading Korean fonts" << locale.name(); + if(QFontDatabase::addApplicationFont(":/fonts/NanumGothic-Regular") < 0) { + qWarning() << "Could not load /fonts/NanumGothic-Regular font"; + } + if(QFontDatabase::addApplicationFont(":/fonts/NanumGothic-Bold") < 0) { + qWarning() << "Could not load /fonts/NanumGothic-Bold font"; + } + } qDebug() << "Loading localization for" << locale.name(); _app->removeTranslator(&_QGCTranslator); _app->removeTranslator(&_QGCTranslatorQt); -- 2.22.0