[8579] | 1 | --- xbmc-Gotham/system/settings/settings.xml.vine 2014-05-03 13:45:48.000000000 +0900 |
---|
| 2 | +++ xbmc-Gotham/system/settings/settings.xml 2014-05-03 15:41:40.713351927 +0900 |
---|
| 3 | @@ -42,7 +42,7 @@ |
---|
| 4 | </setting> |
---|
| 5 | <setting id="lookandfeel.font" type="string" parent="lookandfeel.skin" label="13303" help="36107"> |
---|
| 6 | <level>1</level> |
---|
| 7 | - <default>Default</default> |
---|
| 8 | + <default>Arial</default> |
---|
| 9 | <constraints> |
---|
| 10 | <options>skinfonts</options> |
---|
| 11 | </constraints> |
---|
| 12 | @@ -114,7 +114,7 @@ |
---|
| 13 | <group id="1"> |
---|
| 14 | <setting id="locale.language" type="string" label="248" help="36114"> |
---|
| 15 | <level>0</level> |
---|
| 16 | - <default>English</default> |
---|
| 17 | + <default>Japanese</default> |
---|
| 18 | <constraints> |
---|
| 19 | <options>languages</options> |
---|
| 20 | </constraints> |
---|
| 21 | @@ -122,7 +122,7 @@ |
---|
| 22 | </setting> |
---|
| 23 | <setting id="locale.country" type="string" label="20026" help="36115"> |
---|
| 24 | <level>0</level> |
---|
| 25 | - <default>USA (12h)</default> |
---|
| 26 | + <default>Japan</default> |
---|
| 27 | <constraints> |
---|
| 28 | <options>regions</options> |
---|
| 29 | </constraints> |
---|
| 30 | @@ -146,7 +146,7 @@ |
---|
| 31 | <group id="2"> |
---|
| 32 | <setting id="locale.timezonecountry" type="string" label="14079" help="36117"> |
---|
| 33 | <level>1</level> |
---|
| 34 | - <default>default</default> <!-- will be properly set on startup --> |
---|
| 35 | + <default>Japan</default> <!-- will be properly set on startup --> |
---|
| 36 | <constraints> |
---|
| 37 | <options>timezonecountries</options> |
---|
| 38 | </constraints> |
---|
| 39 | @@ -154,7 +154,7 @@ |
---|
| 40 | </setting> |
---|
| 41 | <setting id="locale.timezone" type="string" label="14080" help="36118"> |
---|
| 42 | <level>1</level> |
---|
| 43 | - <default>default</default> <!-- will be properly set on startup --> |
---|
| 44 | + <default>Asia/Tokyo</default> <!-- will be properly set on startup --> |
---|
| 45 | <constraints> |
---|
| 46 | <options>timezones</options> |
---|
| 47 | </constraints> |
---|
| 48 | --- xbmc-Gotham/xbmc/settings/Settings.cpp.vine 2014-05-07 07:43:49.000000000 +0900 |
---|
| 49 | +++ xbmc-Gotham/xbmc/settings/Settings.cpp 2014-05-07 11:21:37.464069327 +0900 |
---|
| 50 | @@ -777,9 +777,9 @@ |
---|
| 51 | CSettingString* timezone = (CSettingString*)m_settingsManager->GetSetting("locale.timezone"); |
---|
| 52 | |
---|
| 53 | if (timezonecountry->IsVisible()) |
---|
| 54 | - timezonecountry->SetDefault(g_timezone.GetCountryByTimezone(g_timezone.GetOSConfiguredTimezone())); |
---|
| 55 | + timezonecountry->SetDefault("Japan"); |
---|
| 56 | if (timezone->IsVisible()) |
---|
| 57 | - timezone->SetDefault(g_timezone.GetOSConfiguredTimezone()); |
---|
| 58 | + timezone->SetDefault("Asia/Tokyo"); |
---|
| 59 | #endif // defined(TARGET_POSIX) |
---|
| 60 | |
---|
| 61 | #if defined(TARGET_WINDOWS) |
---|