[pLog-svn] r1021 - in plugins/trunk/contentfilter: . class/action locale templates

[mark at devel.plogworld.net]

Author: mark
Date: 2005-02-09 11:47:15 +0000 (Wed, 09 Feb 2005)
New Revision: 1021

Removed:
   plugins/trunk/contentfilter/locale/locale_ca_ES.php
   plugins/trunk/contentfilter/locale/locale_es_ES.php
Modified:
   plugins/trunk/contentfilter/class/action/adminupdateblogcontentfilterconfigaction.class.php
   plugins/trunk/contentfilter/class/action/adminupdatecontentfilterconfigaction.class.php
   plugins/trunk/contentfilter/locale/locale_en_UK.php
   plugins/trunk/contentfilter/locale/locale_zh_TW.php
   plugins/trunk/contentfilter/plugincontentfilter.class.php
   plugins/trunk/contentfilter/templates/addblogfilteredcontent.template
   plugins/trunk/contentfilter/templates/addfilteredcontent.template
   plugins/trunk/contentfilter/templates/editblogfilteredcontent.template
   plugins/trunk/contentfilter/templates/editfilteredcontent.template
Log:
Update locale messages of content filter. The content filter plugin is complete.

Modified: plugins/trunk/contentfilter/class/action/adminupdateblogcontentfilterconfigaction.class.php
===================================================================
--- plugins/trunk/contentfilter/class/action/adminupdateblogcontentfilterconfigaction.class.php	2005-02-09 08:18:55 UTC (rev 1020)
+++ plugins/trunk/contentfilter/class/action/adminupdateblogcontentfilterconfigaction.class.php	2005-02-09 11:47:15 UTC (rev 1021)
@@ -34,7 +34,7 @@
 			$blogs = new Blogs();
             if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
                 $this->_view = new AdminBlogFilteredContentView( $this->_blogInfo );
-                $this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
+                $this->_view->setErrorMessage( $this->_locale->tr("error_updating_blocked_content"));
                 $this->setCommonData();
 
                 return false;                
@@ -46,7 +46,7 @@
             $this->saveSession();
 			
 			$this->_view = new AdminBlogFilteredContentView( $this->_blogInfo );
-			$this->_view->setSuccessMessage( $this->_locale->tr("contentfilter_settings_saved_ok"));			
+			$this->_view->setSuccessMessage( $this->_locale->tr("blocked_content_updated_ok"));			
 			$this->setCommonData();
             
             return true;		

Modified: plugins/trunk/contentfilter/class/action/adminupdatecontentfilterconfigaction.class.php
===================================================================
--- plugins/trunk/contentfilter/class/action/adminupdatecontentfilterconfigaction.class.php	2005-02-09 08:18:55 UTC (rev 1020)
+++ plugins/trunk/contentfilter/class/action/adminupdatecontentfilterconfigaction.class.php	2005-02-09 11:47:15 UTC (rev 1021)
@@ -34,7 +34,7 @@
 			$blogs = new Blogs();
             if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
                 $this->_view = new AdminFilteredContentView( $this->_blogInfo );
-                $this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
+                $this->_view->setErrorMessage( $this->_locale->tr("error_updating_content_block_settings"));
                 $this->setCommonData();
 
                 return false;                
@@ -46,7 +46,7 @@
             $this->saveSession();
 			
 			$this->_view = new AdminFilteredContentView( $this->_blogInfo );
-			$this->_view->setSuccessMessage( $this->_locale->tr("contentfilter_settings_saved_ok"));			
+			$this->_view->setSuccessMessage( $this->_locale->tr("content_block_settings_updated_ok"));			
 			$this->setCommonData();
             
             return true;		

Deleted: plugins/trunk/contentfilter/locale/locale_ca_ES.php
===================================================================
--- plugins/trunk/contentfilter/locale/locale_ca_ES.php	2005-02-09 08:18:55 UTC (rev 1020)
+++ plugins/trunk/contentfilter/locale/locale_ca_ES.php	2005-02-09 11:47:15 UTC (rev 1021)
@@ -1,40 +0,0 @@
-<?php
-$messages["filteredContent"] = "Contingut Filtrat";
-$messages["global_filtered_content"] = "Contingut Filtrat Globalment";
-$messages["newFilteredContent"] = "Filtrar Contingut";
-$messages["global_filtered_content_intro"] = "Les expresions regulars/contingut que apareixen aquí han estat bloquejades en totes les bitàcoles d'aquest servidor.";
-$messages["filtered_content_intro"] = "Les expresions regulars/contingut que apareixen aquí han estat bloquejades tan sols en aquesta bitàcola.";
-$messages["content"] = "Contingut";
-$messages["add_filtered_content"] = "Afegir Contingut Filtrat";
-$messages["add_filtered_content_intro"] = "Qualsevol cosa afegida aquí no serà permesa com a contingut vàlid d'un comentari, i qualsevol intent provocara que el comentari sigui bloquejat i no s'afegirà a la base de dades. Es poden utilitzar simples mots o inclús expressions regulars. Les expressions regulars són molt més potents però també són més complexes, ja que potencialment podriem arribar a bloquejar tot el que s'intenti escriure.";
-$messages["global_add_filtered_content_intro"] = "Qualsevol cosa afegida aquí no serà permesa com a contingut vàlid d'un comentari en qualsevol de les bitàcoles del servidor, i qualsevol intent provocara que el comentari sigui bloquejat i no s'afegirà a la base de dades. Es poden utilitzar simples mots o inclús expressions regulars. Les expressions regulars són molt més potents però també són més complexes, ja que potencialment podriem arribar a bloquejar tot el que s'intenti escriure.";
-$messages["content_to_block"] = "Text a filtrar";
-$messages["block_this"] = "Bloquejar";
-$messages["error_provide_content_to_block"] = "Ha d'escriure algun contingut que bloquejar.";
-$messages["blocked_content_added_ok"] = "El nou Contingut filtrat s'ha afegit correctament.";
-$messages["blocked_content_updated_ok"] = "El Contingut filtrat ha estat actualitzat correctament.";
-$messages["error_updating_blocked_content"] = "There was an error updating the blocked content.";
-$messages["error_you_have_been_blocked"] = "La seva petició ha estat denegada.";
-$messages["help_blogFilteredContent"] = "<p>This is a list of all the rules for content filtering that have been added 
-to this particular blog. Clicking any of them will take you to a page where you will be able to edit any of them.
-Use the <b>'Delete'</b> checkbox to mark any of them for deletion, and press the <b>'Delete Selected'</b> button
-once you are sure you want to delete those.</p>";
-$messages["help_newBlogFilteredContent"] = "<p>You can add here a new rule for blocking undesired content from being
-included in comments. You can use here single words or sentence or if you wish, you can use the power
-of regular expressions if you know how to use them. You can also add a description to the rule so that you remember
-in the future what it is about, but it is not a mandatory field.</p>";
-$messages["editBlogFilteredContent"] = "This page will allow you to edit a content filtering rule. The options
-are exactly the same as in <a href=\"admin.php?op=Help&amp;helpId=newBlogFilteredContent\">here</a>.";
-
-$messages["help_filteredContent"] = "<p>This is a list of all the rules for content filtering that have been added 
-to this site. These rules are site-wide and take precedence before any blog-specific rule that may have been
-set by blog owners. The options and its meaning is the same as 
-<a href=\"admin.php?op=Help&amp;helpId=blogFilteredContent\">here</a>.";
-
-$messages["help_newFilteredContent"] = "<p>You can add here a new rule for blocking undesired content from being
-included in comments. This rule will be used system-wide and will take preference before blog-specific
-rules. See <a href=\"admin.php?op=Help&amp;helpId=newBlogFilteredContent\">this</a> for more information
-on the options.";
-$messages["blogFilteredContent"] = $messages["filteredContent"];
-$messages["newBlogFilteredContent"] = $messages["newFilteredContent"];
-?>
\ No newline at end of file

Modified: plugins/trunk/contentfilter/locale/locale_en_UK.php
===================================================================
--- plugins/trunk/contentfilter/locale/locale_en_UK.php	2005-02-09 08:18:55 UTC (rev 1020)
+++ plugins/trunk/contentfilter/locale/locale_en_UK.php	2005-02-09 11:47:15 UTC (rev 1021)
@@ -1,48 +1,36 @@
 <?php
-$messages["filteredContent"] = "Filtered Content";
-$messages["global_filtered_content"] = "Global Filtered Content";
-$messages["newFilteredContent"] = "Filter Content";
-$messages["filtered_content_intro"] = "The following content/regular expressions have been blocked in this blog.";
-$messages["global_filtered_content_intro"] = "The following content/regular expressions have been globally blocked.";
+$messages["contentfilter_plugin_enabled"] = "Enable this plugin";
+
+$messages["filteredContent"] = "Global Filtered Content";
+$messages["blogFilteredContent"] = "Filtered Content";
+$messages["newFilteredContent"] = "Add Global Filtered Content";
+$messages["newBlogFilteredContent"] = "Add Filtered Content";
+
 $messages["content"] = "Content";
+$messages["content_to_block_help"] = "Anything added here will not be allowed as valid text in a comment in any of the blogs available in this site. Any attempt by a casual user to post a comment with blocked content will block the comment. Regular expressions or a simple string can be used. Regular expressions are much more powerful but they're also much more complex and you should be careful with them, because you could potentially block all content with the wrong regular expression.";
 $messages["reason"] = "Reason";
+$messages["reason_help"] = "You can also add a description to the rule so that you remember in the future what it is about.";
 $messages["add_filtered_content"] = "Add Filtered Content";
-$messages["add_filtered_content_intro"] = "Anything added here will not be allowed as valid text in a comment, and any attempt by a casual user to post a comment with blocked content will block the comment. Regular expressions or a simple string can be used. Regular expressions are much more powerful but they're also much more complex and you should be careful with them, because you could potentially block all content with the wrong regular expression.";
-$messages["global_add_filtered_content_intro"] = "Anything added here will not be allowed as valid text in a comment in any of the blogs available in this site. Any attempt by a casual user to post a comment with blocked content will block the comment. Regular expressions or a simple string can be used. Regular expressions are much more powerful but they're also much more complex and you should be careful with them, because you could potentially block all content with the wrong regular expression.";
-$messages["content_to_block"] = "Content that you would like to block";
-$messages["block_this"] = "Block This";
-$messages["error_provide_content_to_block"] = "You must provide some content to block.";
-$messages["blocked_content_added_ok"] = "Blocked content added successfully.";
-$messages["blocked_content_updated_ok"] = "Blocked content updated successfully";
 $messages["edit_filtered_content"] = "Edit Filtered Content";
-$messages["error_updating_blocked_content"] = "There was an error updating the blocked content.";
-$messages["error_you_have_been_blocked"] = "You are not allowed to proceed with this request.";
-$messages["help_blogFilteredContent"] = "<p>This is a list of all the rules for content filtering that have been added 
-to this particular blog. Clicking any of them will take you to a page where you will be able to edit any of them.
-Use the <b>'Delete'</b> checkbox to mark any of them for deletion, and press the <b>'Delete Selected'</b> button
-once you are sure you want to delete those.</p>";
+$messages["global"] = "Global";
 
-$messages["help_newBlogFilteredContent"] = "<p>You can add here a new rule for blocking undesired content from being
-included in comments. You can use here single words or sentence or if you wish, you can use the power
-of regular expressions if you know how to use them. You can also add a description to the rule so that you remember
-in the future what it is about, but it is not a mandatory field.</p>";
+$messages["error_provide_content_to_block"] = "You must provide some content to block.";
+$messages["error_updating_blocked_content"] = "There was an error when updating the blocked content.";
+$messages["error_adding_blocked_content"] = "There was an error when adding the blocked content.";
+$messages["error_no_block_content_selected"] = "There was no blocked content selected.";
+$messages["error_incorrect_content_id"] = "The blocked content ID is incorrect.";
+$messages["error_fetching_filtered_content"] = "There was an error when fetching the blocked content.";
+$messages["error_updating_content_block_settings"] = "There was an error when updating the content block plugin settings.";
+$messages["error_deleting_content"] = "There was an error when deleteing the blocked content %s.";
 
-$messages["editBlogFilteredContent"] = "This page will allow you to edit a content filtering rule. The options
-are exactly the same as in <a href=\"admin.php?op=Help&amp;helpId=newBlogFilteredContent\">here</a>.";
+$messages["blocked_content_added_ok"] = "Blocked content added successfully.";
+$messages["blocked_content_updated_ok"] = "Blocked content updated successfully.";
+$messages["content_block_settings_updated_ok"] = "Content block pluing settings updated successfully.";
+$messages["contents_deleted_ok"] = "%s blocked contents deleted successfully.";
+$messages["content_deleted_ok"] = "Blocked contents %s deleted successfully.";
 
-$messages["help_filteredContent"] = "<p>This is a list of all the rules for content filtering that have been added 
-to this site. These rules are site-wide and take precedence before any blog-specific rule that may have been
-set by blog owners. The options and its meaning is the same as 
-<a href=\"admin.php?op=Help&amp;helpId=blogFilteredContent\">here</a>.";
+$messages["error_you_have_been_blocked"] = "You are not allowed to proceed with this request.";
 
-$messages["help_newFilteredContent"] = "<p>You can add here a new rule for blocking undesired content from being
-included in comments. This rule will be used system-wide and will take preference before blog-specific
-rules. See <a href=\"admin.php?op=Help&amp;helpId=newBlogFilteredContent\">this</a> for more information
-on the options.";
-
-$messages["editFilteredContent"] = "This page will allow you to edit a content filtering rule. The options
-are exactly the same as in <a href=\"admin.php?op=Help&amp;helpId=newBlogFilteredContent\">here</a>.";
-
-$messages["blogFilteredContent"] = $messages["filteredContent"];
-$messages["newBlogFilteredContent"] = $messages["newFilteredContent"];
+$messages["label_configuration"] = "Configuration";
+$messages["label_enable"] = "Enable";
 ?>
\ No newline at end of file

Deleted: plugins/trunk/contentfilter/locale/locale_es_ES.php
===================================================================
--- plugins/trunk/contentfilter/locale/locale_es_ES.php	2005-02-09 08:18:55 UTC (rev 1020)
+++ plugins/trunk/contentfilter/locale/locale_es_ES.php	2005-02-09 11:47:15 UTC (rev 1021)
@@ -1,48 +0,0 @@
-<?php
-
-$messages["filteredContent"] = "Contenido Filtrado";
-$messages["global_filtered_content"] = "Contenido Filtrado Globalmente";
-$messages["newFilteredContent"] = "Filtrar Contenido";
-$messages["global_filtered_content_intro"] = "Las expresiones regulares/contenido que aparecen aquÌ han sido bloqueadas en todas las bit·coras de este servidor.";
-$messages["filtered_content_intro"] = "Las expresiones regulares/contenido que aparecen aquÌ han sido bloqueadas tan solo en esta bit·cora.";
-$messages["content"] = "Contenido";
-$messages["add_filtered_content"] = "AÒadir Contenido Filtrado";
-$messages["add_filtered_content_intro"] = "Cualquier cosa aÒadida aquÌ no ser· permitida como contenido v·lido de un comentario, y cualquier intento provocar· que el comentario sea bloqueado y no se aÒadir· a la base de datos. Se pueden usar simples palabras e incluso expresiones regulares. Las expresiones regulares son mucho m·s potentes pero tambiÈn son mucho m·s complejas, ya que potencialmente podrÌamos llegar bloquear todo lo que se intente escribir.";
-$messages["global_add_filtered_content_intro"] = "Cualquier cosa aÒadida aquÌ no ser· permitida como contenido v·lido de un comentario en cualquiera de las bit·coras disponibles en este servidor, y cualquier intento provocar· que el comentario sea bloqueado y no se aÒadir· a la base de datos. Se pueden usar simples palabras e incluso expresiones regulares. Las expresiones regulares son mucho m·s potentes pero tambiÈn son mucho m·s complejas, ya que potencialmente podrÌamos llegar bloquear todo lo que se intente escribir.";
-$messages["content_to_block"] = "Texto a filtrar";
-$messages["block_this"] = "Bloquear";
-$messages["error_provide_content_to_block"] = "Debe escribir algun contenido que bloquear.";
-$messages["blocked_content_added_ok"] = "El nuevo Contenido filtrado aÒadido correctamente.";
-$messages["blocked_content_updated_ok"] = "El contenido filtrado ha sido actualizado correctamente.";
-$messages["edit_filtered_content"] = "Editar Contenido Filtrado";
-$messages["error_updating_blocked_content"] = "Se produjo un error al actualizar el contenido a filtrar.";
-$messages["error_you_have_been_blocked"] = "Su peticiÛn ha sido denegada.";
-
-$messages["editBlogFilteredContent"] = "This page will allow you to edit a content filtering rule. The options
-are exactly the same as in <a href=\"admin.php?op=Help&amp;helpId=newBlogFilteredContent\">here</a>.";
-
-$messages["help_filteredContent"] = "<p>This is a list of all the rules for content filtering that have been added 
-to this site. These rules are site-wide and take precedence before any blog-specific rule that may have been
-set by blog owners. The options and its meaning is the same as 
-<a href=\"admin.php?op=Help&amp;helpId=blogFilteredContent\">here</a>.";
-
-$messages["help_newFilteredContent"] = "<p>You can add here a new rule for blocking undesired content from being
-included in comments. This rule will be used system-wide and will take preference before blog-specific
-rules. See <a href=\"admin.php?op=Help&amp;helpId=newBlogFilteredContent\">this</a> for more information
-on the options.";
-
-
-$messages["help_blogFilteredContent"] = "<p>This is a list of all the rules for content filtering that have been added 
-to this particular blog. Clicking any of them will take you to a page where you will be able to edit any of them.
-Use the <b>'Delete'</b> checkbox to mark any of them for deletion, and press the <b>'Delete Selected'</b> button
-once you are sure you want to delete those.</p>";
-
-$messages["help_newBlogFilteredContent"] = "<p>You can add here a new rule for blocking undesired content from being
-included in comments. You can use here single words or sentence or if you wish, you can use the power
-of regular expressions if you know how to use them. You can also add a description to the rule so that you remember
-in the future what it is about, but it is not a mandatory field.</p>";
-
-$messages["blogFilteredContent"] = $messages["filteredContent"];
-$messages["newBlogFilteredContent"] = $messages["newFilteredContent"];
-
-?>
\ No newline at end of file

Modified: plugins/trunk/contentfilter/locale/locale_zh_TW.php
===================================================================
--- plugins/trunk/contentfilter/locale/locale_zh_TW.php	2005-02-09 08:18:55 UTC (rev 1020)
+++ plugins/trunk/contentfilter/locale/locale_zh_TW.php	2005-02-09 11:47:15 UTC (rev 1021)
@@ -1,31 +1,36 @@
 <?php
+$messages["contentfilter_plugin_enabled"] = "啟動外掛程式";
 
-$messages["filteredContent"] = "內容過濾列表";
-$messages["global_filtered_content"] = "全域內容過濾列表";
-$messages["newFilteredContent"] = "內容過濾";
-$messages["filtered_content_intro"] = "ä»¥ä¸‹çš„å…§å®¹éŽæ¿¾æ–‡å­—ï¼æ­£è¦è¡¨ç¤ºå¼å·²ç¶“æˆåŠŸåŠ å…¥æœ¬ç¶²èªŒç«™å°çš„è¨­å®šä¸­ã€‚";
-$messages["global_filtered_content_intro"] = "ä»¥ä¸‹çš„å…§å®¹éŽæ¿¾æ–‡å­—ï¼æ­£è¦è¡¨ç¤ºå¼å·²ç¶“æˆåŠŸåŠ å…¥äº†å…¨åŸŸè¨­å®šä¸­ã€‚";
+$messages["filteredContent"] = "全域內容過濾列表";
+$messages["blogFilteredContent"] = "內容過濾列表";
+$messages["newFilteredContent"] = "新增全域內容過濾";
+$messages["newBlogFilteredContent"] = "新增內容過濾";
+
 $messages["content"] = "內容";
+$messages["content_to_block_help"] = "æ‚¨åœ¨é€™é‚Šæ‰€æ–°å¢žçš„å…§å®¹ï¼Œä¾¿æœƒè¢«è¦–ä½œæ˜¯ä¸åˆæ³•çš„é—œéµå­—ã€‚è€Œå¦‚æžœä½¿ç”¨è€…çš„è¿´éŸ¿ç•™è¨€ä¸­å‡ºç¾é€™äº›é—œéµå­—ï¼Œä¾¿ç„¡æ³•ç•™è¨€ã€‚æ‚¨è¦ç”¨æ­£è¦è¡¨ç¤ºå¼æˆ–æ˜¯ä¸€èˆ¬çš„æ–‡å­—å­—ä¸²éƒ½å¯ä»¥ï¼Œå¦‚æžœä½¿ç”¨æ­£è¦è¡¨ç¤ºå¼ï¼ŒåŠŸèƒ½æœƒæ›´åŠ å¼·å¤§ï¼Œä¸éŽæ­£è¦è¡¨ç¤ºå¼å¾€å¾€å¾ˆè¤‡é›œï¼Œæ‰€ä»¥æ‚¨åœ¨ä½¿ç”¨çš„æ™‚å€™è¦ç‰¹åˆ¥æ ¼å¤–å°å¿ƒï¼Œå› ç‚ºæ‚¨æœ‰å¯ä»¥å› ç‚ºå¼å­å‡ºéŒ¯ï¼ŒæŠŠæ‰€æœ‰çš„ç•™è¨€éƒ½éŽæ¿¾æŽ‰äº†ã€‚";
+$messages["reason"] = "åŽŸå› ";
+$messages["reason_help"] = "æ‚¨ä¹Ÿå¯ä»¥å°é€™äº›å…§å®¹éŽæ¿¾è¦å‰‡åŠ ä¸Šè¨»è§£ï¼Œå¥½è®“æ‚¨æ—¥å¾ŒçŸ¥é“ç•¶åˆç‚ºä»€éº¼è¨­å®šé€™äº›è¦å‰‡ã€‚";
 $messages["add_filtered_content"] = "新增內容過濾";
-$messages["add_filtered_content_intro"] = "æ‚¨åœ¨é€™é‚Šæ‰€æ–°å¢žçš„å…§å®¹ï¼Œä¾¿æœƒè¢«è¦–ä½œæ˜¯ä¸åˆæ³•çš„é—œéµå­—ã€‚è€Œå¦‚æžœä½¿ç”¨è€…çš„è¿´éŸ¿ç•™è¨€ä¸­å‡ºç¾é€™äº›é—œéµå­—ï¼Œä¾¿ç„¡æ³•ç•™è¨€ã€‚æ‚¨è¦ç”¨æ­£è¦è¡¨ç¤ºå¼æˆ–æ˜¯ä¸€èˆ¬çš„æ–‡å­—å­—ä¸²éƒ½å¯ä»¥ï¼Œå¦‚æžœä½¿ç”¨æ­£è¦è¡¨ç¤ºå¼ï¼ŒåŠŸèƒ½æœƒæ›´åŠ å¼·å¤§ï¼Œä¸éŽæ­£è¦è¡¨ç¤ºå¼å¾€å¾€å¾ˆè¤‡é›œï¼Œæ‰€ä»¥æ‚¨åœ¨ä½¿ç”¨çš„æ™‚å€™è¦ç‰¹åˆ¥æ ¼å¤–å°å¿ƒï¼Œå› ç‚ºæ‚¨æœ‰å¯ä»¥å› ç‚ºå¼å­å‡ºéŒ¯ï¼ŒæŠŠæ‰€æœ‰çš„ç•™è¨€éƒ½éŽæ¿¾æŽ‰äº†ã€‚";
-$messages["global_add_filtered_content_intro"] = "æ‚¨åœ¨é€™é‚Šæ‰€æ–°å¢žçš„å…§å®¹ï¼Œä¾¿æœƒè¢«è¦–ä½œæ˜¯ä¸åˆæ³•çš„é—œéµå­—ã€‚è€Œå¦‚æžœä½¿ç”¨è€…çš„è¿´éŸ¿ç•™è¨€ä¸­å‡ºç¾é€™äº›é—œéµå­—ï¼Œä¾¿ç„¡æ³•ç•™è¨€ã€‚æ‚¨è¦ç”¨æ­£è¦è¡¨ç¤ºå¼æˆ–æ˜¯ä¸€èˆ¬çš„æ–‡å­—å­—ä¸²éƒ½å¯ä»¥ï¼Œå¦‚æžœä½¿ç”¨æ­£è¦è¡¨ç¤ºå¼ï¼ŒåŠŸèƒ½æœƒæ›´åŠ å¼·å¤§ï¼Œä¸éŽæ­£è¦è¡¨ç¤ºå¼å¾€å¾€å¾ˆè¤‡é›œï¼Œæ‰€ä»¥æ‚¨åœ¨ä½¿ç”¨çš„æ™‚å€™è¦ç‰¹åˆ¥æ ¼å¤–å°å¿ƒï¼Œå› ç‚ºæ‚¨æœ‰å¯ä»¥å› ç‚ºå¼å­å‡ºéŒ¯ï¼ŒæŠŠæ‰€æœ‰çš„ç•™è¨€éƒ½éŽæ¿¾æŽ‰äº†ã€‚";
-$messages["content_to_block"] = "您所想要過濾的內容";
-$messages["block_this"] = "設定阻擋";
+$messages["edit_filtered_content"] = "編輯內容過濾";
+$messages["global"] = "全域";
+
 $messages["error_provide_content_to_block"] = "æ‚¨å¿…é ˆè¦è¼¸å…¥æ‚¨è¦éŽæ¿¾çš„å…§å®¹ã€‚";
-$messages["blocked_content_added_ok"] = "éŽæ¿¾å…§å®¹é †åˆ©æ–°å¢žã€‚";
-$messages["blocked_content_updated_ok"] = "éŽæ¿¾å…§å®¹é †åˆ©æ›´æ–°ã€‚";
-$messages["edit_filtered_content"] = "編輯過濾內容";
-$messages["error_updating_blocked_content"] = "在更新過濾內容時發生錯誤。";
-$messages["help_blogFilteredContent"] = "<p>您可以在這裡看到您目前所在網誌站台所設定的內容過濾規則列表。如果您想要修改當中的設定，請在勾選之後，按下「<b>åˆªé™¤é¸æ“‡çš„é …ç›®</b>」按鈕。</p>";
+$messages["error_updating_blocked_content"] = "在更新內容過濾時發生錯誤。";
+$messages["error_adding_blocked_content"] = "在新增內容過濾時發生錯誤。";
+$messages["error_no_block_content_selected"] = "ä½ æ²’æœ‰é¸æ“‡ä»»ä½•çš„å…§å®¹éŽæ¿¾ã€‚";
+$messages["error_incorrect_content_id"] = "您所選擇的內容過濾代號錯誤。";
+$messages["error_fetching_filtered_content"] = "在取出內容過濾時發生錯誤。";
+$messages["error_updating_content_block_settings"] = "在更新設定時發生錯誤。";
+$messages["error_deleting_content"] = "在刪除內容過濾 %s 時發生錯誤。";
 
-$messages["help_newBlogFilteredContent"] = "<p>æ‚¨å¯ä»¥åœ¨æ­¤è¨­å®šå…§å®¹éŽæ¿¾è¦å‰‡ï¼Œé˜»æ“‹ä½¿ç”¨è€…ç™¼è¡¨æ‚¨æ‰€ä¸é¡˜æ„æ¨‚è¦‹çš„è¿´éŸ¿ç•™è¨€ã€‚æ‚¨å¯ä»¥è¨­ç½®å–®ä¸€çš„éŽæ¿¾é—œéµè©žå½™ï¼Œä¹Ÿå¯ä»¥ä½¿ç”¨åŠŸèƒ½å¼·å¤§çš„æ­£è¦è¡¨ç¤ºå¼ï¼ˆå¦‚æžœæ‚¨çž­è§£æ­£è¦è¡¨ç¤ºå¼çš„ä½¿ç”¨æ–¹æ³•çš„è©±ï¼‰ã€‚æ‚¨ä¹Ÿå¯ä»¥å°é€™äº›å…§å®¹éŽæ¿¾è¦å‰‡åŠ ä¸Šè¨»è§£ï¼Œå¥½è®“æ‚¨æ—¥å¾ŒçŸ¥é“ç•¶åˆç‚ºä»€éº¼è¨­å®šé€™äº›è¦å‰‡ï¼Œä¸éŽï¼Œèªªæ˜Žæ¬„ä½å¯ä»¥ç•™ç™½ä¸å¡«ã€‚</p>";
+$messages["blocked_content_added_ok"] = "å…§å®¹éŽæ¿¾é †åˆ©æ–°å¢žã€‚";
+$messages["blocked_content_updated_ok"] = "å…§å®¹éŽæ¿¾é †åˆ©æ›´æ–°ã€‚";
+$messages["content_block_settings_updated_ok"] = "è¨­å®šé †åˆ©æ›´æ–°ã€‚";
+$messages["contents_deleted_ok"] = "é †åˆ©åˆªé™¤ %s 個內容過濾。";
+$messages["content_deleted_ok"] = "é †åˆ©åˆªé™¤å…§å®¹éŽæ¿¾ %s。";
 
-$messages["help_filteredContent"] = "<p>é€™è£¡æ‚¨å¯ä»¥çœ‹åˆ°ç³»çµ±ä¸­æ‰€æœ‰çš„å…§å®¹éŽæ¿¾è¦å‰‡çš„åˆ—è¡¨ï¼Œç•¶ä¸­åŒ…æ‹¬ç”±ç³»çµ±ç®¡ç†å“¡è¨­ç½®çš„å…¨ç«™è¦å‰‡ï¼Œä»¥åŠç”±ç¶²èªŒç«™å°ç®¡ç†å“¡æ‰€è¨­ç½®çš„é€™å€‹ç«™å°ç‰¹å®šçš„è¦å‰‡ã€‚å…§å®¹éŽæ¿¾é …ç›®çš„é¸é …èˆ‡å…¶æ„ç¾©ï¼Œè«‹åƒè¦‹<a href=\"admin.php?op=Help&amp;helpId=blogFilteredContent\">這裡</a>。";
+$messages["error_you_have_been_blocked"] = "ä½ æ‰€æä¾›çš„è¿´éŸ¿å«æœ‰ä¸è¢«å…è¨±çš„å…§å®¹ã€‚";
 
-$messages["help_newFilteredContent"] = "<p>您可以在這裡新增迴響留言內容過濾規則。這裡所設置的規則將會套用到系統中的全部站台上，相關的詳盡說明，請參見<a href=\"admin.php?op=Help&amp;helpId=newBlogFilteredContent\">這裡</a>。";
-
-$messages["blogFilteredContent"] = $messages["filteredContent"];
-$messages["newBlogFilteredContent"] = $messages["newFilteredContent"];
-
-
+$messages["label_configuration"] = "設定";
+$messages["label_enable"] = "å•Ÿå‹•";
 ?>
\ No newline at end of file

Modified: plugins/trunk/contentfilter/plugincontentfilter.class.php
===================================================================
--- plugins/trunk/contentfilter/plugincontentfilter.class.php	2005-02-09 08:18:55 UTC (rev 1020)
+++ plugins/trunk/contentfilter/plugincontentfilter.class.php	2005-02-09 11:47:15 UTC (rev 1021)
@@ -26,7 +26,7 @@
 			$this->id = "contentfilter";
 			$this->description = "A simple content filter.";
 			$this->author = "The pLog Team";
-			$this->locales = Array( "en_UK", "es_ES", "ca_ES", "zh_TW" );
+			$this->locales = Array( "en_UK", "zh_TW" );
 			
 			$this->init();
 		}

Modified: plugins/trunk/contentfilter/templates/addblogfilteredcontent.template
===================================================================
--- plugins/trunk/contentfilter/templates/addblogfilteredcontent.template	2005-02-09 08:18:55 UTC (rev 1020)
+++ plugins/trunk/contentfilter/templates/addblogfilteredcontent.template	2005-02-09 11:47:15 UTC (rev 1021)
@@ -2,11 +2,11 @@
 {include file="$admintemplatepath/navigation.template" showOpt=newBlogFilteredContent title=$locale->tr("newBlogFilteredContent")}
 <form name="newBlogFilteredContent" action="admin.php" method="post">
  <fieldset class="inputField">
- <legend>{$locale->tr("addFilteredContent")}</legend>
+ <legend>{$locale->tr("add_filtered_content")}</legend>
   {include file="$admintemplatepath/successmessage.template"}
   {include file="$admintemplatepath/errormessage.template"} 
   <div class="field">
-   <label for="filteredContent">{$locale->tr("content_to_block")}</label>
+   <label for="filteredContent">{$locale->tr("content")}</label>
    <span class="required">*</span>
    <div class="formHelp">{$locale->tr("content_to_block_help")}</div>
    <input type="text" name="filteredContent" id="filteredContent" value=""/>

Modified: plugins/trunk/contentfilter/templates/addfilteredcontent.template
===================================================================
--- plugins/trunk/contentfilter/templates/addfilteredcontent.template	2005-02-09 08:18:55 UTC (rev 1020)
+++ plugins/trunk/contentfilter/templates/addfilteredcontent.template	2005-02-09 11:47:15 UTC (rev 1021)
@@ -2,11 +2,11 @@
 {include file="$admintemplatepath/navigation.template" showOpt=newFilteredContent title=$locale->tr("newFilteredContent")}
 <form name="newFilteredContent" action="admin.php" method="post">
  <fieldset class="inputField">
- <legend>{$locale->tr("addFilteredContent")}</legend>
+ <legend>{$locale->tr("add_filtered_content")}</legend>
   {include file="$admintemplatepath/successmessage.template"}
   {include file="$admintemplatepath/errormessage.template"} 
   <div class="field">
-   <label for="filteredContent">{$locale->tr("content_to_block")}</label>
+   <label for="filteredContent">{$locale->tr("content")}</label>
    <span class="required">*</span>
    <div class="formHelp">{$locale->tr("content_to_block_help")}</div>
    <input type="text" name="filteredContent" id="filteredContent" value=""/>

Modified: plugins/trunk/contentfilter/templates/editblogfilteredcontent.template
===================================================================
--- plugins/trunk/contentfilter/templates/editblogfilteredcontent.template	2005-02-09 08:18:55 UTC (rev 1020)
+++ plugins/trunk/contentfilter/templates/editblogfilteredcontent.template	2005-02-09 11:47:15 UTC (rev 1021)
@@ -2,11 +2,11 @@
 {include file="$admintemplatepath/navigation.template" showOpt=blogFilteredContent title=$locale->tr("blogFilteredContent")}
 <form name="editBlogFilteredContent" action="admin.php" method="post">
  <fieldset class="inputField">
- <legend>{$locale->tr("editFilteredContent")}</legend>
+ <legend>{$locale->tr("edit_filtered_content")}</legend>
   {include file="$admintemplatepath/successmessage.template"}
   {include file="$admintemplatepath/errormessage.template"} 
   <div class="field">
-   <label for="filteredContent">{$locale->tr("content_to_block")}</label>
+   <label for="filteredContent">{$locale->tr("content")}</label>
    <span class="required">*</span>
    <div class="formHelp">{$locale->tr("content_to_block_help")}</div>
    <input type="text" name="filteredContent" id="filteredContent" value="{$filteredcontent->getRegExp()}"/>

Modified: plugins/trunk/contentfilter/templates/editfilteredcontent.template
===================================================================
--- plugins/trunk/contentfilter/templates/editfilteredcontent.template	2005-02-09 08:18:55 UTC (rev 1020)
+++ plugins/trunk/contentfilter/templates/editfilteredcontent.template	2005-02-09 11:47:15 UTC (rev 1021)
@@ -2,11 +2,11 @@
 {include file="$admintemplatepath/navigation.template" showOpt=filteredContent title=$locale->tr("filteredContent")}
 <form name="editFilteredContent" action="admin.php" method="post">
  <fieldset class="inputField">
- <legend>{$locale->tr("editFilteredContent")}</legend>
+ <legend>{$locale->tr("edit_filtered_content")}</legend>
   {include file="$admintemplatepath/successmessage.template"}
   {include file="$admintemplatepath/errormessage.template"} 
   <div class="field">
-   <label for="filteredContent">{$locale->tr("content_to_block")}</label>
+   <label for="filteredContent">{$locale->tr("content")}</label>
    <span class="required">*</span>
    <div class="formHelp">{$locale->tr("content_to_block_help")}</div>
    <input type="text" name="filteredContent" id="filteredContent" value="{$filteredcontent->getRegExp()}"/>