X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=install%2Findex.php;h=01f0d0ae21349b2f82041af6470b1dcb3c47f130;hb=2bcc50379ce985545d26b42ffd5717ab265b5635;hp=f30a3b109433ce524addd28f7de11c02772a91d9;hpb=328e753a32a55b63c3555a08b02ae7e3e179c8e2;p=nucleus-jp%2Fnucleus-next.git

diff --git a/install/index.php b/install/index.php
index f30a3b1..01f0d0a 100644
--- a/install/index.php
+++ b/install/index.php
@@ -43,7 +43,7 @@ if ( version_compare(PHP_VERSION, '5.3.0', '<') )
 }
 
 /* default installed plugins and skins */
-$aConfPlugsToInstall = array('NP_SecurityEnforcer', 'NP_SkinFiles');
+$aConfPlugsToInstall = array('NP_SecurityEnforcer', 'NP_SkinFiles', 'NP_Medium');
 $aConfSkinsToImport = array('atom', 'rss2.0', 'rsd', 'default', 'admin/default', 'admin/bookmarklet');
 
 // Check if some important files
@@ -296,45 +296,12 @@ function show_footer()
  */
 function show_select_locale_form()
 {
-	// Get the browser language that can be displayed
-	// TODO: default locale select simple implementation
-	$languages = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
-	foreach ( $languages as $language )
-	{
-		$language = preg_replace('#([\w]+).*#', '$1', $language);
-		break;
-	}
-
 	// get locale list
-	$native_locales = array(
-		'bg_Cyrl_BG' => 'български - България',
-		'ca_Latn_ES' => 'català - català',
-		'cs_Latn_CZ' => 'čeština - Česká republika',
-		'de_Latn_DE' => 'Deutsch - Deutschland',
-		'en_Latn_US' => 'English - United States',
-		'es_Latn_ES' => 'Español - España, alfabetización internacional',
-		'fa_Arab_IR' => 'فارسى - ایران',
-		'fi_Latn_FI' => 'suomi - Suomi',
-		'fr_Latn_FR' => 'français - France',
-		'gl_Latn_ES' => 'galego - galego',
-		'hu_Latn_HU' => 'magyar - Magyarország',
-		'it_Latn_IT' => 'italiano - Italia',
-		'ja_Jpan_JP' => '日本語 - 日本',
-		'ko_Kore_KR' => '한국어 - 대한민국',
-		'lv_Latn_LV' => 'latviešu - Latvija',
-		'nl_Latn_NL' => 'Nederlands - Nederland',
-		'pt_Latn_BR' => 'Português - Brasil',
-		'ru_Cyrl_RU' => 'русский - Россия',
-		'sk_Latn_SK' => 'slovenčina - Slovenská republika',
-		'zh_Hans_CN' => '中文 - 中华人民共和国',
-		'zh_Hant_TW' => '中文 - 台灣'
-	);
-	
 	$localelist = i18n::get_available_locale_list();
 	$locales = array();
 	foreach ( $localelist as $locale ) {
 		$checkfile = './locales/' . $locale . '.' . i18n::get_current_charset() . '.php';
-		$locales[] = array( $locale, (!file_exists($checkfile) ? '*' : '') . $native_locales[$locale] );
+		$locales[] = array( $locale, (!file_exists($checkfile) ? '*&nbsp;' : '') . $locale );
 	}
 ?>
 		<div id="container">
@@ -346,6 +313,11 @@ function show_select_locale_form()
 				<div class="prt">
 					<select name="locale">
 <?php
+	// Get the browser language that can be displayed
+	// TODO: default locale select simple implementation
+	$languages = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
+	$language = (is_array($languages) && count($languages) > 0) ? preg_replace('#^([\w]+).*$#', '$1', $languages[0]) : '';
+
 	foreach ( $locales as $locale )
 	{
 		echo "<option value=\"$locale[0]\"";
@@ -357,9 +329,8 @@ function show_select_locale_form()
 	}
 ?>
 					</select>
-					<p>
-					Locale with an asterisk, because there is no language file for the installation, will be in English.<br />
-					We will wait for the translator by volunteers!
+					<p>Nucleus is installed in the selected locale, the locale of the Asterisk prefixed will be displayed in English because there is no translation of the installer file.</p>
+					<p>We will wait for the translator by volunteers!</p>
 					</p>
 					<p class="sbt">
 						<button type="submit" name="action" value="locale" class="sbt_arw">START</button>
@@ -1370,7 +1341,6 @@ function do_check_files()
 		'../nucleus/libs/COMMENT.php',
 		'../nucleus/libs/COMMENTACTIONS.php',
 		'../nucleus/libs/COMMENTS.php',
-		'../nucleus/libs/ENCAPSULATE.php',
 		'../nucleus/libs/ENTITY.php',
 		'../nucleus/libs/globalfunctions.php',
 		'../nucleus/libs/i18n.php',