Fixes #595 separating email address from email notification in language strings

diff --git a/languages/en.php b/languages/en.php
index da4e6a901266432582e86b00dffb1d57003282eb..3271967ede738a60250c0c75667670f28c9f33a8 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -436,6 +436,7 @@ $english = array(
  */
        'notifications:usersettings' => "Notification settings",
        'notifications:methods' => "Please specify which methods you want to permit.",
+       'notification:method:email' => 'Email',
 
        'notifications:usersettings:save:ok' => "Your notification settings were successfully saved.",
        'notifications:usersettings:save:fail' => "There was a problem saving your notification settings.",

diff --git a/mod/messages/languages/en.php b/mod/messages/languages/en.php
index 2002905b73cf1ce400c30a78c23fcc2edf975ef3..308c3d5194a5c18e86dd1cef72ff36178f2902d1 100644 (file)
--- a/mod/messages/languages/en.php
+++ b/mod/messages/languages/en.php
@@ -39,7 +39,7 @@ $english = array(
 
        'messages:new' => 'New message',
 
-       'notification:method:site' => 'Messages',
+       'notification:method:site' => 'Site',
 
        'messages:error' => 'There was a problem saving your message. Please try again.',
 

diff --git a/mod/notifications/languages/en.php b/mod/notifications/languages/en.php
index 586d668922dbb10c1fcbc37e69565a6e0ee87904..b29c9df2593fab85b27ab17d6a6ab13953561d23 100644 (file)
--- a/mod/notifications/languages/en.php
+++ b/mod/notifications/languages/en.php
@@ -13,7 +13,6 @@ $english = array(
 
        'notifications:subscriptions:changesettings' => 'Notifications',
        'notifications:subscriptions:changesettings:groups' => 'Group notifications',
-       'notification:method:email' => 'Email', 
 
        'notifications:subscriptions:title' => 'Notifications per user',
        'notifications:subscriptions:description' => 'To receive notifications from your friends (on an individual basis) when they create new content, find them below and select the notification method you would like to use.',

diff --git a/views/default/core/settings/account/notifications.php b/views/default/core/settings/account/notifications.php
index ae5fe40bb6a91a015dc5f292fbb722a06a011046..51292b2c9ff6e7f5c96c32b9279214e5e06b6ea6 100644 (file)
--- a/views/default/core/settings/account/notifications.php
+++ b/views/default/core/settings/account/notifications.php
@@ -24,7 +24,7 @@ $notification_settings = get_user_notification_settings(elgg_get_page_owner_guid
        foreach ($NOTIFICATION_HANDLERS as $k => $v) {
 ?>
                <tr>
-                       <td><?php echo elgg_echo($k); ?>: </td>
+                       <td><?php echo elgg_echo("notification:method:$k"); ?>: </td>
 
                        <td>
 <?php