Ticket #919: rest_of_919.diff
File rest_of_919.diff, 6.1 KB (added by , 18 years ago) |
---|
-
libs/libmythui/themedmenu.cpp
1206 1206 text = getFirstText(info); 1207 1207 } 1208 1208 else if (info.attribute("lang","").lower() == 1209 gContext->GetLanguageAndVariant()) 1210 { 1211 text = getFirstText(info); 1212 } 1213 else if (info.attribute("lang","").lower() == 1209 1214 gContext->GetLanguage()) 1210 1215 { 1211 1216 text = getFirstText(info); … … 1218 1223 { 1219 1224 alttext = getFirstText(info); 1220 1225 } 1226 else if (info.attribute("lang","").lower() == 1227 gContext->GetLanguageAndVariant()) 1228 { 1229 text = getFirstText(info); 1230 } 1221 1231 else if (info.attribute("lang","").lower() == 1222 1232 gContext->GetLanguage()) 1223 1233 { -
libs/libmyth/mythcontext.h
351 351 QFont GetMediumFont(); 352 352 QFont GetSmallFont(); 353 353 354 QString GetLanguageAndVariant(void); 354 355 QString GetLanguage(void); 355 356 356 357 void ThemeWidget(QWidget *widget); -
libs/libmyth/themedmenu.cpp
1387 1387 text = getFirstText(info); 1388 1388 } 1389 1389 else if (info.attribute("lang","").lower() == 1390 gContext->GetLanguageAndVariant()) 1391 { 1392 text = getFirstText(info); 1393 } 1394 else if (info.attribute("lang","").lower() == 1390 1395 gContext->GetLanguage()) 1391 1396 { 1392 1397 text = getFirstText(info); … … 1399 1404 { 1400 1405 alttext = getFirstText(info); 1401 1406 } 1407 else if (info.attribute("lang","").lower() == 1408 gContext->GetLanguageAndVariant()) 1409 { 1410 text = getFirstText(info); 1411 } 1402 1412 else if (info.attribute("lang","").lower() == 1403 1413 gContext->GetLanguage()) 1404 1414 { -
libs/libmyth/xmlparse.cpp
1297 1297 value = qApp->translate("ThemeUI", getFirstText(info)); 1298 1298 } 1299 1299 else if (info.attribute("lang","").lower() == 1300 gContext->GetLanguageAndVariant()) 1301 { 1302 value = getFirstText(info); 1303 } 1304 else if (info.attribute("lang","").lower() == 1300 1305 gContext->GetLanguage()) 1301 1306 { 1302 1307 value = getFirstText(info); … … 1452 1457 value = qApp->translate("ThemeUI", getFirstText(info)); 1453 1458 } 1454 1459 else if (info.attribute("lang","").lower() == 1460 gContext->GetLanguageAndVariant()) 1461 { 1462 value = getFirstText(info); 1463 } 1464 else if (info.attribute("lang","").lower() == 1455 1465 gContext->GetLanguage()) 1456 1466 { 1457 1467 value = getFirstText(info); … … 1757 1767 value = qApp->translate("ThemeUI", getFirstText(info)); 1758 1768 } 1759 1769 else if (info.attribute("lang","").lower() == 1770 gContext->GetLanguageAndVariant()) 1771 { 1772 value = getFirstText(info); 1773 } 1774 else if (info.attribute("lang","").lower() == 1760 1775 gContext->GetLanguage()) 1761 1776 { 1762 1777 value = getFirstText(info); -
libs/libmyth/virtualkeyboard.cpp
20 20 setLineWidth(1); 21 21 m_parentEdit = parentEdit; 22 22 23 switchLayout(gContext->GetLanguage ());23 switchLayout(gContext->GetLanguageAndVariant()); 24 24 } 25 25 26 26 void VirtualKeyboard::switchLayout(QString language) -
libs/libmyth/mythcontext.cpp
2457 2457 QFont::Bold); 2458 2458 } 2459 2459 2460 /** \fn MythContext::GetLanguage() 2461 * \brief Returns two character ISO-639 language descriptor for UI language. 2462 * \sa iso639_get_language_list() 2460 /** \fn MythContext::GetLanguageAndVariant() 2461 * \brief Returns the user-set language and variant. 2462 * 2463 * The string has the form ll or ll_vv, where ll is the two character ISO-639 2464 * language code, and vv (which may not exist) is the variant. Famous exemples 2465 * are en_GB, en_UK, fr_CH, fr_DE... 2463 2466 */ 2464 QString MythContext::GetLanguage (void)2467 QString MythContext::GetLanguageAndVariant(void) 2465 2468 { 2466 2469 if (d->language == QString::null || d->language == "") 2467 2470 d->language = GetSetting("Language", "EN").lower(); … … 2469 2472 return d->language; 2470 2473 } 2471 2474 2475 /** \fn MythContext::GetLanguage() 2476 * \brief Returns two character ISO-639 language descriptor for UI language. 2477 * \sa iso639_get_language_list() 2478 */ 2479 QString MythContext::GetLanguage(void) 2480 { 2481 return GetLanguageAndVariant().left(2); 2482 } 2483 2472 2484 void MythContext::SetMainWindow(MythMainWindow *mainwin) 2473 2485 { 2474 2486 d->mainWindow = mainwin;