Commit 92a6e5d5 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Bug 1820927: language string clash in view.php lang file"

parents 03ace2c0 11534107
......@@ -471,9 +471,9 @@ $string['mostcomments1'] = 'Most comments';
// View types
$string['dashboard'] = 'Dashboard';
$string['profile'] = 'Profile';
$string['portfolio'] = 'Portfolio';
$string['grouphomepage'] = 'Group homepage';
$string['Profile'] = 'Profile';
$string['Portfolio'] = 'Portfolio';
$string['Grouphomepage'] = 'Group homepage';
$string['grouphomepagedescription'] = 'The group homepage contains the content that appears on the "About" tab for this group';
$string['pageaccessrules'] = 'Page access rules';
......
......@@ -2570,7 +2570,7 @@ function install_system_grouphomepage_view() {
'template' => View::SITE_TEMPLATE,
'numrows' => 1,
'columnsperrow' => array((object)array('row' => 1, 'columns' => 1)),
'title' => get_string('grouphomepage', 'view'),
'title' => get_string('Grouphomepage', 'view'),
));
$view->set_access(array(array(
'type' => 'loggedin'
......
......@@ -2680,7 +2680,7 @@ function view_type_graph($type = null) {
if (count($viewtypes) > 1) {
$dataarray = array();
foreach ($viewtypes as &$t) {
$dataarray[get_string($t->type, 'view')] = $t->views;
$dataarray[get_string(ucfirst($t->type), 'view')] = $t->views;
}
arsort($dataarray);
......
......@@ -6437,7 +6437,7 @@ class View {
return get_string('dashboardviewtitle', 'view');
}
if ($this->type == 'grouphomepage') {
return get_string('grouphomepage', 'view');
return get_string('Grouphomepage', 'view');
}
return $this->title;
}
......
......@@ -86,7 +86,7 @@ else if ($view->get('type') == 'dashboard') {
define('TITLE', $title );
}
else if ($view->get('type') == 'grouphomepage') {
$title = get_string('grouphomepage', 'view');
$title = get_string('Grouphomepage', 'view');
if ($view->get('template') != View::SITE_TEMPLATE) {
$groupurl = group_homepage_url(get_group_by_id($view->get('group'), true), false);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment