From 6b8e7b0eded524aa21f574a3873379f99fcb4eac Mon Sep 17 00:00:00 2001 From: spirit Date: Sat, 21 Dec 2019 20:25:28 +0800 Subject: [PATCH] update manifest --- inc/api.php | 4 ++-- languages/en_US.mo | Bin 1500 -> 1500 bytes languages/en_US.po | 10 +++++----- languages/sakura.pot | 6 +++--- languages/zh_CN.mo | Bin 33008 -> 33543 bytes languages/zh_CN.po | 31 ++++++++++++++----------------- manifest/manifest.py | 5 ++++- options.php | 4 ++-- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/inc/api.php b/inc/api.php index 1f2fcbd..a316c3f 100644 --- a/inc/api.php +++ b/inc/api.php @@ -351,9 +351,9 @@ function feature_gallery() { $img = array_rand($img_array); $img_domain = akina_option('cover_cdn') ? akina_option('cover_cdn') : get_template_directory_uri(); if(strpos($_SERVER['HTTP_ACCEPT'], 'image/webp')) { - $imgurl = $img_domain . "/manifest/" . $img_array[$img]["webp"][1]; + $imgurl = $img_domain . "/manifest/" . $img_array[$img]["webp"][0]; } else { - $imgurl = $img_domain . "/manifest/" . $img_array[$img]["jpeg"][1]; + $imgurl = $img_domain . "/manifest/" . $img_array[$img]["jpeg"][0]; } $data = array('cover image'); $response = new WP_REST_Response($data); diff --git a/languages/en_US.mo b/languages/en_US.mo index b9992f75c4ffe01ab0243ba0c57302ad91f5ef5a..9eb161b3de1359ee1efe8f0f68f6eac1699aaf7f 100644 GIT binary patch delta 21 ccmcb^eTRF)W+o0JLj@xPDWiki . Click here to update manifest" msgstr "" diff --git a/languages/sakura.pot b/languages/sakura.pot index b9320ef..66378e4 100644 --- a/languages/sakura.pot +++ b/languages/sakura.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" "Project-Id-Version: Sakura\n" -"POT-Creation-Date: 2019-12-15 14:40+0800\n" +"POT-Creation-Date: 2019-12-21 20:23+0800\n" "PO-Revision-Date: 2019-11-01 14:27+0800\n" "Last-Translator: \n" "Language-Team: \n" @@ -1287,13 +1287,13 @@ msgid "" msgstr "" #: options.php:879 -msgid "Cover CDN" +msgid "Cover manifest" msgstr "" #: options.php:880 #, php-format msgid "" -"Fill in the cdn path for random picture display, without adding a slash at the end, for " +"Fill in the manifest path for random picture display, without adding a slash at the end, for " "example: https://cdn.jsdelivr.net/gh/mashirozx/sakura@3.3.3, please refer to Wiki . Click here to update manifest" diff --git a/languages/zh_CN.mo b/languages/zh_CN.mo index f4480f5e0c3bc0be5807e18f7e50a7c59f75edb5..61981279867178377a4b0e511b7109dc4d717341 100644 GIT binary patch delta 6432 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 delta 5971 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 . Click here to update " -#| "manifest" +#, php-format msgid "" -"Fill in the cdn path for random picture display, without adding a slash at " -"the end, for example: https://cdn.jsdelivr.net/gh/mashirozx/sakura@3.3.3, " +"Fill in the manifest path for random picture display, without adding a slash " +"at the end, for example: https://cdn.jsdelivr.net/gh/mashirozx/sakura@3.3.3, " "please refer to Wiki . Click here to update manifest" msgstr "" -"填写 cdn 路径，用于随机图片展示，最后不用加斜杠，例：https://cdn.jsdelivr." -"net/gh/mashirozx/sakura@3.3.3 ，更多信息请参考Wiki。点击这里更新" -"manifest" +"填写 manifest 路径，用于随机图片展示，最后不用加斜杠，例：https://cdn." +"jsdelivr.net/gh/mashirozx/sakura@3.3.3 ，更多信息请参考Wiki。点击这里" +"更新manifest" #: options.php:886 msgid "Use the front-end library locally (lib.js、lib.css)" @@ -1858,6 +1852,9 @@ msgstr "注 册" msgid "Registration is not open yet." msgstr "暂未开放注册。" +#~ msgid "Cover CDN" +#~ msgstr "封面图图片库" + #~ msgid "Jsdelivr CDN" #~ msgstr "随机图片" diff --git a/manifest/manifest.py b/manifest/manifest.py index 0e7421c..b8f5ecc 100644 --- a/manifest/manifest.py +++ b/manifest/manifest.py @@ -44,7 +44,10 @@ class Single(object): def main(self): self.hash() # if os.path.exists(self.jpeg) and os.path.exists(self.webp): - self.optimize() + try: + self.optimize() + except OSError: + print("Falied to optimize the picture: " + self.file) self.manifest() return self.mani diff --git a/options.php b/options.php index 4d61858..fc2021d 100644 --- a/options.php +++ b/options.php @@ -876,8 +876,8 @@ function optionsframework_options() { 'type' => 'text'); $options[] = array( - 'name' => __('Cover CDN', 'sakura'),/*封面图片库*/ - 'desc' => sprintf(__('Fill in the cdn path for random picture display, without adding a slash at the end, for example: https://cdn.jsdelivr.net/gh/mashirozx/sakura@3.3.3, please refer to Wiki . Click here to update manifest', 'sakura'), rest_url('sakura/v1/database/update')),/*填写 cdn 路径，用于随机图片展示，最后不用加斜杠，例：https://cdn.jsdelivr.net/gh/mashirozx/sakura@3.3.3 ，更多信息请参考Wiki*/ + 'name' => __('Cover manifest', 'sakura'),/*封面图片库*/ + 'desc' => sprintf(__('Fill in the manifest path for random picture display, without adding a slash at the end, for example: https://cdn.jsdelivr.net/gh/mashirozx/sakura@3.3.3, please refer to Wiki . Click here to update manifest', 'sakura'), rest_url('sakura/v1/database/update')),/*填写 manifest 路径 ，用于随机图片展示，最后不用加斜杠，例：https://cdn.jsdelivr.net/gh/mashirozx/sakura@3.3.3 ，更多信息请参考Wiki*/ 'id' => 'cover_cdn', 'std' => 'https://cdn.jsdelivr.net/gh/mashirozx/sakura@3.3.3', 'type' => 'text');