スキン編集画面の翻訳の抜けを修正

スキン編集画面のブログ一覧がどちらも｢名前｣になっていたのを修正
Ping送信画面を翻訳
Ping送信画面用の定数を追加
英語版言語ファイルに無かったBLOGLIST等の定数も追加

git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/nucleus-jp/branches/branch-3-3@372 1ca29b6e-896d-4ea0-84a5-967f57386b96

diff --git a/utf8/nucleus/language/english.php b/utf8/nucleus/language/english.php
index d5ff737..85e9372 100755 (executable)
--- a/utf8/nucleus/language/english.php
+++ b/utf8/nucleus/language/english.php
@@ -757,6 +757,10 @@ define('_TEMPLATE_SNOTFOUND',              'Nothing found in search');
 define('_TEMPLATE_UPDATE',                     'Update');
 define('_TEMPLATE_UPDATE_BTN',         'Update Template');
 define('_TEMPLATE_RESET_BTN',          'Reset Data');
+define('_TEMPLATE_BLOGLIST',            'Blog Lists');
+define('_TEMPLATE_BLOGHEADER',          'Blog Lists Header');
+define('_TEMPLATE_BLOGITEM',            'Blog Lists Item');
+define('_TEMPLATE_BLOGFOOTER',          'Blog Lists Footer');
 define('_TEMPLATE_CATEGORYLIST',       'Category Lists');
 define('_TEMPLATE_CATHEADER',          'Category List Header');
 define('_TEMPLATE_CATITEM',                    'Category List Item');
@@ -791,6 +795,8 @@ define('_SKIN_RESET_BTN',                   'Reset Data');
 define('_SKIN_EDITPART_TITLE',         'Edit Skin');
 define('_SKIN_GOBACK',                         'Go Back');
 define('_SKIN_ALLOWEDVARS',                    'Allowed Variables (click for info):');
+define('_SKIN_ALLOWEDBLOGS',           'Short blog names:');                   // <add by shizuki>
+define('_SKIN_ALLOWEDTEMPLATESS',      'Template names:');             // <add by shizuki>
 
 // global settings
 define('_SETTINGS_TITLE',                      'General Settings');
@@ -984,4 +990,14 @@ define('_EDITC_NONMEMBER',                 'non member');
 define('_MOVE_TITLE',                          'Move to which blog?');
 define('_MOVE_BTN',                                    'Move Item');
 
-?>
+// <add by shizuki>
+// send Weblogupdate.ping
+define('_UPDATEDPING_MESSAGE',         '<h2>Site Updated, Now pinging various weblog listing services...</h2><p>This can take a while...</p><p>If you aren\'t automatically passed through, ');
+define('_UPDATEDPING_GOPINGPAGE',      'try again');
+define('_UPDATEDPING_PINGING',         'Pinging services, please wait...');
+define('_UPDATEDPING_VIEWITEM',                'View list of recent items for ');
+define('_UPDATEDPING_VISITOWNSITE',    'Visit your own site');
+// </add by shizuki>
+
+
+?>
\ No newline at end of file

diff --git a/utf8/nucleus/language/japanese-utf8.php b/utf8/nucleus/language/japanese-utf8.php
index 63869a7..82b234f 100755 (executable)
--- a/utf8/nucleus/language/japanese-utf8.php
+++ b/utf8/nucleus/language/japanese-utf8.php
@@ -525,7 +525,8 @@ define('_ADD_DISABLE_COMMENTS',             'コメントを無効にしますか?');
 define('_ADD_DRAFTNFUTURE',                    'ドラフトと未来の記事');
 define('_ADD_ADDITEM',                         'アイテムを追加');
 define('_ADD_ADDNOW',                          '今すぐ追加');
-define('_ADD_ADDLATER',                                '後で追加');
+//define('_ADD_ADDLATER',                              '後で追加');
+define('_ADD_ADDLATER',                                '日時を指定して追加'); // <mod by shizuki />
 define('_ADD_PLACE_ON',                                '日時:');
 define('_ADD_ADDDRAFT',                                'ドラフトに追加');
 define('_ADD_NOPASTDATES',                     '(過去の日時は指定できません。指定された場合は現在の日時が使用されます)');
@@ -814,6 +815,8 @@ define('_SKIN_RESET_BTN',                   'リセット');
 define('_SKIN_EDITPART_TITLE',         'スキンの編集');
 define('_SKIN_GOBACK',                         '戻る');
 define('_SKIN_ALLOWEDVARS',                    '使用可能な変数 (クリックで説明表示):');
+define('_SKIN_ALLOWEDBLOGS',           '作成済みのブログ:');                   // <add by shizuki>
+define('_SKIN_ALLOWEDTEMPLATESS',      '使用可能なテンプレート:');          // <add by shizuki>
 
 // global settings
 define('_SETTINGS_TITLE',                      'グローバル設定');
@@ -1007,4 +1010,12 @@ define('_EDITC_NONMEMBER',                       '非メンバー');
 define('_MOVE_TITLE',                          'どのBlogに移動しますか?');
 define('_MOVE_BTN',                                    'アイテムを移動する');
 
-?>
+// <add by shizuki>
+// send Weblogupdate.ping
+define('_UPDATEDPING_MESSAGE',         '<h2>サイトが更新されました。Pingサーバに更新を通知します。</h2><p>しばらくお待ちください</p><p>自動的にページが切り替わらない場合は、表示されるリンクをクリックしてください。');
+define('_UPDATEDPING_GOPINGPAGE',      '更新Ping送信');
+define('_UPDATEDPING_PINGING',         'Pingサーバに送信中です');
+define('_UPDATEDPING_VISITOWNSITE',    'サイトへ行ってみる');
+// </add by shizuki>
+
+?>
\ No newline at end of file

diff --git a/utf8/nucleus/libs/ADMIN.php b/utf8/nucleus/libs/ADMIN.php
index 559ac97..1c7c216 100755 (executable)
--- a/utf8/nucleus/libs/ADMIN.php
+++ b/utf8/nucleus/libs/ADMIN.php
@@ -14,8 +14,8 @@
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2007 The Nucleus Group
- * @version $Id: ADMIN.php,v 1.21.2.4 2007-10-30 19:04:24 kmorimatsu Exp $
- * @version $NucleusJP: ADMIN.php,v 1.21.2.3 2007/10/30 14:21:58 shizuki Exp $
+ * @version $Id: ADMIN.php,v 1.21.2.5 2008-07-12 15:05:17 shizuki Exp $
+ * @version $NucleusJP: ADMIN.php,v 1.21.2.4 2007/10/30 19:04:24 kmorimatsu Exp $
  */
 
 if ( !function_exists('requestVar') ) exit;
@@ -1437,6 +1437,9 @@ class ADMIN {
                $rawPingUrl = $manager->addTicketToUrl('index.php?action=rawping&blogid=' . intval($blogid));
 
                $this->pagehead('<meta http-equiv="refresh" content="1; url='.htmlspecialchars($rawPingUrl).'" />');
+// <mod by shizuki>
+               echo _UPDATEDPING_MESSAGE . '<a href="index.php?action=rawping&amp;blogid=' . $blogid .'">' . _UPDATEDPING_GOPINGPAGE . '</a>';
+/*
                ?>
                <h2>Site Updated, Now pinging various weblog listing services...</h2>
 
@@ -1448,6 +1451,9 @@ class ADMIN {
                        If you aren't automatically passed through, <a href="index.php?action=rawping&amp;blogid=<?php echo $blogid?>">try again</a>
                </p>
                <?php           $this->pagefoot();
+*/
+// </mod by shizuki>
+               $this->pagefoot();
        }
 
        /**
@@ -1461,25 +1467,34 @@ class ADMIN {
                $blog =& $manager->getBlog($blogid);
 
                $this->pagehead();
-
-               ?>
-
+/* <mod by shizuki>
+               ? >
                <h2>Pinging services, please wait...</h2>
                <div class='note'>
-                <?php
+                < ? php
 
                // send sendPing event
                $manager->notify('SendPing', array('blogid' => $blogid));
 
-                ?>
+                ? >
                 </div>
 
                <ul>
-                       <li><a href="index.php?action=itemlist&amp;blogid=<?php echo $blog->getID()?>">View list of recent items for <?php echo htmlspecialchars($blog->getName())?></a></li>
-                       <li><a href="<?php echo $blog->getURL()?>">Visit your own site</a></li>
+                       <li><a href="index.php?action=itemlist&amp;blogid=< ? php echo $blog->getID()? >">View list of recent items for < ? php echo htmlspecialchars($blog->getName())? ></a></li>
+                       <li><a href="< ? php echo $blog->getURL() ? >">Visit your own site</a></li>
                </ul>
 
-               <?php           $this->pagefoot();
+               < ? php         $this->pagefoot();
+*/
+               echo '<h2>' . _UPDATEDPING_PINGING . '</h2><div class="note">';
+               // send sendPing event
+               $manager->notify('SendPing', array('blogid' => $blogid));
+               echo '</div>';
+               echo '<ul><li><a href="index.php?action=itemlist&amp;blogid=' . $blog->getID() . '">';
+               echo _UPDATEDPING_VIEWITEM . htmlspecialchars($blog->getName()) . '</a></li>';
+               echo '<li><a href="' . $blog->getURL() . '">' . _UPDATEDPING_VISITOWNSITE . '</a></li></ul>';
+               $this->pagefoot();
+// </mod by shizuki>
        }
 
        /**
@@ -4371,13 +4386,13 @@ selector();
                        }
                ?>
                <br /><br />
-               Short blog names:
+               <?php echo _SKIN_ALLOWEDBLOGS ?>
                <?php                   $query = 'SELECT bshortname, bname FROM '.sql_table('blog');
                        showlist($query,'table',array('content'=>'shortblognames'));
                ?>
 
                <br />
-               Template names:
+               <?php echo _SKIN_ALLOWEDTEMPLATESS ?>
                <?php                   $query = 'SELECT tdname as name, tddesc as description FROM '.sql_table('template_desc');
                        showlist($query,'table',array('content'=>'shortnames'));
                ?>

diff --git a/utf8/nucleus/libs/showlist.php b/utf8/nucleus/libs/showlist.php
index e5f9c5a..d427d00 100644 (file)
--- a/utf8/nucleus/libs/showlist.php
+++ b/utf8/nucleus/libs/showlist.php
@@ -14,8 +14,8 @@
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2007 The Nucleus Group
- * @version $Id: showlist.php,v 1.7.2.3 2007-12-03 00:01:48 kmorimatsu Exp $
- * @version $NucleusJP: showlist.php,v 1.7.2.2 2007/12/02 23:53:56 kmorimatsu Exp $
+ * @version $Id: showlist.php,v 1.7.2.4 2008-07-12 15:05:17 shizuki Exp $
+ * @version $NucleusJP: showlist.php,v 1.7.2.3 2007/12/03 00:01:48 kmorimatsu Exp $
  */
 
 
@@ -430,7 +430,7 @@ function listplug_table_bloglist($template, $type) {
 function listplug_table_shortblognames($template, $type) {
        switch($type) {
                case 'HEAD':
-                       echo "<th>" . _NAME . "</th><th>" . _NAME. "</th>";
+                       echo "<th>" . _EBLOG_SHORTNAME . "</th><th>" . _EBLOG_NAME . "</th>";
                        break;
                case 'BODY':
                        $current = $template['current'];