[Svn-src-all:3628] [version-2_12_3en-p1 22540] #2084 メッセージIDに含まれる「\n」を削除しました。
m_uehara
admin ＠ mail.ec-cube.net
2013年 2月 13日 (水) 18:53:53 JST
Subversion committed to /home/svn/open 22540
http://svn.ec-cube.net/open_trac/changeset/22540
┌────────────────────────────┐
│更新者 : m_uehara │
│更新日時: 2013-02-13 18:53:53 +0900 (水, 13 2月 2013)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#2084 メッセージIDに含まれる「\n」を削除しました。
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_12_3en-p1/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php
U branches/version-2_12_3en-p1/data/class/pages/error/LC_Page_Error.php
U branches/version-2_12_3en-p1/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php
U branches/version-2_12_3en-p1/data/class/pages/shopping/LC_Page_Shopping.php
U branches/version-2_12_3en-p1/data/locales/en-US.po
U branches/version-2_12_3en-p1/data/locales/ja.po
U branches/version-2_12_3en-p1/html/install/index.php
変更: branches/version-2_12_3en-p1/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php
===================================================================
--- branches/version-2_12_3en-p1/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php 2013-02-13 09:52:55 UTC (rev 22539)
+++ branches/version-2_12_3en-p1/data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php 2013-02-13 09:53:53 UTC (rev 22540)
@@ -486,8 +486,8 @@
$success = $tar->extract($work_dir);
if (!$success) {
- $msg = t('c_Decompression of backup file failed.\n_01');
- $msg .= t('c_Decompression source: T_ARG1 \n_01', array('T_ARG1' => $bkup_filepath));
+ $msg = t('c_Decompression of backup file failed._01');
+ $msg .= t('c_Decompression source: T_ARG1 _01', array('T_ARG1' => $bkup_filepath));
$msg .= t('c_Decompression destination: T_ARG1_01', array('T_ARG1' => $work_dir));
trigger_error($msg, E_USER_ERROR);
}
変更: branches/version-2_12_3en-p1/data/class/pages/error/LC_Page_Error.php
===================================================================
--- branches/version-2_12_3en-p1/data/class/pages/error/LC_Page_Error.php 2013-02-13 09:52:55 UTC (rev 22539)
+++ branches/version-2_12_3en-p1/data/class/pages/error/LC_Page_Error.php 2013-02-13 09:53:53 UTC (rev 22540)
@@ -132,7 +132,7 @@
$this->tpl_error=t('c_This product is already added to your favorites_01');
break;
case EXTRACT_ERROR:
- $this->tpl_error=t('c_File decompression failed.\nWrite access may not have been granted to the designated directory._01');
+ $this->tpl_error=t('c_File decompression failed.Write access may not have been granted to the designated directory._01');
break;
case FTP_DOWNLOAD_ERROR:
$this->tpl_error=t('c_FTP download of file failed._01');
@@ -144,16 +144,16 @@
$this->tpl_error=t('c_FTP login failed._02');
break;
case CREATE_DB_ERROR:
- $this->tpl_error=t('c_DB creation failed. \nThe user designated by may not have been granted DB creation access._01');
+ $this->tpl_error=t('c_DB creation failed. The user designated by may not have been granted DB creation access._01');
break;
case DB_IMPORT_ERROR:
- $this->tpl_error=t('c_Import of the database structure failed. \nThe sql file may be damaged._01');
+ $this->tpl_error=t('c_Import of the database structure failed. The sql file may be damaged._01');
break;
case FILE_NOT_FOUND:
$this->tpl_error=t('c_The settings file does not exist in the designated path._01');
break;
case WRITE_FILE_ERROR:
- $this->tpl_error=t('c_It is not possible to write to the file settings.\nGrant write access to file settings._01');
+ $this->tpl_error=t('c_It is not possible to write to the file settings.Grant write access to file settings._01');
break;
case DOWNFILE_NOT_FOUND:
$this->tpl_error=t('c_The download file does not exist. <br /> Please inquire at the store._01');
変更: branches/version-2_12_3en-p1/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php
===================================================================
--- branches/version-2_12_3en-p1/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php 2013-02-13 09:52:55 UTC (rev 22539)
+++ branches/version-2_12_3en-p1/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php 2013-02-13 09:53:53 UTC (rev 22540)
@@ -237,7 +237,7 @@
function lfGetErrorMessage($error) {
switch ($error) {
case TEMP_LOGIN_ERROR:
- $msg = t('c_The e-mail address or password is not correct.\nIf you have not completed registration, access the registration page from the URL given to you in an e-mail._01');
+ $msg = t('c_The e-mail address or password is not correct.If you have not completed registration, access the registration page from the URL given to you in an e-mail._01');
break;
case SITE_LOGIN_ERROR:
default:
変更: branches/version-2_12_3en-p1/data/class/pages/shopping/LC_Page_Shopping.php
===================================================================
--- branches/version-2_12_3en-p1/data/class/pages/shopping/LC_Page_Shopping.php 2013-02-13 09:52:55 UTC (rev 22539)
+++ branches/version-2_12_3en-p1/data/class/pages/shopping/LC_Page_Shopping.php 2013-02-13 09:53:53 UTC (rev 22540)
@@ -500,7 +500,7 @@
function lfGetErrorMessage($error) {
switch ($error) {
case TEMP_LOGIN_ERROR:
- $msg = t('c_The e-mail address or password is not correct.\nIf you have not completed registration, complete registration from the URL given in the temporary registration e-mail._01');
+ $msg = t('c_The e-mail address or password is not correct.If you have not completed registration, complete registration from the URL given in the temporary registration e-mail._01');
break;
case SITE_LOGIN_ERROR:
default:
変更: branches/version-2_12_3en-p1/data/locales/en-US.po
===================================================================
--- branches/version-2_12_3en-p1/data/locales/en-US.po 2013-02-13 09:52:55 UTC (rev 22539)
+++ branches/version-2_12_3en-p1/data/locales/en-US.po 2013-02-13 09:53:53 UTC (rev 22540)
@@ -1922,7 +1922,7 @@
msgid "c_This product is already added to your favorites_01"
msgstr "This product is already added to your favorites"
-msgid "c_File decompression failed.\nWrite access may not have been granted to the designated directory._01"
+msgid "c_File decompression failed.Write access may not have been granted to the designated directory._01"
msgstr ""
"File decompression failed.\n"
"Write access may not have been granted to the designated directory."
@@ -1936,12 +1936,12 @@
msgid "c_FTP login failed._02"
msgstr "FTP login failed."
-msgid "c_DB creation failed. \nThe user designated by may not have been granted DB creation access._01"
+msgid "c_DB creation failed. The user designated by may not have been granted DB creation access._01"
msgstr ""
"DB creation failed. \n"
"The user designated by may not have been granted DB creation access."
-msgid "c_Import of the database structure failed. \nThe sql file may be damaged._01"
+msgid "c_Import of the database structure failed. The sql file may be damaged._01"
msgstr ""
"Import of the database structure failed. \n"
"The sql file may be damaged."
@@ -1949,7 +1949,7 @@
msgid "c_The settings file does not exist in the designated path._01"
msgstr "The settings file does not exist in the designated path."
-msgid "c_It is not possible to write to the file settings.\nGrant write access to file settings._01"
+msgid "c_It is not possible to write to the file settings.Grant write access to file settings._01"
msgstr ""
"It is not possible to write to the file settings.\n"
"Grant write access to file settings."
@@ -2011,7 +2011,7 @@
msgid "c_The password has been changed._01"
msgstr "The password has been changed."
-msgid "c_The e-mail address or password is not correct.\nIf you have not completed registration, access the registration page from the URL given to you in an e-mail._01"
+msgid "c_The e-mail address or password is not correct.If you have not completed registration, access the registration page from the URL given to you in an e-mail._01"
msgstr ""
"The e-mail address or password is not correct.\n"
"If you have not completed registration, access the registration page from "
@@ -2113,7 +2113,7 @@
"For shopping that includes downloaded products, member registration is "
"necessary.<br />Please carry out member registration."
-msgid "c_The e-mail address or password is not correct.\nIf you have not completed registration, complete registration from the URL given in the temporary registration e-mail._01"
+msgid "c_The e-mail address or password is not correct.If you have not completed registration, complete registration from the URL given in the temporary registration e-mail._01"
msgstr ""
"The e-mail address or password is not correct.\n"
"If you have not completed registration, complete registration from the URL "
@@ -2205,12 +2205,12 @@
msgid "c_×: The sequence was not deleted.<br />_01"
msgstr "×: The sequence was not deleted.<br />"
-msgid "c_>> ×:T_ARG1(T_ARG2)\nPlease grant user write access (777, 707, etc.)_01"
+msgid "c_>> ×:T_ARG1(T_ARG2)Please grant user write access (777, 707, etc.)_01"
msgstr ""
">> ×:T_ARG1(T_ARG2)\n"
"Please grant user write access (777, 707, etc.)"
-msgid "c_>> ×:T_ARG1(T_ARG2)\nPlease grant user write access (666, 606, etc.)_01"
+msgid "c_>> ×:T_ARG1(T_ARG2)Please grant user write access (666, 606, etc.)_01"
msgstr ""
">> ×:T_ARG1(T_ARG2)\n"
"Please grant user write access (666, 606, etc.)"
@@ -2984,12 +2984,12 @@
msgid "c_(No record. Only backup file available.)_01"
msgstr "(No record. Only backup file available.)"
-msgid "c_Decompression of backup file failed.\n_01"
+msgid "c_Decompression of backup file failed._01"
msgstr ""
"Decompression of backup file failed.\n"
" "
-msgid "c_Decompression source: T_ARG1 \n_01"
+msgid "c_Decompression source: T_ARG1 _01"
msgstr ""
"Decompression source: T_ARG1 \n"
" "
変更: branches/version-2_12_3en-p1/data/locales/ja.po
===================================================================
--- branches/version-2_12_3en-p1/data/locales/ja.po 2013-02-13 09:52:55 UTC (rev 22539)
+++ branches/version-2_12_3en-p1/data/locales/ja.po 2013-02-13 09:53:53 UTC (rev 22540)
@@ -1902,7 +1902,7 @@
msgid "c_This product is already added to your favorites_01"
msgstr "既にお気に入りに追加されている商品です"
-msgid "c_File decompression failed.\nWrite access may not have been granted to the designated directory._01"
+msgid "c_File decompression failed.Write access may not have been granted to the designated directory._01"
msgstr ""
"ファイルの解凍に失敗しました。\n"
"指定のディレクトリに書き込み権限が与えられていない可能性があります。"
@@ -1916,12 +1916,12 @@
msgid "c_FTP login failed._02"
msgstr "FTPログインに失敗しました。"
-msgid "c_DB creation failed. \nThe user designated by may not have been granted DB creation access._01"
+msgid "c_DB creation failed. The user designated by may not have been granted DB creation access._01"
msgstr ""
"DBの作成に失敗しました。\n"
"指定のユーザーには、DB作成の権限が与えられていない可能性があります。"
-msgid "c_Import of the database structure failed. \nThe sql file may be damaged._01"
+msgid "c_Import of the database structure failed. The sql file may be damaged._01"
msgstr ""
"データベース構造のインポートに失敗しました。\n"
"sqlファイルが壊れている可能性があります。"
@@ -1929,7 +1929,7 @@
msgid "c_The settings file does not exist in the designated path._01"
msgstr "指定のパスに、設定ファイルが存在しません。"
-msgid "c_It is not possible to write to the file settings.\nGrant write access to file settings._01"
+msgid "c_It is not possible to write to the file settings.Grant write access to file settings._01"
msgstr ""
"設定ファイルに書き込めません。\n"
"設定ファイルに書き込み権限を与えてください。"
@@ -1997,7 +1997,7 @@
msgid "c_The password has been changed._01"
msgstr "パスワードを変更いたしました。"
-msgid "c_The e-mail address or password is not correct.\nIf you have not completed registration, access the registration page from the URL given to you in an e-mail._01"
+msgid "c_The e-mail address or password is not correct.If you have not completed registration, access the registration page from the URL given to you in an e-mail._01"
msgstr ""
"メールアドレスもしくはパスワードが正しくありません。\n"
"本登録がお済みでない場合は、仮登録メールに記載されているURLより本登録を行って"
@@ -2099,7 +2099,7 @@
"ダウンロード商品を含むお買い物は、会員登録が必要です。<br />お手数ですが、会"
"員登録をお願いします。"
-msgid "c_The e-mail address or password is not correct.\nIf you have not completed registration, complete registration from the URL given in the temporary registration e-mail._01"
+msgid "c_The e-mail address or password is not correct.If you have not completed registration, complete registration from the URL given in the temporary registration e-mail._01"
msgstr ""
"メールアドレスもしくはパスワードが正しくありません。\n"
"本登録がお済みでない場合は、仮登録メールに記載されているURLより本登録を行って"
@@ -2186,12 +2186,12 @@
msgid "c_×: The sequence was not deleted.<br />_01"
msgstr "×：シーケンスの削除に失敗しました。<br />"
-msgid "c_>> ×:T_ARG1(T_ARG2)\nPlease grant user write access (777, 707, etc.)_01"
+msgid "c_>> ×:T_ARG1(T_ARG2)Please grant user write access (777, 707, etc.)_01"
msgstr ""
">> ×：T_ARG1(T_ARG2)\n"
"ユーザ書込み権限(777, 707等)を付与して下さい。"
-msgid "c_>> ×:T_ARG1(T_ARG2)\nPlease grant user write access (666, 606, etc.)_01"
+msgid "c_>> ×:T_ARG1(T_ARG2)Please grant user write access (666, 606, etc.)_01"
msgstr ""
">> ×：T_ARG1(T_ARG2)\n"
"ユーザ書込み権限(666, 606等)を付与して下さい。"
@@ -2947,12 +2947,12 @@
msgid "c_(No record. Only backup file available.)_01"
msgstr "(記録なし。バックアップファイルのみ。)"
-msgid "c_Decompression of backup file failed.\n_01"
+msgid "c_Decompression of backup file failed._01"
msgstr ""
"バックアップファイルの展開に失敗しました。\n"
" "
-msgid "c_Decompression source: T_ARG1 \n_01"
+msgid "c_Decompression source: T_ARG1 _01"
msgstr ""
"展開元: T_ARG1 \n"
" "
変更: branches/version-2_12_3en-p1/html/install/index.php
===================================================================
--- branches/version-2_12_3en-p1/html/install/index.php 2013-02-13 09:52:55 UTC (rev 22539)
+++ branches/version-2_12_3en-p1/html/install/index.php 2013-02-13 09:53:53 UTC (rev 22540)
@@ -348,14 +348,14 @@
// ディレクトリの場合
if (is_dir($path)) {
if (!is_writable($path)) {
- $mess .= t('c_>> ×:T_ARG1(T_ARG2)\nPlease grant user write access (777, 707, etc.)_01', array('T_ARG1' => $real_path, 'T_ARG2' => $filemode));
+ $mess .= t('c_>> ×:T_ARG1(T_ARG2)Please grant user write access (777, 707, etc.)_01', array('T_ARG1' => $real_path, 'T_ARG2' => $filemode));
$hasErr = true;
} else {
GC_Utils_Ex::gfPrintLog('WRITABLE：' . $path, INSTALL_LOG);
}
} else {
if (!is_writable($path)) {
- $mess .= t('c_>> ×:T_ARG1(T_ARG2)\nPlease grant user write access (666, 606, etc.)_01', array('T_ARG1' => $real_path, 'T_ARG2' => $filemode));
+ $mess .= t('c_>> ×:T_ARG1(T_ARG2)Please grant user write access (666, 606, etc.)_01', array('T_ARG1' => $real_path, 'T_ARG2' => $filemode));
$hasErr = true;
} else {
GC_Utils_Ex::gfPrintLog('WRITABLE：' . $path, INSTALL_LOG);
Svn-src-all メーリングリストの案内