Skip to content

Commit

Permalink
MDL-21696 Getting rid of legacy language customization stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
mudrd8mz committed Aug 24, 2010
1 parent 6055f89 commit 2134a91
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 33 deletions.
3 changes: 0 additions & 3 deletions admin/lang.php

This file was deleted.

5 changes: 1 addition & 4 deletions admin/settings/language.php
Expand Up @@ -2,9 +2,7 @@

// This file defines settingpages and externalpages under the "appearance" category

if ($hassiteconfig
or has_capability('moodle/site:langeditmaster', $systemcontext)
or has_capability('moodle/site:langeditlocal', $systemcontext)) { // speedup for non-admins, add all caps used on this page
if ($hassiteconfig) {

// "languageandlocation" settingpage
$temp = new admin_settingpage('langsettings', get_string('languagesettings', 'admin'));
Expand All @@ -19,7 +17,6 @@

$ADMIN->add('language', $temp);

//$ADMIN->add('language', new admin_externalpage('langedit', get_string('langedit', 'admin'), "$CFG->wwwroot/$CFG->admin/lang.php", array('moodle/site:langeditmaster', 'moodle/site:langeditlocal') ));
$ADMIN->add('language', new admin_externalpage('langimport', get_string('langpacks', 'admin'), "$CFG->wwwroot/$CFG->admin/langimport.php"));

// Hidden multilang upgrade page.
Expand Down
2 changes: 0 additions & 2 deletions lang/en/error.php
Expand Up @@ -54,7 +54,6 @@
$string['cannotcreatetempdir'] = 'Cannot create temp directory';
$string['cannotcreateuploaddir'] = 'Cannot create upload folder. The site administrator needs to fix the file permissions.';
$string['cannotcustomisefiltersblockuser'] = 'You cannot customise filters settings in user or block contexts.';
$string['cannotcustomizelocallang'] = 'You do not have permission to customize the strings translation. This permission is controlled by the capability "moodle/site:langeditlocal". Set this capability to allow you to edit local language packages in case you want to modify translations for your site.';
$string['cannotdeletebackupids'] = 'Couldn\'t delete previous backup ids';
$string['cannotdeletecategorycourse'] = 'Course \'{$a}\' failed to be deleted.';
$string['cannotdeletecategoryquestions'] = 'Could not delete questions from category \'{$a}\'';
Expand All @@ -71,7 +70,6 @@
$string['cannotdownloadzipfile'] = 'Cannot download ZIP file';
$string['cannoteditcomment'] = 'This comment is not yours to edit!';
$string['cannoteditcommentexpired'] = 'You can\'t edit this. The time has expired!';
$string['cannoteditmasterlang'] = 'You do not have permission to edit the master language package. This permission is controlled by the capability "moodle/site:langeditmaster". Set this capability to allow you to edit master language packages in case you are the maintainer of a package.';
$string['cannoteditpostorblog'] = 'You cannot post or edit blogs';
$string['cannoteditsiteform'] = 'You cannot edit the site course using this form';
$string['cannotedityourprofile'] = 'Sorry, you cannot edit own profile';
Expand Down
2 changes: 0 additions & 2 deletions lang/en/role.php
Expand Up @@ -322,8 +322,6 @@
$string['site:doanything'] = 'Allowed to do everything';
$string['site:doclinks'] = 'Show links to offsite docs';
$string['site:import'] = 'Import other courses into a course';
$string['site:langeditlocal'] = 'Customize local translation';
$string['site:langeditmaster'] = 'Edit master language packages';
$string['site:manageblocks'] = 'Manage blocks on a page';
$string['site:mnetloginfromremote'] = 'Login from a remote Moodle';
$string['site:mnetlogintoremote'] = 'Roam to a remote Moodle';
Expand Down
21 changes: 0 additions & 21 deletions lib/db/access.php
Expand Up @@ -413,27 +413,6 @@
)
),

'moodle/site:langeditmaster' => array(

'riskbitmask' => RISK_CONFIG | RISK_XSS,

'captype' => 'write',
'contextlevel' => CONTEXT_SYSTEM,
'archetypes' => array(
)
),

'moodle/site:langeditlocal' => array(

'riskbitmask' => RISK_CONFIG | RISK_XSS,

'captype' => 'write',
'contextlevel' => CONTEXT_SYSTEM,
'archetypes' => array(
'manager' => CAP_ALLOW
)
),

// Permission to manage filter setting overrides in subcontexts.
'moodle/filter:manage' => array(

Expand Down
2 changes: 1 addition & 1 deletion version.php
Expand Up @@ -6,7 +6,7 @@
// This is compared against the values stored in the database to determine
// whether upgrades should be performed (see lib/db/*.php)

$version = 2010080901; // YYYYMMDD = date of the last version bump
$version = 2010082500; // YYYYMMDD = date of the last version bump
// XX = daily increments

$release = '2.0 Preview 4+ (Build: 20100824)'; // Human-friendly version name
Expand Down

0 comments on commit 2134a91

Please sign in to comment.