FIX: NP_Mediaの翻訳メッセージが適用されないバグ、ファイルサイズが表示されないバグ

ラベル名が異なるためメッセージが適用されなかった。
MediaObject::refine()をしなければファイルサイズや画像の縦横比が取得出来なかった。

diff --git a/nucleus/plugins/NP_Medium.php b/nucleus/plugins/NP_Medium.php
index d890eb6..b80996a 100644 (file)
--- a/nucleus/plugins/NP_Medium.php
+++ b/nucleus/plugins/NP_Medium.php
@@ -20,42 +20,42 @@ class NP_Medium extends NucleusPlugin
        {
                return 'Medium';
        }
-
+       
        public function getAuthor()
        {
                return 'Sakamoto Takashi';
        }
-
+       
        public function getURL()
        {
                return '';
        }
-
+       
        public function getVersion()
        {
                return '0.9(beta)';
        }
-
+       
        public function getMinNucleusVersion()
        {
                return '400';
        }
-
+       
        public function getDescription()
        {
-               return _MEDIUM_DESC;
+               return NP_MEDIUM_DESC;
        }
-
+       
        public function supportsFeature($what)
        {
                return ( $what == 'SqlTablePrefix' );
        }
-
+       
        public function getEventList()
        {
                return array('AdminPrePageHead', 'AdminTemplateExtraFields');
        }
-
+       
        public function init()
        {
                // include translation file for this plugin

diff --git a/nucleus/plugins/medium/MediumActions.php b/nucleus/plugins/medium/MediumActions.php
index 7810bdd..a192c4b 100644 (file)
--- a/nucleus/plugins/medium/MediumActions.php
+++ b/nucleus/plugins/medium/MediumActions.php
@@ -258,6 +258,7 @@ class MediumActions extends BaseActions
                
                foreach ( $plugin->media as $medium )
                {
+                       $medium->refine();
                        $data = array(
                                'mime'                  => $medium->mime,
                                'collection'    => $medium->collection,
@@ -267,7 +268,7 @@ class MediumActions extends BaseActions
                                'name'                  => $medium->name,
                                'suffix'                => $medium->suffix,
                                'timestamp'             => date("Y-m-d", $medium->timestamp),
-                               'size'                  => $medium->size,
+                               'size'                  => round($medium->size / 1000),
                                'width'                 => $medium->width,
                                'height'                => $medium->height,
                                'mediumurl'             => "{$CONF['MediaURL']}{$medium->collection}/{$medium->filename}"

diff --git a/nucleus/plugins/medium/locales/en_Latn_US.UTF-8.php b/nucleus/plugins/medium/locales/en_Latn_US.UTF-8.php
index b3101db..43165da 100644 (file)
--- a/nucleus/plugins/medium/locales/en_Latn_US.UTF-8.php
+++ b/nucleus/plugins/medium/locales/en_Latn_US.UTF-8.php
@@ -1,9 +1,10 @@
 <?php
-define('_MEDIUM_COLLECTIONLIST_HEADER',        'Collection List Header');
-define('_MEDIUM_COLLECTIONLIST_BODY',  'Collection List Body');
-define('_MEDIUM_COLLECTIONLIST_FOOTER',        'Collection List Footer');
-define('_MEDIUM_MEDIALIST_HEADER',             'Media List Header');
-define('_MEDIUM_MEDIALIST_BODY',               'Media List Body');
-define('_MEDIUM_MEDIALIST_FOOTER',             'Media List Footer');
-
-define('_MEDIUM_DESC',                                 'insert and upload media');
\ No newline at end of file
+define('NP_MEDIUM_COLLECTIONLIST_HEAD',                'Collection List Header');
+define('NP_MEDIUM_COLLECTIONLIST_BODY',                'Collection List Body');
+define('NP_MEDIUM_COLLECTIONLIST_FOOT',                'Collection List Footer');
+define('NP_MEDIUM_MEDIALIST_HEAD',                     'Media List Header');
+define('NP_MEDIUM_MEDIALIST_BODY_IMAGE',       'Media List Body for images');
+define('NP_MEDIUM_MEDIALIST_BODY_OTHER',       'Media List Body for others');
+define('NP_MEDIUM_MEDIALIST_FOOT',                     'Media List Footer');
+define('NP_MEDIUM_MEDIALIST_BLANK',                    'No media uploaded');
+define('NP_MEDIUM_DESC',                                       'insert and upload media');
\ No newline at end of file

diff --git a/nucleus/plugins/medium/locales/ja_Jpan_JP.UTF-8.php b/nucleus/plugins/medium/locales/ja_Jpan_JP.UTF-8.php
index 79a90b2..3f1f248 100644 (file)
--- a/nucleus/plugins/medium/locales/ja_Jpan_JP.UTF-8.php
+++ b/nucleus/plugins/medium/locales/ja_Jpan_JP.UTF-8.php
@@ -1,9 +1,10 @@
 <?php
-define('_MEDIUM_COLLECTIONLIST_HEADER',        'コレクションリストのヘッダー');
-define('_MEDIUM_COLLECTIONLIST_BODY',  'コレクションリストの本体');
-define('_MEDIUM_COLLECTIONLIST_FOOTER',        'コレクションリストのフッター');
-define('_MEDIUM_MEDIALIST_HEADER',             'メディアリストのヘッダー');
-define('_MEDIUM_MEDIALIST_BODY',               'メディアリストの本体');
-define('_MEDIUM_MEDIALIST_FOOTER',             'メディアリストのフッター');
-
-define('_MEDIUM_DESC',                                 'メディアの挿入とアップロードを行います');
\ No newline at end of file
+define('NP_MEDIUM_COLLECTIONLIST_HEAD',                'コレクションリストのヘッダー');
+define('NP_MEDIUM_COLLECTIONLIST_BODY',                'コレクションリストの本体');
+define('NP_MEDIUM_COLLECTIONLIST_FOOT',                'コレクションリストのフッター');
+define('NP_MEDIUM_MEDIALIST_HEAD',                     'メディアリストのヘッダー');
+define('NP_MEDIUM_MEDIALIST_BODY_IMAGE',       'メディアリストの本体（イメージ用）');
+define('NP_MEDIUM_MEDIALIST_BODY_OTHER',       'メディアリストの本体（その他）');
+define('NP_MEDIUM_MEDIALIST_FOOT',                     'メディアリストのフッター');
+define('NP_MEDIUM_MEDIALIST_BLANK',                    'メディアがない場合');
+define('NP_MEDIUM_DESC',                                       'メディアの挿入とアップロードを行います');
\ No newline at end of file