Commit b88a4569 authored by Dianne Tennent's avatar Dianne Tennent Committed by Kristina Hoeppner
Browse files

Bug 1946291: Change 'Pages and collections' to 'Portfolios' 

'P/pages and collections', 'P/pages or collections', 'P/pages /
collections', 'P/pages/collections': => 'P/portfolios'

'P/page or collection', 'P/page / collection', 'P/page/collection':
=> 'P/portfolio'

I have left a few instances of 'pages and/or collections' where it
seemed more appropriate to use this terminology.

I have updated affected Behat tests and bumped lang strings

Change-Id: I601027c65983f3757024c5db2673ffca2ebfa654
parent fdc247a1

htdocs/admin/groups/settings.php

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ $optionform = pieform(array( 
        'allowarchives' => array(

            'type'         => 'switchbox',

            'title'        => get_string('allowsarchives', 'group'),

            'description'  => get_string('allowsarchivesdescription1', 'group'),

            'description'  => get_string('allowsarchivesdescription2', 'group'),

            'defaultvalue' => $group_data->allowarchives,

            'disabled'     => !$group_data->submittableto,

        ),

htdocs/admin/site/views.php

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ define('SECTION_PAGE', 'siteviews'); 
require(dirname(dirname(dirname(__FILE__))) . '/init.php');

require_once(get_config('libroot') . 'view.php');



$title = get_string('siteviewscollections', 'admin');

$title = get_string('siteviewscollections1', 'admin');

define('TITLE', $title);



$offset = param_integer('offset', 0);

htdocs/auth/xmlrpc/lib.php

+1 −1
Original line number Diff line number Diff line
@@ -1139,7 +1139,7 @@ function auth_xmlrpc_mnet_view_access($mnetviewid, $mnetcollid) { 
        log_debug($e->getMessage());

    }



    // Now send them to the page/collection's real URL. If they were just granted access via Mnet, they'll see the page.

    // Now send them to the portfolio's real URL. If they were just granted access via Mnet, they'll see the page.

    // If not, maybe they'll see the page anyway if the user has specifically granted them access.

    if ($iscollection) {

        $goto = $coll->get_url(true);

htdocs/blocktype/groupviews/allsubmissions.json.php

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ else { 
        'id'         => 'allsubmitted_pagination',

        'datatable'  => 'allsubmissionlist',

        'jsonscript' => 'blocktype/groupviews/allsubmissions.json.php',

        'resultcounttext' => get_string('nviewsandcollections', 'view', $allsubmitted['count']),

        'resultcounttext' => get_string('nportfolios', 'view', $allsubmitted['count']),

    );

    PluginBlocktypeGroupViews::render_items($allsubmitted, 'blocktype:groupviews:allsubmissions.tpl', $configdata, $pagination);

}

htdocs/blocktype/groupviews/db/upgrade.php

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ function xmldb_blocktype_groupviews_upgrade($oldversion=0) { 
        $records = get_records_sql_array($sql, array());



        if ($records) {

            log_debug("Processing 'Group portfolios' blocks so they continue to display full list of pages/collections");

            log_debug("Processing 'Group portfolios' blocks so they continue to display full list of portfolios");

            $count = 0;

            $limit = 500;

            $total = count($records);
@@ -62,7 +62,7 @@ function xmldb_blocktype_groupviews_upgrade($oldversion=0) { 
        $defaultgrouppage = get_record_sql($sql, array());



        if ($defaultgrouppage) {

            log_debug("Processing default 'Group page' block to set the right shared pages/collections configurations");

            log_debug("Processing default 'Group page' block to set the right shared portfolio configurations");



            $configdata = unserialize($defaultgrouppage->configdata);

            $configdata['showsharedviews'] = 1;