From 889097d4c559348f9250a5df94d1b39da4547f86 Mon Sep 17 00:00:00 2001 From: nohn Date: Wed, 29 Jun 2005 17:29:36 +0000 Subject: [PATCH] backporting some stuff from trunk to 0.8 --- bundled-libs/Onyx/RSS.php | 2 +- docs/NEWS | 3 +++ .../lang_fr.inc.php | 23 +++++++++++++++++++ .../lang_tn.inc.php | 23 +++++++++++++++++++ .../serendipity_plugin_remoterss.php | 2 +- serendipity_config.inc.php | 2 +- templates/kubrick/index.tpl | 4 ++-- 7 files changed, 54 insertions(+), 5 deletions(-) create mode 100644 plugins/serendipity_event_spartacus/lang_fr.inc.php create mode 100644 plugins/serendipity_event_spartacus/lang_tn.inc.php diff --git a/bundled-libs/Onyx/RSS.php b/bundled-libs/Onyx/RSS.php index 7f4aeee..9601c41 100644 --- a/bundled-libs/Onyx/RSS.php +++ b/bundled-libs/Onyx/RSS.php @@ -81,7 +81,7 @@ class ONYX_RSS } xml_set_object($this->parser, $this); xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, false); - xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, LANG_CHARSET); + @xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, LANG_CHARSET); xml_set_element_handler($this->parser, 'tag_open', 'tag_close'); xml_set_character_data_handler($this->parser, 'cdata'); } diff --git a/docs/NEWS b/docs/NEWS index 8818557..e384a34 100644 --- a/docs/NEWS +++ b/docs/NEWS @@ -1,5 +1,8 @@ svn di# $Id$ +Version 0.8.3 () +------------------------------------------------------------------------ + Version 0.8.2 (June 29th, 2005) ------------------------------------------------------------------------ diff --git a/plugins/serendipity_event_spartacus/lang_fr.inc.php b/plugins/serendipity_event_spartacus/lang_fr.inc.php new file mode 100644 index 0000000..56c4a20 --- /dev/null +++ b/plugins/serendipity_event_spartacus/lang_fr.inc.php @@ -0,0 +1,23 @@ + # +# http://www.jannis.to/programming/serendipity.html # +# # +# Translated by # +# Sebastian Mordziol # +# http://sebastian.mordziol.de # +# # +########################################################################## + +@define('PLUGIN_EVENT_SPARTACUS_NAME', 'Spartacus'); +@define('PLUGIN_EVENT_SPARTACUS_DESC', '[S]erendipity [P]lugin [A]ccess [R]epository [T]ool [A]nd [C]ustomization/[U]nification [S]ystem - Vous permet de télécharger des plugins directement de notre dépôt officiel.'); +@define('PLUGIN_EVENT_SPARTACUS_FETCH', 'Cliquez ici pour télécharger un nouveau %s du dépôt officiel de Serendipity'); +@define('PLUGIN_EVENT_SPARTACUS_FETCHERROR', 'Impossible d\'accéder à l\'adresse %s. Peut-être que le serveur de Serendipity ou de SourceForge.net n\'est momentanément pas accessible. Merci de réessayer plus tard.'); +@define('PLUGIN_EVENT_SPARTACUS_FETCHING', 'Essaie d\'accéder à l\'adresse %s...'); + +/* vim: set sts=4 ts=4 expandtab : */ +?> \ No newline at end of file diff --git a/plugins/serendipity_event_spartacus/lang_tn.inc.php b/plugins/serendipity_event_spartacus/lang_tn.inc.php new file mode 100644 index 0000000..3d4e8f4 --- /dev/null +++ b/plugins/serendipity_event_spartacus/lang_tn.inc.php @@ -0,0 +1,23 @@ + # +# http://www.jannis.to/programming/serendipity.html # +# # +# Translated by # +# (c) 2004-2005 CapriSkye # +# http://open.38.com # +########################################################################## + + @define('PLUGIN_EVENT_SPARTACUS_NAME', 'Spartacus (外掛存庫)'); + @define('PLUGIN_EVENT_SPARTACUS_DESC', '[S]erendipity [P]lugin [A]ccess [R]epository [T]ool [A]nd [C]ustomization/[U]nification [S]ystem - 允許你從 s9y 的線上存庫下載外掛'); + @define('PLUGIN_EVENT_SPARTACUS_FETCH', '點這裡從 s9y 的外掛存庫安裝新 %s'); + @define('PLUGIN_EVENT_SPARTACUS_FETCHERROR', '網址 %s 無法開啟。也許 s9y 或 SourceForge.net 的主機有問題 - 請稍後在試。'); + @define('PLUGIN_EVENT_SPARTACUS_FETCHING', '打開網址 %s...'); + @define('PLUGIN_EVENT_SPARTACUS_FETCHED_BYTES_URL', '從上面的網址接收 %s 個位元組的資料。儲存成檔案 %s...'); + @define('PLUGIN_EVENT_SPARTACUS_FETCHED_BYTES_CACHE', '從主機內接收 %s 個位元組的資料。儲存成檔案 %s...'); + @define('PLUGIN_EVENT_SPARTACUS_FETCHED_DONE', '存取資料完成。'); +?> \ No newline at end of file diff --git a/plugins/serendipity_plugin_remoterss/serendipity_plugin_remoterss.php b/plugins/serendipity_plugin_remoterss/serendipity_plugin_remoterss.php index c5dfecd..faf6c71 100644 --- a/plugins/serendipity_plugin_remoterss/serendipity_plugin_remoterss.php +++ b/plugins/serendipity_plugin_remoterss/serendipity_plugin_remoterss.php @@ -115,7 +115,7 @@ class s9y_remoterss_XMLTree { // XML functions $p = xml_parser_create(); // by: anony@mous.com - meets XML 1.0 specification - xml_parser_set_option($p, XML_OPTION_CASE_FOLDING, 0); + @xml_parser_set_option($p, XML_OPTION_CASE_FOLDING, 0); xml_parser_set_option($p, XML_OPTION_TARGET_ENCODING, LANG_CHARSET); xml_parse_into_struct($p, $data, $vals, $index); xml_parser_free($p); diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php index efb2615..f7f5258 100644 --- a/serendipity_config.inc.php +++ b/serendipity_config.inc.php @@ -21,7 +21,7 @@ if (IS_installed === true && !defined('IN_serendipity')) { include_once(S9Y_INCLUDE_PATH . 'include/compat.inc.php'); // The version string -$serendipity['version'] = '0.8.2'; +$serendipity['version'] = '0.8.3-dev'; // Name of folder for the default theme $serendipity['defaultTemplate'] = 'default'; diff --git a/templates/kubrick/index.tpl b/templates/kubrick/index.tpl index 97045c5..c8f5427 100644 --- a/templates/kubrick/index.tpl +++ b/templates/kubrick/index.tpl @@ -41,8 +41,8 @@ {if $rightSidebarElements > 0} {/if} -- 2.39.5