Commit a32894cc authored by Cecilia Vela Gurovic's avatar Cecilia Vela Gurovic
Browse files

Bug 1714830: lang strings in group portfolios blocktype 

also fixed behat tests
and comments

behatnotneeded

Change-Id: Ic56c1ccf652f00312c40e4093ec73666096ed80a
parent 16e75896

htdocs/blocktype/groupviews/db/upgrade.php

+1 −1
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 pages' 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 pages/collections");

            $count = 0;

            $limit = 500;

            $total = count($records);

htdocs/blocktype/groupviews/lang/en.utf8/blocktype.groupviews.php

+5 −5
Original line number Diff line number Diff line
@@ -12,10 +12,10 @@ 


defined('INTERNAL') || die();



$string['title'] = 'Group pages';

$string['description'] = 'Display the pages related to the group';

$string['displaygroupviews'] = 'Display group pages';

$string['displaygroupviewsdesc'] = 'Group pages - portfolios created in the group';

$string['title1'] = 'Group portfolios';

$string['description1'] = 'Display the pages and collections related to this group';

$string['displaygroupviews1'] = 'Display group pages and collections';

$string['displaygroupviewsdesc1'] = 'Show a list of pages and collections created in this group.';

$string['displaysharedviews'] = 'Display shared pages';

$string['displaysharedviewsdesc1'] = 'Show a list of pages shared with this group (excluding pages in collections).';

$string['displaysharedcollections'] = 'Display shared collections';
@@ -28,7 +28,7 @@ $string['itemstoshowdesc'] = 'The number of pages or collections shown for each 
$string['showbyanybody'] = 'By anybody';

$string['showbygroupmembers'] = 'By members of this group';

$string['shownone'] = 'None';

$string['sortgroupviewstitle'] = 'Sort group pages by';

$string['sortgroupviewstitle1'] = 'Sort group pages and collections by';

$string['sortsharedviewstitle'] = 'Sort shared pages and collections by';

$string['sortsubmittedtitle'] = 'Sort submitted pages and collections by';

$string['sortviewsbyalphabetical'] = 'Alphabetical';

htdocs/blocktype/groupviews/lib.php

+6 −6
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@ class PluginBlocktypeGroupViews extends MaharaCoreBlocktype { 
    const SORTBY_TIMESUBMITTED = 2;



    public static function get_title() {

        return get_string('title', 'blocktype.groupviews');

        return get_string('title1', 'blocktype.groupviews');

    }



    public static function get_description() {

        return get_string('description', 'blocktype.groupviews');

        return get_string('description1', 'blocktype.groupviews');

    }



    public static function single_only() {
@@ -197,8 +197,8 @@ class PluginBlocktypeGroupViews extends MaharaCoreBlocktype { 
        return array(

            'showgroupviews' => array(

                'type' => 'select',

                'description' => get_string('displaygroupviewsdesc', 'blocktype.groupviews'),

                'title' => get_string('displaygroupviews', 'blocktype.groupviews'),

                'description' => get_string('displaygroupviewsdesc1', 'blocktype.groupviews'),

                'title' => get_string('displaygroupviews1', 'blocktype.groupviews'),

                'options' => array(

                    1 => get_string('yes'),

                    0 => get_string('no'),
@@ -207,7 +207,7 @@ class PluginBlocktypeGroupViews extends MaharaCoreBlocktype { 
            ),

            'sortgroupviewsby' => array(

                'type' => 'select',

                'title' => get_string('sortgroupviewstitle', 'blocktype.groupviews'),

                'title' => get_string('sortgroupviewstitle1', 'blocktype.groupviews'),

                'options' => array(

                    PluginBlocktypeGroupViews::SORTBY_TITLE => get_string('sortviewsbyalphabetical', 'blocktype.groupviews'),

                    PluginBlocktypeGroupViews::SORTBY_LASTUPDATE => get_string('sortviewsbylastupdate', 'blocktype.groupviews'),
@@ -455,7 +455,7 @@ class PluginBlocktypeGroupViews extends MaharaCoreBlocktype { 
    }



    public static function get_instance_title() {

        return get_string('title', 'blocktype.groupviews');

        return get_string('title1', 'blocktype.groupviews');

    }



    /**

htdocs/lang/en.utf8/statistics.php

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ $string['blocktype_gallery'] = 'Block: Image gallery'; 
$string['blocktype_googleapps'] = 'Block: Google Apps';

$string['blocktype_groupinfo'] = 'Block: Group info';

$string['blocktype_groupmembers'] = 'Block: Group members';

$string['blocktype_groupviews'] = 'Block: Group pages';

$string['blocktype_groupviews'] = 'Block: Group portfolios';

$string['blocktype_html'] = 'Block: Some HTML';

$string['blocktype_pdf'] = 'Block: PDF';

$string['blocktype_image'] = 'Block: Image';
@@ -147,7 +147,7 @@ $string['plugin_blocktype_gallery_version'] = 'Block type plugin Image gallery v 
$string['plugin_blocktype_googleapps_version'] = 'Block type plugin Google Apps version';

$string['plugin_blocktype_groupinfo_version'] = 'Block type plugin Group info version';

$string['plugin_blocktype_groupmembers_version'] = 'Block type plugin Group members version';

$string['plugin_blocktype_groupviews_version'] = 'Block type plugin Group pages version';

$string['plugin_blocktype_groupviews_version'] = 'Block type plugin Group portfolios version';

$string['plugin_blocktype_html_version'] = 'Block type plugin Some HTML version';

$string['plugin_blocktype_html_version'] = 'Block type plugin PDF version';

$string['plugin_blocktype_image_version'] = 'Block type plugin Image version';

htdocs/lang/en.utf8/view.php

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ $string['templateportfoliodescription'] = 'Set up the default layout for the pag 


// my views

$string['artefacts'] = 'Artefacts';

$string['groupviews'] = 'Group pages';

$string['groupviews'] = 'Group pages and collections';

$string['institutionviews'] = 'Institution pages';

$string['institutionviewscollections'] = 'Institution pages and collections';

$string['reallyaddaccesstoemptyview'] = 'Your page contains no blocks. Do you really want to give these users access to the page?';