[pLog-svn] r3605 - in plog/trunk: class/action/admin locale

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2006-06-18 02:20:40 +0000 (Sun, 18 Jun 2006)
New Revision: 3605

Modified:
   plog/trunk/class/action/admin/adminupdateblogsettingsaction.class.php
   plog/trunk/locale/locale_en_UK.php
Log:
added an error message, and differentiated between two different error cases for better diagnostics

Modified: plog/trunk/class/action/admin/adminupdateblogsettingsaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminupdateblogsettingsaction.class.php	2006-06-17 23:23:09 UTC (rev 3604)
+++ plog/trunk/class/action/admin/adminupdateblogsettingsaction.class.php	2006-06-18 02:20:40 UTC (rev 3605)
@@ -107,7 +107,7 @@
 
                 if( !Subdomains::isDomainAvailable( $mainDomain )) {
                     $this->_view = new AdminBlogSettingsView( $this->_blogInfo );
-                    $this->_view->setErrorMessage( $this->_locale->tr("error_updating_blog_subdomain"));
+                    $this->_view->setErrorMessage( $this->_locale->tr("error_updating_blog_domain"));
 					$this->_form->setFieldValidationStatus( "blogMainDomain", false );
                     $this->setCommonData();
                     return false;

Modified: plog/trunk/locale/locale_en_UK.php
===================================================================
--- plog/trunk/locale/locale_en_UK.php	2006-06-17 23:23:09 UTC (rev 3604)
+++ plog/trunk/locale/locale_en_UK.php	2006-06-18 02:20:40 UTC (rev 3605)
@@ -1049,6 +1049,8 @@
 $messages['domain'] = 'Domain';
 $messages['help_subdomains_available_domains'] = 'Enter a space delimited set of main domains allowed.  The user will be presented with a dropdown list of these values, and can add any subdomain he wants.  This is only used if you enabled subdomains and used {blogdomain} in the subdomain_base_url above. Use a \'?\' if you want to allow any domain.';
 $messages['subdomains_any_domain'] = '<- Multi-domain enabled. Type in the full domain.';
+$messages['error_updating_blog_subdomain'] = 'There was an error updating the subdomain.  Please check the data and try again.';
+$messages['error_updating_blog_main_domain'] = 'There was an error updating the main domain setting. This probably means the site administrator has configured something incorrectly.';
 
 $messages['monthsshort'] = Array( 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' );
 $messages['weekdaysshort'] = Array( 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' );