Commit 11534107 authored by Robert Lyon's avatar Robert Lyon Committed by Cecilia Vela Gurovic
Browse files

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



There are two $string['portfolio'] strings one needs to be uppercase

behatnotneeded

Change-Id: Ia5e0390e719099408105c34810dae2fed35ad9b5
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent 83c1aaa5
...@@ -471,9 +471,9 @@ $string['mostcomments1'] = 'Most comments'; ...@@ -471,9 +471,9 @@ $string['mostcomments1'] = 'Most comments';
// View types // View types
$string['dashboard'] = 'Dashboard'; $string['dashboard'] = 'Dashboard';
$string['profile'] = 'Profile'; $string['Profile'] = 'Profile';
$string['portfolio'] = 'Portfolio'; $string['Portfolio'] = 'Portfolio';
$string['grouphomepage'] = 'Group homepage'; $string['Grouphomepage'] = 'Group homepage';
$string['grouphomepagedescription'] = 'The group homepage contains the content that appears on the "About" tab for this group'; $string['grouphomepagedescription'] = 'The group homepage contains the content that appears on the "About" tab for this group';
$string['pageaccessrules'] = 'Page access rules'; $string['pageaccessrules'] = 'Page access rules';
......
...@@ -2570,7 +2570,7 @@ function install_system_grouphomepage_view() { ...@@ -2570,7 +2570,7 @@ function install_system_grouphomepage_view() {
'template' => View::SITE_TEMPLATE, 'template' => View::SITE_TEMPLATE,
'numrows' => 1, 'numrows' => 1,
'columnsperrow' => array((object)array('row' => 1, 'columns' => 1)), 'columnsperrow' => array((object)array('row' => 1, 'columns' => 1)),
'title' => get_string('grouphomepage', 'view'), 'title' => get_string('Grouphomepage', 'view'),
)); ));
$view->set_access(array(array( $view->set_access(array(array(
'type' => 'loggedin' 'type' => 'loggedin'
......
...@@ -2680,7 +2680,7 @@ function view_type_graph($type = null) { ...@@ -2680,7 +2680,7 @@ function view_type_graph($type = null) {
if (count($viewtypes) > 1) { if (count($viewtypes) > 1) {
$dataarray = array(); $dataarray = array();
foreach ($viewtypes as &$t) { foreach ($viewtypes as &$t) {
$dataarray[get_string($t->type, 'view')] = $t->views; $dataarray[get_string(ucfirst($t->type), 'view')] = $t->views;
} }
arsort($dataarray); arsort($dataarray);
......
...@@ -6437,7 +6437,7 @@ class View { ...@@ -6437,7 +6437,7 @@ class View {
return get_string('dashboardviewtitle', 'view'); return get_string('dashboardviewtitle', 'view');
} }
if ($this->type == 'grouphomepage') { if ($this->type == 'grouphomepage') {
return get_string('grouphomepage', 'view'); return get_string('Grouphomepage', 'view');
} }
return $this->title; return $this->title;
} }
......
...@@ -86,7 +86,7 @@ else if ($view->get('type') == 'dashboard') { ...@@ -86,7 +86,7 @@ else if ($view->get('type') == 'dashboard') {
define('TITLE', $title ); define('TITLE', $title );
} }
else if ($view->get('type') == 'grouphomepage') { else if ($view->get('type') == 'grouphomepage') {
$title = get_string('grouphomepage', 'view'); $title = get_string('Grouphomepage', 'view');
if ($view->get('template') != View::SITE_TEMPLATE) { if ($view->get('template') != View::SITE_TEMPLATE) {
$groupurl = group_homepage_url(get_group_by_id($view->get('group'), true), false); $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