From 4544cca940bef2940b2e70d3195bd3c3a323f191 Mon Sep 17 00:00:00 2001
From: yoshida_teruhisa <yoshida_teruhisa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Mon, 13 Apr 2009 05:49:54 +0000
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E9=9F=93=E3=83=AA=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=81=A7=E5=88=9D=E5=9B=9E=E8=B5=B7=E5=8B=95?=
 =?UTF-8?q?=E3=82=B7=E3=83=BC=E3=82=B1=E3=83=B3=E3=82=B9=E3=82=92=E9=80=9A?=
 =?UTF-8?q?=E3=82=89=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/branches/20090413_for_systemupdater_ck_0_1@2804 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../sysmenu/ARM9/src/sysmenu_lib.c            | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
index 157f8b48..4558a659 100644
--- a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
+++ b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
@@ -217,6 +217,22 @@ TitleProperty *SYSM_ReadParameters( void )
         if( pBuffer ) {
             // NANDからTWL本体設定データをリード
             BOOL isRead = LCFG_ReadTWLSettings( (u8 (*)[LCFG_READ_TEMP])pBuffer );
+          
+            // [臨時:]中韓の場合は日本語、日本に設定し、初回起動シーケンスは避ける
+		    if( ( (OS_GetRegion()==OS_TWL_REGION_KOREA) || (OS_GetRegion()==OS_TWL_REGION_CHINA) ) && !LCFG_TSD_IsFinishedInitialSetting() )
+		    {
+				if( OS_GetRegion()==OS_TWL_REGION_KOREA)
+				{
+				    LCFG_TSD_SetLanguage( LCFG_TWL_LANG_KOREAN );
+				    LCFG_TSD_SetCountry( LCFG_TWL_COUNTRY_SOUTH_KOREA );
+				}else if(OS_GetRegion()==OS_TWL_REGION_CHINA)
+				{
+				    LCFG_TSD_SetLanguage( LCFG_TWL_LANG_SIMP_CHINESE );
+				    LCFG_TSD_SetCountry( LCFG_TWL_COUNTRY_CHINA );
+				}
+			    LCFG_TSD_SetFlagFinishedInitialSetting(TRUE);
+			    (void)LCFG_WriteTWLSettings( (u8 (*)[ LCFG_WRITE_TEMP ] )pBuffer );
+		    }
             
             // リード失敗ファイルが存在する場合は、ファイルをリカバリ
             if( LCFG_RecoveryTWLSettings() ) {
@@ -503,6 +519,13 @@ static TitleProperty *SYSMi_CheckShortcutBoot2( void )
     if( ( i == sizeof(LCFGNTRTPCalibData) ) ||
 		!LCFG_TSD_IsFinishedBrokenTWLSettings() ) {
         argument      = 100;        // フラッシュ壊れシーケンス起動
+        
+        // [臨時:]中韓のときはタッチパネル設定のみにしておく（言語設定が未完成のため）
+        if( (OS_GetRegion()==OS_TWL_REGION_KOREA) || (OS_GetRegion()==OS_TWL_REGION_CHINA) )
+        {
+			argument      = 101;
+		}
+		
         isSetArgument = TRUE;
         isBootMSET    = TRUE;
     }else