Commit 750dac4b authored by Robert Lyon's avatar Robert Lyon
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: default avatarRobert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 11534107)
parent fe8d6907

htdocs/lang/en.utf8/view.php

+3 −3
Original line number Diff line number Diff line
@@ -458,9 +458,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';

htdocs/lib/group.php

+1 −1
Original line number Diff line number Diff line
@@ -2551,7 +2551,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'

htdocs/lib/statistics.php

+1 −1
Original line number Diff line number Diff line
@@ -2655,7 +2655,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);

htdocs/lib/view.php

+1 −1
Original line number Diff line number Diff line
@@ -6072,7 +6072,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;

    }

htdocs/view/blocks.php

+1 −1
Original line number Diff line number Diff line
@@ -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);

    }