OSDN Git Service

(root) / magic3 / magic3.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 403b82b)
インストーラ更新。
authornaoki hirata <naoki@magic3.org>
Tue, 23 Jan 2018 03:09:43 +0000 (12:09 +0900)
committernaoki hirata <naoki@magic3.org>
Tue, 23 Jan 2018 03:09:43 +0000 (12:09 +0900)
widgets/_install/include/container/_installInputparamWidgetContainer.php patch | blob | history
widgets/_install/include/locale/ja_JP.mo patch | blob | history
widgets/_install/include/locale/ja_JP.po patch | blob | history
widgets/_install/include/template/inputparam.tmpl.html patch | blob | history

diff --git a/widgets/_install/include/container/_installInputparamWidgetContainer.php b/widgets/_install/include/container/_installInputparamWidgetContainer.php
index 3a30f40..5dbc269 100644 (file)
--- a/widgets/_install/include/container/_installInputparamWidgetContainer.php
+++ b/widgets/_install/include/container/_installInputparamWidgetContainer.php
@@ -8,7 +8,7 @@
  *
  * @package    Magic3 Framework
  * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>
- * @copyright  Copyright 2006-2015 Magic3 Project.
+ * @copyright  Copyright 2006-2018 Magic3 Project.
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License
  * @version    SVN: $Id$
  * @link       http://www.magic3.org
@@ -165,7 +165,10 @@ class _installInputparamWidgetContainer extends _installBaseWidgetContainer
                                        $db = new _installDB();
                                        
                                        // 接続テスト
+                                       $db->displayErrMessage(false);          // エラーメッセージの画面出力を抑止
                                        if ($db->testDbConnection($dsn, $dbuser, $password)){
+                                               $db->displayErrMessage(true);           // エラーメッセージの画面出力解除
+                                               
                                                $isErr = false;                 // エラーありかどうか
                                                $msg = '<b><font color="green">' . $this->_('Succeeded in connecting database.') . '</font></b>';                       // 接続正常
                                                
@@ -221,13 +224,22 @@ class _installInputparamWidgetContainer extends _installBaseWidgetContainer
                                                        }
                                                        $isTested = true;                       // 接続テスト完了かどうか
                                                }
-                                       } else {
-                                               $msg .= '<b><font color="red">' . $this->_('Failed in connecting database.') . '</font></b>';           // 接続エラー
+                                       } else {                // 接続エラーの場合
+                                               // エラーメッセージ作成
+                                               $message = $this->_('Failed in connecting database. Confirm the db connection information.');
+                                               $errors = $db->getErrMsg();
+                                               for ($i = 0; $i < count($errors); $i++){
+                                                       $message .= '<br />' . $errors[$i];
+                                               }
+                                               $this->setMsg(self::MSG_APP_ERR, $message);
+                                               
+                                               $msg .= '<b><font color="red">' . $this->_('Failed in connecting.') . '</font></b>';            // 接続エラー
                                        }
                                        $this->tmpl->addVar('_widget', 'db_test',       $msg);
                                }
                        }
                }
+
                // インストール定義ファイルがある場合は設定値を取得
                if (defined('M3_INSTALL_PRE_FIXED_DB') && M3_INSTALL_PRE_FIXED_DB){                     // DB接続を固定する場合
                        $dbname = defined('M3_INSTALL_DB_NAME') ? M3_INSTALL_DB_NAME : '';
diff --git a/widgets/_install/include/locale/ja_JP.mo b/widgets/_install/include/locale/ja_JP.mo
index d72f184..49809e2 100644 (file)
Binary files a/widgets/_install/include/locale/ja_JP.mo and b/widgets/_install/include/locale/ja_JP.mo differ
diff --git a/widgets/_install/include/locale/ja_JP.po b/widgets/_install/include/locale/ja_JP.po
index 88b18a2..7a9b6d7 100644 (file)
--- a/widgets/_install/include/locale/ja_JP.po
+++ b/widgets/_install/include/locale/ja_JP.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-09 20:19+0900\n"
-"PO-Revision-Date: 2017-10-09 20:20+0900\n"
+"POT-Creation-Date: 2018-01-23 11:49+0900\n"
+"PO-Revision-Date: 2018-01-23 11:49+0900\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ja_JP\n"
@@ -482,12 +482,12 @@ msgid "Can't use database."
 msgstr "DBが使用できません"
 
 #: container/_installInputparamWidgetContainer.php:133
-#: container/_installInputparamWidgetContainer.php:313
+#: container/_installInputparamWidgetContainer.php:321
 msgid "User"
 msgstr "DBユーザ"
 
 #: container/_installInputparamWidgetContainer.php:136
-#: container/_installInputparamWidgetContainer.php:312
+#: container/_installInputparamWidgetContainer.php:320
 msgid "Database Name"
 msgstr "DB名"
 
@@ -503,79 +503,83 @@ msgstr "設定値を更新しました"
 msgid "Failed in updating configration."
 msgstr "設定値の更新に失敗しました"
 
-#: container/_installInputparamWidgetContainer.php:170
+#: container/_installInputparamWidgetContainer.php:173
 msgid "Succeeded in connecting database."
 msgstr "接続正常"
 
-#: container/_installInputparamWidgetContainer.php:180
+#: container/_installInputparamWidgetContainer.php:183
 msgid "Invalid sql_mode. It requires blank value."
 msgstr "sql_modeが不正です。空文字列に設定して下さい。"
 
-#: container/_installInputparamWidgetContainer.php:181
+#: container/_installInputparamWidgetContainer.php:184
 msgid "Invalid sql_mode."
 msgstr "sql_mode不正"
 
-#: container/_installInputparamWidgetContainer.php:206
+#: container/_installInputparamWidgetContainer.php:209
 msgid "Invalid encoding for Japanese."
 msgstr "日本語を使用するためのエンコード設定が不正です。"
 
-#: container/_installInputparamWidgetContainer.php:207
+#: container/_installInputparamWidgetContainer.php:210
 msgid "Incollect encoding."
 msgstr "エンコーディングエラー"
 
-#: container/_installInputparamWidgetContainer.php:218
+#: container/_installInputparamWidgetContainer.php:221
 msgid "Succeeded in creating table."
 msgstr "テーブル作成正常"
 
-#: container/_installInputparamWidgetContainer.php:220
+#: container/_installInputparamWidgetContainer.php:223
 msgid "Failed in creating table."
 msgstr "テーブル作成エラー"
 
-#: container/_installInputparamWidgetContainer.php:225
-msgid "Failed in connecting database."
+#: container/_installInputparamWidgetContainer.php:228
+msgid "Failed in connecting database. Confirm the db connection information."
+msgstr "DB接続に失敗しました。DB接続情報を確認してください。"
+
+#: container/_installInputparamWidgetContainer.php:232
+msgid "Failed in connecting."
 msgstr "接続エラー"
 
-#: container/_installInputparamWidgetContainer.php:301
+#: container/_installInputparamWidgetContainer.php:309
 msgid "Update Config"
 msgstr "設定値を更新"
 
-#: container/_installInputparamWidgetContainer.php:302
+#: container/_installInputparamWidgetContainer.php:310
 msgid "Test Connection"
 msgstr "接続テスト"
 
-#: container/_installInputparamWidgetContainer.php:303
+#: container/_installInputparamWidgetContainer.php:311
 msgid "Configration changed.\\nUpdate configration?"
 msgstr "設定値が変更されています\\n設定値を保存しますか?"
 
-#: container/_installInputparamWidgetContainer.php:304
+#: container/_installInputparamWidgetContainer.php:312
 msgid "Update configration?"
 msgstr "設定値を更新しますか?"
 
-#: container/_installInputparamWidgetContainer.php:305
+#: container/_installInputparamWidgetContainer.php:313
 msgid "Input Site Information"
 msgstr "サイト情報入力"
 
-#: container/_installInputparamWidgetContainer.php:307
+#: container/_installInputparamWidgetContainer.php:315
 msgid "Site Information"
 msgstr "サイト情報"
 
-#: container/_installInputparamWidgetContainer.php:308
+#: container/_installInputparamWidgetContainer.php:316
 msgid "Root URL"
 msgstr "ルートURL"
 
-#: container/_installInputparamWidgetContainer.php:309
+#: container/_installInputparamWidgetContainer.php:317
 msgid "Database Information"
 msgstr "DB接続情報"
 
-#: container/_installInputparamWidgetContainer.php:310
+#: container/_installInputparamWidgetContainer.php:318
 msgid "Database Type"
 msgstr "DB種別"
 
-#: container/_installInputparamWidgetContainer.php:311
+#: container/_installInputparamWidgetContainer.php:319
 msgid "Hostname"
 msgstr "ホスト名"
 
-#: container/_installInputparamWidgetContainer.php:314
+#: container/_installInputparamWidgetContainer.php:322
 msgid "Password"
 msgstr "パスワード"
 
diff --git a/widgets/_install/include/template/inputparam.tmpl.html b/widgets/_install/include/template/inputparam.tmpl.html
index f0a7284..38f0323 100644 (file)
--- a/widgets/_install/include/template/inputparam.tmpl.html
+++ b/widgets/_install/include/template/inputparam.tmpl.html
@@ -5,7 +5,7 @@
  *
  * @package    Magic3 Framework
  * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>
- * @copyright  Copyright 2006-2017 Magic3 Project.
+ * @copyright  Copyright 2006-2018 Magic3 Project.
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License
  * @version    SVN: $Id$
  * @link       http://www.magic3.org
Cloud computing platform
About OSDN
Find Software
Develop Software
Help