[pLog-svn] r1026 - in plugins/trunk/hostblock: . class/action locale templates

mark at devel.plogworld.net mark at devel.plogworld.net
Wed Feb 9 18:39:00 GMT 2005


Author: mark
Date: 2005-02-09 18:39:00 +0000 (Wed, 09 Feb 2005)
New Revision: 1026

Added:
   plugins/trunk/hostblock/locale/locale_zh_TW.php
Modified:
   plugins/trunk/hostblock/class/action/admineditblockedhostaction.class.php
   plugins/trunk/hostblock/class/action/admineditblogblockedhostaction.class.php
   plugins/trunk/hostblock/class/action/adminupdatebloghostblockconfigaction.class.php
   plugins/trunk/hostblock/class/action/adminupdatehostblockconfigaction.class.php
   plugins/trunk/hostblock/locale/locale_en_UK.php
   plugins/trunk/hostblock/pluginhostblock.class.php
   plugins/trunk/hostblock/templates/addblockedhost.template
   plugins/trunk/hostblock/templates/addblogblockedhost.template
   plugins/trunk/hostblock/templates/blogblockedhosts.template
   plugins/trunk/hostblock/templates/editblockedhost.template
   plugins/trunk/hostblock/templates/editblogblockedhost.template
Log:
Update hostblock plugins locales, include zh_TW and en_UK.

Modified: plugins/trunk/hostblock/class/action/admineditblockedhostaction.class.php
===================================================================
--- plugins/trunk/hostblock/class/action/admineditblockedhostaction.class.php	2005-02-09 18:37:24 UTC (rev 1025)
+++ plugins/trunk/hostblock/class/action/admineditblockedhostaction.class.php	2005-02-09 18:39:00 UTC (rev 1026)
@@ -25,7 +25,7 @@
 			// data validation stuff
 			$this->registerFieldValidator( "hostId", new IntegerValidator());
 			$view = new AdminBlockedHostsView( $this->_blogInfo );
-			$view->setErrorMessage( $this->_locale->tr("error_incorrect_blocked_host_id") );
+			$view->setErrorMessage( $this->_locale->tr("error_incorrect_host_id") );
 			$this->setValidationErrorView( $view );             	
         }
 

Modified: plugins/trunk/hostblock/class/action/admineditblogblockedhostaction.class.php
===================================================================
--- plugins/trunk/hostblock/class/action/admineditblogblockedhostaction.class.php	2005-02-09 18:37:24 UTC (rev 1025)
+++ plugins/trunk/hostblock/class/action/admineditblogblockedhostaction.class.php	2005-02-09 18:39:00 UTC (rev 1026)
@@ -25,7 +25,7 @@
 			// data validation stuff
 			$this->registerFieldValidator( "hostId", new IntegerValidator());
 			$view = new AdminBlogBlockedHostsView( $this->_blogInfo );
-			$view->setErrorMessage( $this->_locale->tr("error_incorrect_blocked_host_id") );
+			$view->setErrorMessage( $this->_locale->tr("error_incorrect_host_id") );
 			$this->setValidationErrorView( $view );          	
         }
 

Modified: plugins/trunk/hostblock/class/action/adminupdatebloghostblockconfigaction.class.php
===================================================================
--- plugins/trunk/hostblock/class/action/adminupdatebloghostblockconfigaction.class.php	2005-02-09 18:37:24 UTC (rev 1025)
+++ plugins/trunk/hostblock/class/action/adminupdatebloghostblockconfigaction.class.php	2005-02-09 18:39:00 UTC (rev 1026)
@@ -34,7 +34,7 @@
 			$blogs = new Blogs();
             if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
                 $this->_view = new AdminBlogBlockedHostsView( $this->_blogInfo );
-                $this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
+                $this->_view->setErrorMessage( $this->_locale->tr("error_updating_host_block_settings"));
                 $this->setCommonData();
 
                 return false;                
@@ -46,7 +46,7 @@
             $this->saveSession();
 			
 			$this->_view = new AdminBlogBlockedHostsView( $this->_blogInfo );
-			$this->_view->setSuccessMessage( $this->_locale->tr("hostblock_settings_saved_ok"));			
+			$this->_view->setSuccessMessage( $this->_locale->tr("host_block_settings_updated_ok"));			
 			$this->setCommonData();
             
             return true;		

Modified: plugins/trunk/hostblock/class/action/adminupdatehostblockconfigaction.class.php
===================================================================
--- plugins/trunk/hostblock/class/action/adminupdatehostblockconfigaction.class.php	2005-02-09 18:37:24 UTC (rev 1025)
+++ plugins/trunk/hostblock/class/action/adminupdatehostblockconfigaction.class.php	2005-02-09 18:39:00 UTC (rev 1026)
@@ -34,7 +34,7 @@
 			$blogs = new Blogs();
             if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
                 $this->_view = new AdminBlockedHostsView( $this->_blogInfo );
-                $this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
+                $this->_view->setErrorMessage( $this->_locale->tr("error_updating_host_block_settings"));
                 $this->setCommonData();
 
                 return false;                
@@ -46,7 +46,7 @@
             $this->saveSession();
 			
 			$this->_view = new AdminBlockedHostsView( $this->_blogInfo );
-			$this->_view->setSuccessMessage( $this->_locale->tr("hostblock_settings_saved_ok"));			
+			$this->_view->setSuccessMessage( $this->_locale->tr("host_block_settings_updated_ok"));			
 			$this->setCommonData();
             
             return true;		

Modified: plugins/trunk/hostblock/locale/locale_en_UK.php
===================================================================
--- plugins/trunk/hostblock/locale/locale_en_UK.php	2005-02-09 18:37:24 UTC (rev 1025)
+++ plugins/trunk/hostblock/locale/locale_en_UK.php	2005-02-09 18:39:00 UTC (rev 1026)
@@ -1,58 +1,43 @@
 <?php
-$messages["blockedHosts"] = "Blocked Hosts";
-$messages["global_blocked_hosts"] = "Globally Blocked Hosts";
-$messages["newBlockedHost"] = "Block Host";
-$messages["mask"] = "Mask";
+$messages["hostblock_plugin_enabled"] = "Enable this plugin";
+
+$messages["siteSecurity"] = "Site Security";
+$messages["blogSecurity"] = "Blog Security";
+$messages["blockedHosts"] = "Global Blocked Hosts";
+$messages["blogBlockedHosts"] = "Blocked Hosts";
+$messages["newBlockedHost"] = "Add Global Blocked Hosts";
+$messages["newBlogBlockedHost"] = "Add Blocked Hosts";
+
+$messages["ip_address"] = "IP Address";
+$messages["host_to_block_help"] = "This section will allow you to block a specific address or entire subnet from your Blog. You can select if you want them to be able to see it, but unable to post or simply unable to access it at all. Copy the offending address into the spaces provided and choose the proper subnet address space if necessary. Example: To block just the address of 192.168.1.123 you would choose the '32 bits' option to match the entire address. This blocks just this one address and works well for banning someone with a Static IP address. If you're seeing multiple IP Addresses for a particular individual (say 192.168.1.123, 192.168.1.225, 192.168.1.21 and 192.168.1.67) then you will want to ban a particular subnet range. Enter one of the IP Addresses that you see and choose '24 bits', '16 bits' or '8 bits'  to match the first 3 sections, first 2 sections or the first section respectively.";
+$messages["bits"] = "Bits";
+$messages["block_type"] = "Block Type";
+$messages["block_type_help"] = "The 'Block type' drop-down list will allow you to choose whether to block this host from completely accessign the site (an error page will be sent to the client's browser whenever trying to access) or simply block it from posting new comments. If the latter is chosen, the host will still be allowed to read articles and other people's comments.";
+$messages["reason"] = "Reason";
+$messages["reason_help"] = "You can also attach a reason/description to this host blocking rule, so that you can remember in the future why it was set up.";
 $messages["access_blocked"] = "Access Blocked";
 $messages["posting_blocked"] = "Posting Blocked";
-$messages["block_host_intro"] = "Hosts added here will be blocked from accessiny only this blog. Please see <a href=\"javascript:help_window('admin.php?op=Help&amp;helpId=newBlogBlockedHost');\">Help</a> for more detailed information about this feature.";
-$messages["global_block_host_intro"] = "Hosts added here will be blocked from accessing any blog in this site. Please see this related <a href=\"javascript:help_window('admin.php?op=Help&amp;helpId=newBlogBlockedHost');\">help item</a> for more information about this feature.";
-$messages["block_type"] = "Block type";
-$messages["error_invalid_ip_address"] = "The IP address is not valid.";
-$messages["error_adding_blocked_host"] = "There was an error blocking the given host.";
-$messages["blocked_host_added_ok"] = "Host %s added successfully to the list of blocked hosts.";
-$messages["error_no_blocked_hosts_selected"] = "There were no hosts selected to remove.";
-$messages["blocked_host_deleted_ok"] = "Host \"%s\" deleted successfully.";
-$messages["error_deleting_blocked_host"] = "There was an error deleting blocked host \"%s\"";
+$messages["add_blocked_host"] = "Add Blocked Host";
 $messages["edit_blocked_host"] = "Edit Blocked Host";
+
+$messages["error_provide_host_to_block"] = "You must provide some hostt to block.";
+$messages["error_adding_blocked_host"] = "There was an error when adding the blocked host.";
+$messages["error_incorrect_host_id"] = "The blocked host ID is incorrect.";
+$messages["error_no_block_host_selected"] = "There were no hosts selected to remove.";
 $messages["error_fetching_blocked_host"] = "There was an error fetching the blocked host.";
 $messages["error_updating_blocked_host"] = "There was an error updating the blocked host.";
-$messages["help_blogBlockedHosts"] = "This is a list with all the hosts that have been blocked so far in this blog. At
-a glance, it is possible to see for each host the reason why it was blocked, the date when it was blocked and
-the type of the block applied. Lastly, you can also select any of the host blocking rules and press the
-<b>'Delete Selected'</b> button when you are sure that you want to remove those rules.";
+$messages["error_updating_host_block_settings"] = "There was an error when updating the host block plugin settings.";
+$messages["error_invalid_ip_address"] = "The IP address is not valid.";
+$messages["error_deleting_blocked_host"] = "There was an error when deleteing the blocked host %s.";
 
-$messages["help_newBlogBlockedHost"] = "<p>This section will allow you to block a specific address or entire subnet from your Blog. You can select if you want them to be able to see it, but unable to post or simply unable to access it at all. Copy the offending address into the spaces provided and choose the proper subnet address space if necessary. Example: To block just the address of 192.168.1.123 you would choose the '32 bits' option to match the entire address. This blocks just this one address and works well for banning someone with a Static IP address. If you're seeing multiple IP Addresses for a particular individual (say 192.168.1.123, 192.168.1.225, 192.168.1.21 and 192.168.1.67) then you will want to ban a particular subnet range. Enter one of the IP Addresses that you see and choose '24 bits', '16 bits' or '8 bits'  to match the first 3 sections, first 2 sections or the first section respectively.<br/>
-<br/>
-<b>EXAMPLES</b>:<br/>
-<br/>
-192.168.1.123 - 32 bits: Matches only the 192.168.1.123 address<br/>
-192.168.1.123 - 24 bits: Matches any address that starts with 192.168.1<br/>
-192.168.1.123 - 16 bits: Matches any address that starts with 192.168<br/>
-192.168.1.123 - 8 bits: Matches any address that starts with 192<br/>
-</p>
-<p>The <b>'Block type'</b> drop-down list will allow you to choose whether to block this host from 
-completely accessign the site (an error page will be sent to the client's browser whenever trying to access) or
-simply block it from posting new comments. If the latter is chosen, the host will still be allowed to read
-articles and other people's comments.</p>
-<p>You can also attach a reason/description to this host blocking rule, so that you can remember in the future why
-it was set up.</p>";
+$messages["blocked_host_updated_ok"] = "Blocked host updated successfully.";
+$messages["blocked_host_added_ok"] = "Blocked host added successfully.";
+$messages["host_block_settings_updated_ok"] = "Host block pluing settings updated successfully.";
+$messages["blocked_hosts_deleted_ok"] = "%s blocked hosts deleted successfully.";
+$messages["blocked_host_deleted_ok"] = "Blocked hosts %s deleted successfully.";
 
-$messages["editBlogBlockedHost"] = "You will be able to edit a host blocking rule from this section. The options
-available are exactly the same as in <a href=\"admin.php?op=Help&amp;helpId=newBlogBlockedHost\">here</a>.";
+$messages["error_you_have_been_blocked"] = "You are not allowed to proceed with this request.";
 
-$messages["help_blockedHosts"] = "This is a list with all the hosts that have been blocked so far system-wide. 
-Clicking a rule IP address will allow us to edit the settings of that rule. These rules always take
-precedence over blog-speficic rules, so that if one these global rules matches a host, all the other after
-it will be ignored.";
-
-$messages["help_newBlockedHost"] = "From here it is possible to add a new <b>global</b> host-blocking rule. See
-<a href=\"admin.php?op=Help&amp;helpId=newBlogBlockedHost\">here</a> for more information about the options
-available.";
-
-$messages["editBlockedHost"] = "You will be able to edit a host blocking rule from this section. The options
-available are exactly the same as in <a href=\"admin.php?op=Help&amp;helpId=newBlogBlockedHost\">here</a>.";
-
-$messages["blogBlockedHosts"] = $messages["blockedHosts"];
-$messages["newBlogBlockedHost"] = $messages["newBlockedHost"];
+$messages["label_configuration"] = "Configuration";
+$messages["label_enable"] = "Enable";
 ?>
\ No newline at end of file

Added: plugins/trunk/hostblock/locale/locale_zh_TW.php
===================================================================
--- plugins/trunk/hostblock/locale/locale_zh_TW.php	2005-02-09 18:37:24 UTC (rev 1025)
+++ plugins/trunk/hostblock/locale/locale_zh_TW.php	2005-02-09 18:39:00 UTC (rev 1026)
@@ -0,0 +1,43 @@
+<?php
+$messages["hostblock_plugin_enabled"] = "啟動外掛程式";
+
+$messages["siteSecurity"] = "系統安全";
+$messages["blogSecurity"] = "系統安全";
+$messages["blockedHosts"] = "全域阻擋主機列表";
+$messages["blogBlockedHosts"] = "阻擋主機列表";
+$messages["newBlockedHost"] = "新增全域阻擋主機";
+$messages["newBlogBlockedHost"] = "新增阻擋主機";
+
+$messages["ip_address"] = "IP 位址";
+$messages["host_to_block_help"] = "您可以在這裡阻擋某個特定的網路位置,或是某個網路區段,不讓從這個位置來的使用者瀏覽您的網誌站台。您也可以設定成讓他們可以瀏覽,但是不可以發表文章。請輸入網路位置,並且做適當的設定。比方說,如果您要阻擋 192.168.1.123 這個位置,您便必須在填入IP位置後,並設定為「32 bits」,這麼一來便可以阻擋從某個固定IP連線的使用者。如果您想要阻擋多個位置,而不只是要阻擋單一位置,例如您同時想要阻擋 192.168.1.123、192.168.1.225、192.168.1.21 以及 192.168.1.67 的話,您可以檔掉整個網路區段。請在輸入 IP 位置後,選擇「24 bits」、「16 bits」或「8 bits」,阻擋不同範圍的區段。";
+$messages["bits"] = "位元";
+$messages["block_type"] = "阻擋類別";
+$messages["block_type_help"] = "「阻擋類別」這個下拉選單,可以讓您決定被阻擋的使用者會遇到的狀況,您可以讓他無法瀏覽您的網誌站台(系統會送出一個錯誤訊息),或是讓他不能夠發表文章。如果您選擇後者,那麼他還是可以閱讀站上的文章以及迴響留言。";
+$messages["reason"] = "原因";
+$messages["reason_help"] = "您也可以對阻擋主機的理由稍作說明,方便您日後可以知道您當初為什麼把對方檔掉了。";
+$messages["access_blocked"] = "禁止瀏覽";
+$messages["posting_blocked"] = "禁止發表";
+$messages["add_blocked_host"] = "新增阻擋主機";
+$messages["edit_blocked_host"] = "編輯阻擋主機";
+
+$messages["error_provide_host_to_block"] = "您必須要輸入您要阻擋的主機 IP 位址。";
+$messages["error_adding_blocked_host"] = "在新增阻擋主機時發生錯誤。";
+$messages["error_incorrect_host_id"] = "您所選擇的阻擋主機代號錯誤。";
+$messages["error_no_block_host_selected"] = "你沒有選擇任何的阻擋主機。";
+$messages["error_fetching_blocked_host"] = "在讀取阻擋主機時發生錯誤。";
+$messages["error_updating_blocked_host"] = "在更新阻擋主機時發生錯誤。";
+$messages["error_updating_host_block_settings"] = "在更新設定時發生錯誤。";
+$messages["error_invalid_ip_address"] = "您輸入的 IP 位址不正確。";
+$messages["error_deleting_blocked_host"] = "在刪除阻擋主機 %s 時發生錯誤。";
+
+$messages["blocked_host_updated_ok"] = "阻擋主機順利更新。";
+$messages["blocked_host_added_ok"] = "阻擋主機順利新增。";
+$messages["host_block_settings_updated_ok"] = "設定順利更新。";
+$messages["blocked_hosts_deleted_ok"] = "順利刪除 %s 個阻擋主機。";
+$messages["blocked_host_deleted_ok"] = "順利刪除阻擋主機 %s。";
+
+$messages["error_you_have_been_blocked"] = "抱歉!你無法在本網誌迴響。你所提供的迴響含有不被允許的內容或是你的主機已被列入本網誌的阻擋主機列表中。";
+
+$messages["label_configuration"] = "設定";
+$messages["label_enable"] = "å•Ÿå‹•";
+?>
\ No newline at end of file

Modified: plugins/trunk/hostblock/pluginhostblock.class.php
===================================================================
--- plugins/trunk/hostblock/pluginhostblock.class.php	2005-02-09 18:37:24 UTC (rev 1025)
+++ plugins/trunk/hostblock/pluginhostblock.class.php	2005-02-09 18:39:00 UTC (rev 1026)
@@ -27,7 +27,7 @@
 			$this->id = "hostblock";
 			$this->description = "Allows to block hosts";
 			$this->author = "The pLog Team";
-			$this->locales = Array( "en_UK" );
+			$this->locales = Array( "en_UK", "zh_TW" );
 			
 			$this->init();
 		}

Modified: plugins/trunk/hostblock/templates/addblockedhost.template
===================================================================
--- plugins/trunk/hostblock/templates/addblockedhost.template	2005-02-09 18:37:24 UTC (rev 1025)
+++ plugins/trunk/hostblock/templates/addblockedhost.template	2005-02-09 18:39:00 UTC (rev 1026)
@@ -3,7 +3,7 @@
 {include file="common.template"}
 <form name="newBlockedHost" action="admin.php" method="post" onSubmit="return checkIpAddress(this);">
  <fieldset class="inputField">
- <legend>{$locale->tr("addBlockedHost")}</legend>
+ <legend>{$locale->tr("add_blocked_host")}</legend>
   {include file="$admintemplatepath/successmessage.template"}
   {include file="$admintemplatepath/errormessage.template"} 
   <div class="field">

Modified: plugins/trunk/hostblock/templates/addblogblockedhost.template
===================================================================
--- plugins/trunk/hostblock/templates/addblogblockedhost.template	2005-02-09 18:37:24 UTC (rev 1025)
+++ plugins/trunk/hostblock/templates/addblogblockedhost.template	2005-02-09 18:39:00 UTC (rev 1026)
@@ -3,7 +3,7 @@
 {include file="common.template"}
 <form name="newBlogBlockedHost" action="admin.php" method="post" onSubmit="return checkIpAddress(this);">
  <fieldset class="inputField">
- <legend>{$locale->tr("addBlogBlockedHost")}</legend>
+ <legend>{$locale->tr("add_blocked_host")}</legend>
   {include file="$admintemplatepath/successmessage.template"}
   {include file="$admintemplatepath/errormessage.template"} 
   <div class="field">

Modified: plugins/trunk/hostblock/templates/blogblockedhosts.template
===================================================================
--- plugins/trunk/hostblock/templates/blogblockedhosts.template	2005-02-09 18:37:24 UTC (rev 1025)
+++ plugins/trunk/hostblock/templates/blogblockedhosts.template	2005-02-09 18:39:00 UTC (rev 1026)
@@ -9,7 +9,7 @@
      <label for="pluginEnabled">{$locale->tr("label_enable")}</label>
      <span class="required"></span>
      <div class="formHelp">
-      <input class="checkbox" type="checkbox" name="pluginEnabled" id="pluginEnabled" {if $pluginEnabled} checked="checked" {/if} value="1" />{$locale->tr("hotblock_plugin_enabled")}
+      <input class="checkbox" type="checkbox" name="pluginEnabled" id="pluginEnabled" {if $pluginEnabled} checked="checked" {/if} value="1" />{$locale->tr("hostblock_plugin_enabled")}
      </div>
     </div>
     <div class="list_nav_option">

Modified: plugins/trunk/hostblock/templates/editblockedhost.template
===================================================================
--- plugins/trunk/hostblock/templates/editblockedhost.template	2005-02-09 18:37:24 UTC (rev 1025)
+++ plugins/trunk/hostblock/templates/editblockedhost.template	2005-02-09 18:39:00 UTC (rev 1026)
@@ -3,7 +3,7 @@
 {include file="common.template"}
 <form name="editBlockedHost" action="admin.php" method="post" onSubmit="return checkIpAddress(this);">
  <fieldset class="inputField">
- <legend>{$locale->tr("editBlockedHost")}</legend>
+ <legend>{$locale->tr("edit_blocked_host")}</legend>
   {include file="$admintemplatepath/successmessage.template"}
   {include file="$admintemplatepath/errormessage.template"} 
   <div class="field">

Modified: plugins/trunk/hostblock/templates/editblogblockedhost.template
===================================================================
--- plugins/trunk/hostblock/templates/editblogblockedhost.template	2005-02-09 18:37:24 UTC (rev 1025)
+++ plugins/trunk/hostblock/templates/editblogblockedhost.template	2005-02-09 18:39:00 UTC (rev 1026)
@@ -3,7 +3,7 @@
 {include file="common.template"}
 <form name="editBlogBlockedHost" action="admin.php" method="post" onSubmit="return checkIpAddress(this);">
  <fieldset class="inputField">
- <legend>{$locale->tr("editBlockedHost")}</legend>
+ <legend>{$locale->tr("edit_blocked_host")}</legend>
   {include file="$admintemplatepath/successmessage.template"}
   {include file="$admintemplatepath/errormessage.template"} 
   <div class="field">




More information about the pLog-svn mailing list