moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 01:46:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'wip-MDL-50066-master' of git://github.com/marinaglancy/moodle

Browse source
This commit is contained in:
Andrew Nicols 2015-05-04 09:07:26 +08:00
commit b861cc96f7
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/tests/string_manager_standard_test.php
View file

@ -101,7 +101,8 @@ class core_string_manager_standard_testcase extends advanced_testcase {
$this->fail('String "'.$string.'" appearing in one of the lang/en/deprecated.txt files does not have correct syntax');
}
list($pluginttype, $pluginname) = core_component::normalize_component($matches[2]);
if ($matches[2] !== $pluginttype . '_' . $pluginname) {
$normcomponent = $pluginname ? ($pluginttype . '_' . $pluginname) : $pluginttype;
if ($matches[2] !== $normcomponent) {
$this->fail('String "'.$string.'" appearing in one of the lang/en/deprecated.txt files does not have normalised component name');
}
if (!$stringman->string_exists($matches[1], $matches[2])) {