diff options
| author | Cash Costello <cash.costello@gmail.com> | 2011-10-09 17:54:42 -0400 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2011-10-09 17:54:42 -0400 |
| commit | 86547ed43ca5a970bf118e4f3c88fb6733209c45 (patch) | |
| tree | f3ec1728b9c614b41c1e70f538e5b21fb9480d23 | |
| parent | fbfcfee331d768c20e86585c644628b1bf3f14b7 (diff) | |
| download | elgg-86547ed43ca5a970bf118e4f3c88fb6733209c45.tar.gz elgg-86547ed43ca5a970bf118e4f3c88fb6733209c45.tar.bz2 | |
Fixes #595 separating email address from email notification in language strings
| -rw-r--r-- | languages/en.php | 1 | ||||
| -rw-r--r-- | mod/messages/languages/en.php | 2 | ||||
| -rw-r--r-- | mod/notifications/languages/en.php | 1 | ||||
| -rw-r--r-- | views/default/core/settings/account/notifications.php | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/languages/en.php b/languages/en.php index da4e6a901..3271967ed 100644 --- 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 2002905b7..308c3d519 100644 --- 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 586d66892..b29c9df25 100644 --- 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 ae5fe40bb..51292b2c9 100644 --- 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 |