Index: openacs-4/packages/acs-admin/acs-admin.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/acs-admin.info,v
diff -u -N -r1.49.2.13 -r1.49.2.14
--- openacs-4/packages/acs-admin/acs-admin.info	27 Feb 2017 07:42:02 -0000	1.49.2.13
+++ openacs-4/packages/acs-admin/acs-admin.info	26 Apr 2017 13:09:29 -0000	1.49.2.14
@@ -9,7 +9,7 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
     
-    <version name="5.9.1b3" url="http://openacs.org/repository/download/apm/acs-admin-5.9.1b3.apm">
+    <version name="5.9.1b4" url="http://openacs.org/repository/download/apm/acs-admin-5.9.1b4.apm">
         <owner url="mailto:dhogaza@pacifier.com">Don Baccus</owner>
         <summary>An interface for Site-wide administration of an OpenACS Installation.</summary>
         <release-date>2017-02-27</release-date>
@@ -21,7 +21,7 @@
         <maturity>3</maturity>
 
         <provides url="acs-admin" version="5.9.1b3"/>
-        <requires url="acs-kernel" version="5.9.1b1"/>
+        <requires url="acs-kernel" version="5.9.1b5"/>
 	<requires url="acs-tcl" version="5.9.1b1"/>
 	<requires url="acs-templating" version="5.9.1b1"/>
         <requires url="acs-mail-lite" version="5.9.1b1"/>
Index: openacs-4/packages/acs-admin/www/users/member-state-change.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/member-state-change.tcl,v
diff -u -N -r1.17.2.6 -r1.17.2.7
--- openacs-4/packages/acs-admin/www/users/member-state-change.tcl	25 Apr 2017 13:33:51 -0000	1.17.2.6
+++ openacs-4/packages/acs-admin/www/users/member-state-change.tcl	26 Apr 2017 13:09:29 -0000	1.17.2.7
@@ -8,9 +8,15 @@
 
 } {
     user_id:naturalnum,notnull
-    {member_state}
+    {member_state:trim}
     {email_verified_p:boolean}
     {return_url:localurl ""}
+} -validate {
+    member_state {
+        if {$member_state ni {approved banned deleted merged "needs approval" rejected}} {
+            ad_complain "invalid member_state '$member_state'"
+        }
+    }
 } -properties {
     context:onevalue
     export_vars:onevalue
@@ -24,29 +30,36 @@
     return
 }
 
-
-set action [group::get_member_state_pretty -component action -user_name $name]
-set email_message [group::get_member_state_pretty -component email_message \
-                       -community_name [ad_system_name] \
-                       -url [ad_url] \
-                       -membership "account"]
-
+#
+# This page is used for state changes in the member_state, and as well
+# on email confirm require and approve operations.
+#
 switch $email_verified_p {
     "t" {
-	set action "Approve Email for $name"
-	set email_message "Your email in [ad_system_name] has been approved.  Please return to [ad_url]."
+        set user_name     $name
+        set url           [ad_url]
+        set site_name     [ad_system_name]
+        set action        [lang::util::localize #acs-kernel.email_action_approved#]
+        set email_message [lang::util::localize #acs-kernel.email_mail_approved#]
     }
     "f" {
-	set action "Require Email from $name"
-	set email_message "Your email in [ad_system_name] needs approval. please go to [ad_url]/register/email-confirm"
+        set user_name     $name
+        set url           [ad_url]/register/email-confirm
+        set site_name     [ad_system_name]
+        set action        [lang::util::localize #acs-kernel.email_action_needs_approval#]
+        set email_message [lang::util::localize #acs-kernel.email_mail_needs_approval#]
     }
+    default {
+        set action        [group::get_member_state_pretty -component action \
+                               -member_state $member_state \
+                               -user_name $name]
+        set email_message [group::get_member_state_pretty -component account_mail \
+                               -member_state $member_state \
+                               -site_name [ad_system_name] \
+                               -url [ad_url]]
+    }
 }
 
-if {$action eq ""} {
-    ad_return_complaint 1 "Not valid action: You have not changed the user in any way"
-    return
-}
-
 if {[catch {
     acs_user::change_state -user_id $user_id -state $member_state
 
Index: openacs-4/packages/acs-kernel/acs-kernel.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/acs-kernel.info,v
diff -u -N -r1.136.2.31 -r1.136.2.32
--- openacs-4/packages/acs-kernel/acs-kernel.info	21 Apr 2017 15:59:20 -0000	1.136.2.31
+++ openacs-4/packages/acs-kernel/acs-kernel.info	26 Apr 2017 13:09:29 -0000	1.136.2.32
@@ -9,15 +9,15 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
     
-    <version name="5.9.1b4" url="http://openacs.org/repository/download/apm/acs-kernel-5.9.1b4.apm">
+    <version name="5.9.1b5" url="http://openacs.org/repository/download/apm/acs-kernel-5.9.1b5.apm">
         <owner url="mailto:oct@openacs.org">OpenACS Core Team</owner>
         <summary>Routines and data models providing the foundation for OpenACS-based Web services.</summary>
         <release-date>2017-02-27</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
         <description format="text/html">The OpenACS kernel contains the core datamodel create and drop scripts for such things as objects, groups, partiies and the supporting PL/SQL and PL/pgSQL procedures.</description>
         <maturity>3</maturity>
 
-        <provides url="acs-kernel" version="5.9.1b4"/>
+        <provides url="acs-kernel" version="5.9.1b5"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.en_US.ISO-8859-1.xml,v
diff -u -N -r1.46.2.1 -r1.46.2.2
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.en_US.ISO-8859-1.xml	5 Sep 2015 09:17:50 -0000	1.46.2.1
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.en_US.ISO-8859-1.xml	26 Apr 2017 13:09:29 -0000	1.46.2.2
@@ -1,109 +1,135 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="acs-kernel" locale="en_US" charset="ISO-8859-1">
-
   <msg key="Administrator">Administrator</msg>
   <msg key="Administrators">Administrators</msg>
+  <msg key="Bio">Biography</msg>
+  <msg key="Bios">Biographies</msg>
+  <msg key="Default_Context">Default Context</msg>
+  <msg key="Email_Address">Email Address</msg>
+  <msg key="Email_Addresses">Email Addresses</msg>
+  <msg key="First_Names">First Names</msg>
+  <msg key="Group">Group</msg>
+  <msg key="Group_name">Group Name</msg>
+  <msg key="Group_names">Group Names</msg>
+  <msg key="Groups">Groups</msg>
+  <msg key="Last_Name">Last Name</msg>
+  <msg key="Last_Names">Last Names</msg>
+  <msg key="Main_Site">Main Site</msg>
+  <msg key="Main_Site_Members">Main Site Members</msg>
+  <msg key="Member_role_pretty_name">Member</msg>
+  <msg key="Member_role_pretty_plural">Members</msg>
+  <msg key="Membership_Relation">Membership Relation</msg>
+  <msg key="OpenACS_Local">OpenACS Local</msg>
+  <msg key="Parties">Parties</msg>
+  <msg key="Party">Party</msg>
+  <msg key="People">People</msg>
+  <msg key="Person">Person</msg>
+  <msg key="Registered_Users">Registered Users</msg>
+  <msg key="Screen_Name">Screen Name</msg>
+  <msg key="Screen_Names">Screen Names</msg>
+  <msg key="The_Public">The Public</msg>
+  <msg key="URL">URL</msg>
+  <msg key="URLs">URLs</msg>
+  <msg key="Unregistered">Unregistered</msg>
+  <msg key="Unregistered_Visitor">Unregistered Visitor</msg>
+  <msg key="User">User</msg>
+  <msg key="Username">Username</msg>
+  <msg key="Usernames">Usernames</msg>
+  <msg key="Users">Users</msg>
+  <msg key="Visitor">Visitor</msg>
   <msg key="authentication_authority">Authority</msg>
   <description key="authentication_authority">The identifying label for an authentication server, such as an  LDAP or RADIUS server.</description>
 
   <msg key="common_Actions">Actions</msg>
-  <msg key="Bio">Biography</msg>
-  <msg key="Bios">Biographies</msg>
   <description key="common_Actions">Header for a list of actions which may be taken on the displayed content</description>
-
-  <msg key="common_actions">actions</msg>
+  
   <msg key="common_Add">Add</msg>
-  <msg key="common_add">add</msg>
   <msg key="common_Admin">Admin</msg>
   <msg key="common_Administration">Administration</msg>
-  <msg key="common_administration">administration</msg>
   <msg key="common_All">All</msg>
   <msg key="common_Any">Any</msg>
   <msg key="common_Apply">Apply</msg>
-  <msg key="common_apply">apply</msg>
   <msg key="common_Cancel">Cancel</msg>
-  <msg key="common_cancel">cancel</msg>
   <msg key="common_Close">Close</msg>
-  <msg key="common_close">close</msg>
   <msg key="common_Closed">Closed</msg>
-  <msg key="common_closed">closed</msg>
   <msg key="common_Continue">Continue</msg>
-  <msg key="common_continue">continue</msg>
   <msg key="common_Copy">Copy</msg>
   <description key="common_Copy">Important for non-English for most languages, is this singular or plural?!</description>
 
   <msg key="common_Default">Use Default</msg>
-  <msg key="common_default">use default</msg>
   <msg key="common_Delete">Delete</msg>
-  <msg key="common_delete">delete</msg>
   <msg key="common_Details">Details</msg>
-  <msg key="common_details">details</msg>
   <msg key="common_Discard">Discard</msg>
-  <msg key="common_discard">discard</msg>
   <msg key="common_Display">Display</msg>
-  <msg key="common_display">display</msg>
   <msg key="common_Edit">Edit</msg>
-  <msg key="common_edit">edit</msg>
   <msg key="common_Finish">Finish</msg>
-  <msg key="common_finish">finish</msg>
   <msg key="common_First">First</msg>
-  <msg key="common_first">first</msg>
   <msg key="common_Go">Go</msg>
-  <msg key="common_go">go</msg>
   <msg key="common_Help">Help</msg>
-  <msg key="common_help">help</msg>
   <msg key="common_Last">Last</msg>
-  <msg key="common_last">last</msg>
   <msg key="common_Login">Log in</msg>
-  <msg key="common_login">log in</msg>
   <msg key="common_Needs_Approval">Needs Approval</msg>
-  <msg key="common_needs_approval">needs approval</msg>
   <msg key="common_New">New</msg>
-  <msg key="common_new">new</msg>
   <msg key="common_Next">Next</msg>
-  <msg key="common_next">next</msg>
   <msg key="common_No">No</msg>
-  <msg key="common_no">no</msg>
   <msg key="common_OK">OK</msg>
-  <msg key="common_ok">ok</msg>
   <msg key="common_Open">Open</msg>
-  <msg key="common_open">open</msg>
   <msg key="common_Permissions">Permissions</msg>
   <msg key="common_Previous">Previous</msg>
-  <msg key="common_previous">previous</msg>
   <msg key="common_Print">Print</msg>
   <msg key="common_Register">Register</msg>
-  <msg key="common_register">register</msg>
   <msg key="common_Repeat">Repeat</msg>
-  <msg key="common_repeat">repeat</msg>
   <msg key="common_Reset">Reset</msg>
-  <msg key="common_reset">reset</msg>
   <msg key="common_Save">Save</msg>
-  <msg key="common_save">save</msg>
   <msg key="common_Search">Search</msg>
-  <msg key="common_search">search</msg>
   <msg key="common_Stop">Stop</msg>
-  <msg key="common_stop">stop</msg>
   <msg key="common_Submit">Submit</msg>
-  <msg key="common_submit">submit</msg>
   <msg key="common_Title">Title</msg>
   <msg key="common_Type">Type</msg>
   <msg key="common_Update">Update</msg>
-  <msg key="common_update">update</msg>
   <msg key="common_View">View</msg>
-  <msg key="common_view">view</msg>
   <msg key="common_Yes">Yes</msg>
+  <msg key="common_actions">actions</msg>
+  <msg key="common_add">add</msg>
+  <msg key="common_administration">administration</msg>
+  <msg key="common_apply">apply</msg>
+  <msg key="common_cancel">cancel</msg>
+  <msg key="common_close">close</msg>
+  <msg key="common_closed">closed</msg>
+  <msg key="common_continue">continue</msg>
+  <msg key="common_default">use default</msg>
+  <msg key="common_delete">delete</msg>
+  <msg key="common_details">details</msg>
+  <msg key="common_discard">discard</msg>
+  <msg key="common_display">display</msg>
+  <msg key="common_edit">edit</msg>
+  <msg key="common_finish">finish</msg>
+  <msg key="common_first">first</msg>
+  <msg key="common_go">go</msg>
+  <msg key="common_help">help</msg>
+  <msg key="common_last">last</msg>
+  <msg key="common_login">log in</msg>
+  <msg key="common_needs_approval">needs approval</msg>
+  <msg key="common_new">new</msg>
+  <msg key="common_next">next</msg>
+  <msg key="common_no">no</msg>
+  <msg key="common_ok">ok</msg>
+  <msg key="common_open">open</msg>
+  <msg key="common_previous">previous</msg>
+  <msg key="common_register">register</msg>
+  <msg key="common_repeat">repeat</msg>
+  <msg key="common_reset">reset</msg>
+  <msg key="common_save">save</msg>
+  <msg key="common_search">search</msg>
+  <msg key="common_stop">stop</msg>
+  <msg key="common_submit">submit</msg>
+  <msg key="common_update">update</msg>
+  <msg key="common_view">view</msg>
   <msg key="common_yes">yes</msg>
-  <msg key="Default_Context">Default Context</msg>
-  <msg key="Email_Address">Email Address</msg>
-  <msg key="Email_Addresses">Email Addresses</msg>
-  <msg key="First_Names">First Names</msg>
-  <msg key="Group">Group</msg>
-  <msg key="Group_name">Group Name</msg>
-  <msg key="Group_names">Group Names</msg>
-  <msg key="Groups">Groups</msg>
-  <msg key="Last_Name">Last Name</msg>
-  <msg key="Last_Names">Last Names</msg>
+  <msg key="email_action_approved">Approve Email for %user_name%</msg>
+  <msg key="email_action_needs_approval">Require Email approval from %user_name%</msg>
+  <msg key="email_mail_approved">Your email on %site_name% has been approved.  Please visit %url%.</msg>
+  <msg key="email_mail_needs_approval">Your email on %site_name% needs approval.  Please visit %url%.</msg>
   <msg key="lt_Administrator_Relatio">Administrator Relationship</msg>
   <msg key="lt_Administrator_Relatio_1">Administrator Relationships</msg>
   <msg key="lt_Main_Site_Administrat">Main Site Administrators</msg>
@@ -113,43 +139,38 @@
   <msg key="lt_Relational_Party_Segm">Relational Party Segment</msg>
   <msg key="lt_Relational_Party_Segm_1">Relational Party Segments</msg>
   <msg key="lt_Security_context_root">Security context root</msg>
-  <msg key="Main_Site">Main Site</msg>
-  <msg key="Main_Site_Members">Main Site Members</msg>
-  <msg key="Member_role_pretty_name">Member</msg>
   <msg key="member_role_pretty_name">member</msg>
-  <msg key="Member_role_pretty_plural">Members</msg>
   <msg key="member_role_pretty_plural">members</msg>
   <msg key="member_state_Approved">Approved</msg>
-  <msg key="member_state_approved">approved</msg>
   <msg key="member_state_Banned">Banned</msg>
-  <msg key="member_state_banned">banned</msg>
   <msg key="member_state_Deleted">Deleted</msg>
-  <msg key="member_state_deleted">deleted</msg>
   <msg key="member_state_Merged">Merged</msg>
-  <msg key="member_state_merged">merged</msg>
   <msg key="member_state_Needs_Approval">Needs Approval</msg>
-  <msg key="member_state_needs_approval">needs approval</msg>
   <msg key="member_state_Rejected">Rejected</msg>
+  <msg key="member_state_account_mail_approved">Your account on %site_name% has been approved. You might now use %url%</msg>
+  <msg key="member_state_account_mail_banned">You have been banned from %site_name%.</msg>  
+  <msg key="member_state_account_mail_deleted">Your account on %site_name% has been deleted.</msg>  
+  <msg key="member_state_account_mail_merged">Your account on %site_name% was merged.</msg>  
+  <msg key="member_state_account_mail_needs_approval">Your account on %site_name% is awaiting approval from an administrator.</msg>
+  <msg key="member_state_account_mail_rejected">Your account on %site_name% has been rejected.</msg>  
+  <msg key="member_state_action_approved">Approve %user_name%</msg>
+  <msg key="member_state_action_banned">Ban %user_name%</msg>
+  <msg key="member_state_action_deleted">Delete %user_name%</msg>
+  <msg key="member_state_action_merged">Merge %user_name%</msg>
+  <msg key="member_state_action_needs_approval">Require Admin Approval for %user_name%</msg>
+  <msg key="member_state_action_rejected">Reject %user_name%</msg>
+  <msg key="member_state_approved">approved</msg>
+  <msg key="member_state_banned">banned</msg>
+  <msg key="member_state_community_mail_approved">Your membership in community %community_name% has been approved. You might now use %url%</msg>
+  <msg key="member_state_community_mail_banned">You have been banned from community %community_name%.</msg>  
+  <msg key="member_state_community_mail_deleted">Your membership in community %community_name% has been deleted.</msg>  
+  <msg key="member_state_community_mail_merged">Your membership in community %community_name% was merged.</msg>  
+  <msg key="member_state_community_mail_needs_approval">Your membership in community %community_name% is awaiting approval from an administrator.</msg>
+  <msg key="member_state_community_mail_rejected">Your membership in community %community_name% has been rejected.</msg>  
+  <msg key="member_state_deleted">deleted</msg>
+  <msg key="member_state_merged">merged</msg>
+  <msg key="member_state_needs_approval">needs approval</msg>
   <msg key="member_state_rejected">rejected</msg>
-  <msg key="Membership_Relation">Membership Relation</msg>
-  <msg key="OpenACS_Local">OpenACS Local</msg>
-  <msg key="Parties">Parties</msg>
-  <msg key="Party">Party</msg>
-  <msg key="People">People</msg>
-  <msg key="Person">Person</msg>
-  <msg key="Registered_Users">Registered Users</msg>
   <msg key="registered_users">Registered Users</msg>
-  <msg key="Screen_Name">Screen Name</msg>
-  <msg key="Screen_Names">Screen Names</msg>
-  <msg key="The_Public">The Public</msg>
   <msg key="the_public">The Public</msg>
-  <msg key="Unregistered">Unregistered</msg>
-  <msg key="Unregistered_Visitor">Unregistered Visitor</msg>
-  <msg key="URL">URL</msg>
-  <msg key="URLs">URLs</msg>
-  <msg key="User">User</msg>
-  <msg key="Users">Users</msg>
-  <msg key="Username">Username</msg>
-  <msg key="Usernames">Usernames</msg>
-  <msg key="Visitor">Visitor</msg>
 </message_catalog>
Index: openacs-4/packages/acs-subsite/acs-subsite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/acs-subsite.info,v
diff -u -N -r1.117.2.30 -r1.117.2.31
--- openacs-4/packages/acs-subsite/acs-subsite.info	4 Mar 2017 10:57:08 -0000	1.117.2.30
+++ openacs-4/packages/acs-subsite/acs-subsite.info	26 Apr 2017 13:09:29 -0000	1.117.2.31
@@ -9,7 +9,7 @@
     <implements-subsite-p>t</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
     
-    <version name="5.9.1b3" url="http://openacs.org/repository/download/apm/acs-subsite-5.9.1b3.apm">
+    <version name="5.9.1b4" url="http://openacs.org/repository/download/apm/acs-subsite-5.9.1b4.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Subsite</summary>
         <release-date>2017-02-27</release-date>
@@ -18,10 +18,10 @@
         <license>GPL</license>
         <maturity>3</maturity>
 
-        <provides url="acs-subsite" version="5.9.1b3"/>
+        <provides url="acs-subsite" version="5.9.1b4"/>
         <requires url="acs-authentication" version="5.9.1b1"/>
         <requires url="acs-content-repository" version="5.9.1b1"/>
-        <requires url="acs-kernel" version="5.9.1b1"/>
+        <requires url="acs-kernel" version="5.9.1b5"/>
         <requires url="acs-tcl" version="5.9.1b1"/>
         <requires url="acs-lang" version="5.9.1b1"/>
         <requires url="acs-mail-lite" version="5.9.1b1"/>
Index: openacs-4/packages/acs-subsite/tcl/group-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/group-procs.tcl,v
diff -u -N -r1.39.2.10 -r1.39.2.11
--- openacs-4/packages/acs-subsite/tcl/group-procs.tcl	25 Apr 2017 13:33:51 -0000	1.39.2.10
+++ openacs-4/packages/acs-subsite/tcl/group-procs.tcl	26 Apr 2017 13:09:29 -0000	1.39.2.11
@@ -434,63 +434,46 @@
 ad_proc -public group::get_member_state_pretty {
     {-member_state:required}
     {-component pretty_name}
-    {-user_name  ""}
-    {-community_name  ""}
+    {-user_name ""}
+    {-community_name ""}
+    {-site_name ""}
     {-url ""}
-    {-membership "membership"}
+    {-locale ""}
 } {
     Returns the pretty-name of a member state.
 } {
-    set message_key_dict {}
+    if {$member_state ni {approved banned deleted merged "needs approval" rejected}} {
+        error "invalid member_state '$member_state'"
+    }
+    #
+    # We can't use spaces in message keys, so replace it with a "_".
+    #
+    regsub -all " " $member_state "_" member_state
     
     switch $component {
         pretty_name {
-            set message_key_dict {
-                "approved"       #acs-kernel.member_state_approved#
-                "banned"         #acs-kernel.member_state_banned#
-                "deleted"        #acs-kernel.member_state_deleted#
-                "merged"         #acs-kernel.member_state_merged#
-                "needs approval" #acs-kernel.member_state_needs_approval#
-                "rejected"       #acs-kernel.member_state_rejected#
-            }
+            set message #acs-kernel.member_state_$member_state#
         }
         action {
-            if {$user_name eq ""} {
-                error "user_name must be specified and must be non-empty"
-            }
-            set message_key_dict [subst {
-                "approved"       "Approve $name"
-                "banned"         "Ban $name"
-                "deleted"        "Delete $name"
-                "merged"         "Merge $name"
-                "needs approval" "Require Admin Approval for $name"
-                "rejected"       "Reject $name"
-            }]
+            if {$user_name eq ""} { error "user_name must be specified and must be non-empty" }
+            set message #acs-kernel.member_state_action_$member_state#
         }
-        email_message {
-            if {$community_name eq ""} {
-                error "community_name must be specified and must be non-empty"
-            }
-            if {$url eq ""} {
-                error "url must be specified and must be non-empty"
-            }
-            set message_key_dict [subst {
-                "approved"       "Your $membership in $community_name has been approved. Please return to $url."
-                "banned"         "You have been banned from $community_name."
-                "deleted"        "Your $membership has been deleted from $community_name."
-                "merged"         "Your $membership at $community_name will be merged."
-                "needs approval" "Your $membership at $community_name is awaiting approval from an administrator."
-                "rejected"       "Your $membership at $community_name has been rejected."
-            }]
+        account_mail {
+            if {$site_name eq ""} { error "site_name must be specified and must be non-empty" }
+            if {$url eq ""} { error "url must be specified and must be non-empty" }
+            set message #member_state_account_mail_$member_state#                            
         }
+        community_mail {
+            if {$community_name eq ""} { error "community_name must be specified and must be non-empty" }
+            if {$url eq ""} { error "url must be specified and must be non-empty" }
+            set message #member_state_community_mail_$member_state#
+        }
+        default {
+            error "invalid component '$component'"
+        }
     }
-
-    if {[dict exists $message_key_dict $member_state]} {
-        set result [lang::util::localize [dict get $message_key_dict $member_state]]
-    } else {
-        set result ""
-    }
-    return $result
+    
+    return [lang::util::localize $message $locale]
 }