diff options
| -rw-r--r-- | languages/en.php | 3 | ||||
| -rw-r--r-- | mod/riverdashboard/languages/en.php | 3 | ||||
| -rw-r--r-- | mod/riverdashboard/views/default/riverdashboard/welcome.php | 2 | ||||
| -rw-r--r-- | views/default/basic_elements/welcome.php | 2 | ||||
| -rw-r--r-- | views/default/welcome/logged_in.php | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/languages/en.php b/languages/en.php index 84c12819f..f2525a74b 100644 --- a/languages/en.php +++ b/languages/en.php @@ -808,7 +808,8 @@ Alternatively, you can enter your database settings below and we will try and do * Welcome
*/
- 'welcome' => "Welcome",
+ 'welcome' => "Welcome", + 'welcome:user' => 'Welcome %s',
'welcome_message' => "Welcome to this Elgg installation.",
/**
diff --git a/mod/riverdashboard/languages/en.php b/mod/riverdashboard/languages/en.php index 5c601d31b..a00624414 100644 --- a/mod/riverdashboard/languages/en.php +++ b/mod/riverdashboard/languages/en.php @@ -6,8 +6,7 @@ 'filter' => 'Filter',
'riverdashboard:useasdashboard' => "Replace the default dashboard with this activity river?",
'activity' => 'Activity', - 'riverdashboard:recentmembers' => 'Recent members', - 'riverdashboard:welcome:user' => 'Welcome %s',
+ 'riverdashboard:recentmembers' => 'Recent members',
/**
* Site messages
diff --git a/mod/riverdashboard/views/default/riverdashboard/welcome.php b/mod/riverdashboard/views/default/riverdashboard/welcome.php index 7fb2bf9e1..264d9e3ba 100644 --- a/mod/riverdashboard/views/default/riverdashboard/welcome.php +++ b/mod/riverdashboard/views/default/riverdashboard/welcome.php @@ -13,5 +13,5 @@ ?>
<div id="content_area_user_title">
-<h2><?php echo sprintf(elgg_echo('riverdashboard:welcome:user'), $_SESSION['user']->name); ?></h2>
+<h2><?php echo sprintf(elgg_echo('welcome:user'), $_SESSION['user']->name); ?></h2>
</div>
\ No newline at end of file diff --git a/views/default/basic_elements/welcome.php b/views/default/basic_elements/welcome.php index 28041d5b2..bbcc6438e 100644 --- a/views/default/basic_elements/welcome.php +++ b/views/default/basic_elements/welcome.php @@ -15,5 +15,5 @@ ?>
-<p>Welcome <?php echo $user; ?></p>
+<p><?php echo sprintf(elgg_echo('welcome:user'), $user); ?></p>
<p><a href="<?php echo $vars['url']; ?>action/logout">[logout]</a></p>
\ No newline at end of file diff --git a/views/default/welcome/logged_in.php b/views/default/welcome/logged_in.php index 05d5be104..c44aa4b64 100644 --- a/views/default/welcome/logged_in.php +++ b/views/default/welcome/logged_in.php @@ -16,7 +16,7 @@ <?php //add various views to area1 - $area1 = "<h2>" . sprintf(elgg_echo("welcome"),$vars['user']->name) . "</h2>"; + $area1 = "<h2>" . sprintf(elgg_echo("welcome:user"),$vars['user']->name) . "</h2>"; $area1 .= "<p>" . elgg_echo("welcome_message") . "</p><br />"; $url = $vars['url'] . "action/logout"; $area1 .= "<a href=" . $url . ">" . elgg_echo('logout') . "</a>"; |