Index: trunk/wp-content/plugins/xpressme/include/custom_functions.php =================================================================== --- trunk/wp-content/plugins/xpressme/include/custom_functions.php (revision 217) +++ trunk/wp-content/plugins/xpressme/include/custom_functions.php (revision 218) @@ -35,4 +35,10 @@ } +function xpress_is_wpmu() { + global $xoops_config; + + return $xoops_config->is_wpmu; +} + function xpress_selected_author($show=true ) { $output = ''; Index: trunk/wp-content/plugins/xpressme/language/xpressme-ja.po =================================================================== --- trunk/wp-content/plugins/xpressme/language/xpressme-ja.po (revision 217) +++ trunk/wp-content/plugins/xpressme/language/xpressme-ja.po (revision 218) @@ -3,5 +3,5 @@ "Project-Id-Version: XPressME Plugin\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2009-05-05 22:35+0900\n" +"PO-Revision-Date: 2009-05-20 16:34+0900\n" "Last-Translator: toemon \n" "Language-Team: \n" @@ -45,9 +45,9 @@ #: xpressme_class.php:276 #: xpressme_class.php:292 -#: xpressme_class.php:721 #: xpressme_class.php:726 -#: xpressme_class.php:732 -#: xpressme_class.php:743 -#: xpressme_class.php:749 +#: xpressme_class.php:731 +#: xpressme_class.php:737 +#: xpressme_class.php:748 +#: xpressme_class.php:754 msgid "YES" msgstr "はい" @@ -55,9 +55,9 @@ #: xpressme_class.php:277 #: xpressme_class.php:293 -#: xpressme_class.php:722 #: xpressme_class.php:727 -#: xpressme_class.php:733 -#: xpressme_class.php:744 -#: xpressme_class.php:750 +#: xpressme_class.php:732 +#: xpressme_class.php:738 +#: xpressme_class.php:749 +#: xpressme_class.php:755 msgid "NO" msgstr "いいえ" @@ -148,193 +148,197 @@ msgstr "ユーザ登録しない" -#: xpressme_class.php:483 +#: xpressme_class.php:485 +msgid "WordPress MU cannot integrate the comments." +msgstr "WordPress MUはコメント統合できません。" + +#: xpressme_class.php:487 msgid "Do Not Comment Integration." msgstr "コメント統合しません。" -#: xpressme_class.php:517 +#: xpressme_class.php:522 msgid "Comment integration with D3Forum" msgstr "D3Forumとのコメント統合" -#: xpressme_class.php:519 +#: xpressme_class.php:524 msgid "Select the forum of D3Forum that does the comment integration from the following lists." msgstr "以下のリストからコメント統合をするD3Forumのフォーラムを選択してください。" -#: xpressme_class.php:523 +#: xpressme_class.php:528 msgid "Select the Type of display of D3Forum comment." msgstr "D3Forumの表示タイプを選択" -#: xpressme_class.php:525 -#: xpressme_class.php:528 +#: xpressme_class.php:530 +#: xpressme_class.php:533 msgid "Flat" msgstr "フラット" -#: xpressme_class.php:526 -#: xpressme_class.php:529 +#: xpressme_class.php:531 +#: xpressme_class.php:534 msgid "Threaded" msgstr "スレッド" -#: xpressme_class.php:532 +#: xpressme_class.php:537 msgid "Select the order of display of D3Forum comment." msgstr "D3Forumコメントの表示順を選択" -#: xpressme_class.php:534 -#: xpressme_class.php:537 +#: xpressme_class.php:539 +#: xpressme_class.php:542 msgid "DESC" msgstr "降順" -#: xpressme_class.php:535 -#: xpressme_class.php:538 +#: xpressme_class.php:540 +#: xpressme_class.php:543 msgid "ASC" msgstr "昇順" -#: xpressme_class.php:541 +#: xpressme_class.php:546 msgid "Number of displays of D3Forum comments." msgstr "D3Forumのコメント表示数" -#: xpressme_class.php:545 +#: xpressme_class.php:550 msgid "The import and the export between Wordpress Comments and the D3Forum Posts can be done. " msgstr "WordPressコメントとD3Forumポスト間の一括転送（エクスポート・インポート）" -#: xpressme_class.php:546 +#: xpressme_class.php:551 msgid "Export to D3Forum" msgstr "D3Forumへ一括エクスポート" -#: xpressme_class.php:547 +#: xpressme_class.php:552 msgid "Import from D3Forum" msgstr "D3Forumから一括インポート" -#: xpressme_class.php:559 +#: xpressme_class.php:564 msgid "Contents Excerpt Setting" msgstr "記事抜粋の設定" -#: xpressme_class.php:564 +#: xpressme_class.php:569 msgid "Is the excerpt display done with the archive of contents?" msgstr "記事のアーカイブで抜粋表示を行いますか？" -#: xpressme_class.php:571 +#: xpressme_class.php:576 msgid "When ASCII character more than the set ratio is included, it is judged ASCII contents. " msgstr "ASCII文字が含まれる比率が設定された値より大きい場合、ASCII文字コンテンツと判断します。" -#: xpressme_class.php:578 +#: xpressme_class.php:583 msgid "Excerpt length of word for ASCII contents" msgstr "ASCIIコンテンツの抜粋単語数" -#: xpressme_class.php:585 +#: xpressme_class.php:590 msgid "Excerpt length of character for multibyte contents" msgstr "マルチバイトコンテンツの抜粋文字数" -#: xpressme_class.php:592 +#: xpressme_class.php:597 msgid "More Link Text (Is not displayed for the blank.)" msgstr "Moreリンクテキスト（ブランクの場合リンクを表示しません。）" -#: xpressme_class.php:604 +#: xpressme_class.php:609 msgid "Display Mode Setting" msgstr "表示モード設定" -#: xpressme_class.php:607 +#: xpressme_class.php:612 msgid "Select the XPressME Display Mode." msgstr "XPressMEの表示モードの選択" -#: xpressme_class.php:612 +#: xpressme_class.php:617 msgid "Xoops Mode" msgstr "XOOPSモード" -#: xpressme_class.php:616 +#: xpressme_class.php:621 msgid "WordPress Mode" msgstr "WordPressモード" -#: xpressme_class.php:620 +#: xpressme_class.php:625 msgid "User select" msgstr "ユーザによる選択" -#: xpressme_class.php:630 +#: xpressme_class.php:635 msgid "Header Meta Option" msgstr "ヘッダメタ　オプション" -#: xpressme_class.php:635 +#: xpressme_class.php:640 msgid "Select the Header keyword." msgstr "ヘッダで使用するキーワードの選択" -#: xpressme_class.php:640 +#: xpressme_class.php:645 msgid "Xoops KeyWord" msgstr "XOOPSのキーワード" -#: xpressme_class.php:643 +#: xpressme_class.php:648 msgid "WordPress KeyWord" msgstr "WordPressのキーワード" -#: xpressme_class.php:646 +#: xpressme_class.php:651 msgid "WordPress & Xoops KeyWord" msgstr "WordPressｊとXOOPSのキーワード" -#: xpressme_class.php:652 +#: xpressme_class.php:657 msgid "Select the Header Description." msgstr "ヘッダで使用するディスクリプション（説明）の選択" -#: xpressme_class.php:657 +#: xpressme_class.php:662 msgid "Xoops Description" msgstr "XOOPSのディスクリプション" -#: xpressme_class.php:660 +#: xpressme_class.php:665 msgid "WordPress Description" msgstr "WordPressのディスクリプション" -#: xpressme_class.php:663 +#: xpressme_class.php:668 msgid "WordPress & Xoops Description" msgstr "WordPressとXOOPSのディスクリプション" -#: xpressme_class.php:669 +#: xpressme_class.php:674 msgid "Select the Header Robots Index." msgstr "ヘッダで使用するロボットインデックスの選択" -#: xpressme_class.php:674 +#: xpressme_class.php:679 msgid "Xoops Robots Index" msgstr "XOOPSのロボットインデックス" -#: xpressme_class.php:677 +#: xpressme_class.php:682 msgid "WordPress Robots Index" msgstr "WordPressのロボットインデックス" -#: xpressme_class.php:710 +#: xpressme_class.php:715 msgid "XPressME Configuration Page" msgstr "XPressMEの設定ページ" -#: xpressme_class.php:715 +#: xpressme_class.php:720 msgid "Media Upload Base Path" msgstr "メディアアップロードのベースパス設定" -#: xpressme_class.php:716 +#: xpressme_class.php:721 msgid "Use XOOPS UPLOAD PATH" msgstr "XOOPSのアップロードパスを使用する。" -#: xpressme_class.php:717 +#: xpressme_class.php:722 msgid "USE WordPress BASE_PATH" msgstr "WordPressのベースパスを使用する。" -#: xpressme_class.php:720 +#: xpressme_class.php:725 msgid "Thema Sidebar Display" msgstr "テーマ表示時にサイドバー表示する。" -#: xpressme_class.php:725 +#: xpressme_class.php:730 msgid "The change tracking of the post is preserved" msgstr "投稿の変更履歴を有効にする。" -#: xpressme_class.php:731 +#: xpressme_class.php:736 msgid "Select Multi user mode" msgstr "マルチユーザーモードを選択" -#: xpressme_class.php:742 +#: xpressme_class.php:747 msgid "Is the posts author views counted?" msgstr "投稿者の閲覧をカウントしますか？" -#: xpressme_class.php:748 +#: xpressme_class.php:753 msgid "Is SQL debugging window displayed?" msgstr "SQLデバッグウィンドを表示しますか？" -#: xpressme_class.php:760 +#: xpressme_class.php:765 msgid "Update Config" msgstr "更新" -#: xpressme_class.php:761 +#: xpressme_class.php:766 msgid "Preset Config" msgstr "プリセット" @@ -345,90 +349,90 @@ msgstr "%sのパーマリンク" -#: include/custom_functions.php:337 +#: include/custom_functions.php:343 #, php-format msgid "views :%d" msgstr "閲覧数 :%d" -#: include/custom_functions.php:455 +#: include/custom_functions.php:461 msgid "Main" msgstr "メイン" -#: include/custom_functions.php:458 +#: include/custom_functions.php:464 #, php-format msgid "Archive for the ‘%s’ Category" msgstr "カテゴリー ‘%s’ のアーカイブ" -#: include/custom_functions.php:460 +#: include/custom_functions.php:466 #, php-format msgid "Posts Tagged ‘%s’" msgstr "‘%s’ タグのついている投稿" -#: include/custom_functions.php:462 +#: include/custom_functions.php:468 #, php-format msgid "Archive for %s|Daily archive page" msgstr "%sの日別アーカイブ" -#: include/custom_functions.php:462 +#: include/custom_functions.php:468 msgid "F jS, Y" msgstr "Y年n月j日" -#: include/custom_functions.php:464 +#: include/custom_functions.php:470 #, php-format msgid "Archive for %s|Monthly archive page" msgstr "%sの月別アーカイブ" -#: include/custom_functions.php:464 +#: include/custom_functions.php:470 msgid "F, Y" msgstr "Y年n月" -#: include/custom_functions.php:466 +#: include/custom_functions.php:472 #, php-format msgid "Archive for %s|Yearly archive page" msgstr "%sの年別アーカイブ " -#: include/custom_functions.php:466 +#: include/custom_functions.php:472 msgid "Y" msgstr "Y年" -#: include/custom_functions.php:469 +#: include/custom_functions.php:475 #, php-format msgid "Archive for the ‘%s’ Author" msgstr "投稿者 ‘%s’ のアーカイブ" -#: include/custom_functions.php:472 +#: include/custom_functions.php:478 #, php-format msgid "Search Results of word ‘%s’" msgstr "‘%s’ の検索結果" -#: include/custom_functions.php:478 -#: include/custom_functions.php:480 +#: include/custom_functions.php:484 +#: include/custom_functions.php:486 #, php-format msgid "Article of %s" msgstr "%sの記事" -#: include/custom_functions.php:495 +#: include/custom_functions.php:501 #, php-format msgid "From %1$s on site %2$s" msgstr "サイト %2$s の %1$s より" -#: include/custom_functions.php:518 +#: include/custom_functions.php:524 #, fuzzy msgid "% TrackBack/Pingback" msgstr "トラックバック・ピンバック % 件" -#: include/custom_functions.php:520 +#: include/custom_functions.php:526 msgid "No Trackback/Pingback" msgstr "トラックバック・ピンバックはありません" -#: include/custom_functions.php:522 +#: include/custom_functions.php:528 msgid "One Trackback/Pingback" msgstr "トラックバック・ピンバック 1 件" -#: include/custom_functions.php:632 +#: include/custom_functions.php:638 msgid "Calendar" msgstr "カレンダー" -#: include/custom_functions.php:665 -#: include/custom_functions.php:675 +#: include/custom_functions.php:671 +#: include/custom_functions.php:681 #, php-format msgid "View posts for %1$s %2$s" Index: trunk/wp-content/plugins/xpressme/xpressme_class.php =================================================================== --- trunk/wp-content/plugins/xpressme/xpressme_class.php (revision 217) +++ trunk/wp-content/plugins/xpressme/xpressme_class.php (revision 218) @@ -470,5 +470,5 @@ function d3forum_option($do_message = ''){ - global $xoops_db; + global $xoops_db,$xoops_config; $d3frum_list = array(); @@ -481,34 +481,39 @@ else $selected = ''; - $forum_list .= '\n"; - - // Form making for forum selection of D3forum - $modules_table = get_xoops_prefix() .'modules'; - $sql = "SELECT mid,name,isactive,dirname FROM $modules_table WHERE isactive = 1"; - $modules = $xoops_db->get_results($sql); - foreach ($modules as $module) { - $file_path = $module_dir_path . '/modules/' . $module->dirname . '/mytrustdirname.php'; - if (! file_exists($file_path)) continue; - $array_files = file($file_path); - // It is checked whether there is character string "$mytrustdirname ='d3forum'"in the file. - foreach ($array_files as $aeey_file){ - if( preg_match( "/\s*(mytrustdirname)\s*(=)\s*([\"'])(d3forum)([\"'])/", $aeey_file ) ) { - $forums_tb = get_xoops_prefix() . $module->dirname . '_forums'; - $cat_tb = get_xoops_prefix() . $module->dirname . '_categories'; - $sql= "SELECT * FROM $forums_tb LEFT JOIN $cat_tb ON $forums_tb.cat_id = $cat_tb.cat_id"; - $forums = $xoops_db->get_results($sql); - foreach ($forums as $forum) { - if (($module->dirname == $this->d3forum_module_dir) && ($forum->forum_id == $this->d3forum_forum_id)) - $selected = ' selected="selected"'; - else - $selected = ''; - $forum_div = 'forum|' . $module->dirname . '|' . $forum->forum_id; - $forum_select = "$module->name($module->dirname) $forum->cat_title-$forum->forum_title(ID=$forum->forum_id)"; - $forum_list .= '\n"; + + if ($xoops_config->is_wpmu) { + $forum_list .= '\n"; + } else { + $forum_list .= '\n"; + + // Form making for forum selection of D3forum + $modules_table = get_xoops_prefix() .'modules'; + $sql = "SELECT mid,name,isactive,dirname FROM $modules_table WHERE isactive = 1"; + $modules = $xoops_db->get_results($sql); + foreach ($modules as $module) { + $file_path = $module_dir_path . '/modules/' . $module->dirname . '/mytrustdirname.php'; + if (! file_exists($file_path)) continue; + $array_files = file($file_path); + // It is checked whether there is character string "$mytrustdirname ='d3forum'"in the file. + foreach ($array_files as $aeey_file){ + if( preg_match( "/\s*(mytrustdirname)\s*(=)\s*([\"'])(d3forum)([\"'])/", $aeey_file ) ) { + $forums_tb = get_xoops_prefix() . $module->dirname . '_forums'; + $cat_tb = get_xoops_prefix() . $module->dirname . '_categories'; + $sql= "SELECT * FROM $forums_tb LEFT JOIN $cat_tb ON $forums_tb.cat_id = $cat_tb.cat_id"; + $forums = $xoops_db->get_results($sql); + foreach ($forums as $forum) { + if (($module->dirname == $this->d3forum_module_dir) && ($forum->forum_id == $this->d3forum_forum_id)) + $selected = ' selected="selected"'; + else + $selected = ''; + $forum_div = 'forum|' . $module->dirname . '|' . $forum->forum_id; + $forum_select = "$module->name($module->dirname) $forum->cat_title-$forum->forum_title(ID=$forum->forum_id)"; + $forum_list .= '\n"; + } + break; } - break; } + $forum_list .= '
'; } - $forum_list .= '
'; } $forum_list .= '' . "\n"; Index: trunk/wp-content/themes/xpress_default/header.php =================================================================== --- trunk/wp-content/themes/xpress_default/header.php (revision 217) +++ trunk/wp-content/themes/xpress_default/header.php (revision 218) @@ -41,5 +41,8 @@
- + + | + +
Index: trunk/wp-content/themes/xpress_default/ja.po =================================================================== --- trunk/wp-content/themes/xpress_default/ja.po (revision 217) +++ trunk/wp-content/themes/xpress_default/ja.po (revision 218) @@ -18,5 +18,5 @@ "Report-Msgid-Bugs-To: wp-polyglots@lists.automattic.com\n" "POT-Creation-Date: 2008-08-15 21:16+0900\n" -"PO-Revision-Date: 2009-04-11 14:12+0900\n" +"PO-Revision-Date: 2009-05-20 17:57+0900\n" "Last-Translator: toemon \n" "Language-Team: toemon \n" @@ -335,6 +335,10 @@ #: header.php:43 -msgid "Mein Page" +msgid "Main Page" msgstr "メインページ" + +#: header.php:43 +msgid "Blogs Home" +msgstr "ブログのホーム" #: header.php:44 Index: trunk/wp-content/themes/xpress_mu_home/home.php =================================================================== --- trunk/wp-content/themes/xpress_mu_home/home.php (revision 217) +++ trunk/wp-content/themes/xpress_mu_home/home.php (revision 218) @@ -24,5 +24,43 @@ echo "\n"; ?> -
+
+ + 1){ + echo '

' . __('New Entries', 'xpress') . "

\n"; + + $blog_list = get_blog_list(); + echo "
    \n"; + for ($i = 0; $i < $blog_count; $i++){ + $blog_id = $blog_list[$i]['blog_id']; + if ($blog_id == 1) continue; + $output_blogs = '
  • ' . + get_blog_option($blog_id,'blogname') . + '
    • '; + echo $output_blogs; + + $wpdb->set_blog_id($blog_id); + query_posts("showposts=3&post_status=publish"); + if (have_posts()){ + echo "
      \n"; + while(have_posts()){ + the_post(); + echo '
    • '; + echo '' . $post->post_title . "\n("; + the_time($date_format); + echo ")
      • \n"; + } + echo "
    \n"; + } + } + $wpdb->set_blog_id(1); + + echo "
\n"; + } +?> +

\n" "Language-Team: toemon \n" @@ -354,18 +354,22 @@ msgstr "投稿数" -#: home.php:27 +#: home.php:32 +msgid "New Entries" +msgstr "新着情報" + +#: home.php:63 msgid "Updated Blogs" msgstr "最近更新があったブログ" -#: home.php:48 +#: home.php:84 #, php-format msgid "Howdy %s" msgstr "こんにちは %s さん" -#: home.php:54 +#: home.php:90 msgid "Your Blogs list" msgstr "あなたのブログリスト" -#: home.php:65 +#: home.php:101 msgid "Create a new blog" msgstr "新しいブログを作成する"