moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 17:36:38 +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

6
lib/classes/string_manager_standard.php
View file

@ -256,7 +256,8 @@ class core_string_manager_standard implements core_string_manager {
public function string_deprecated($identifier, $component) { public function string_deprecated($identifier, $component) {
$deprecated = $this->load_deprecated_strings(); $deprecated = $this->load_deprecated_strings();
list($plugintype, $pluginname) = core_component::normalize_component($component); list($plugintype, $pluginname) = core_component::normalize_component($component);
return isset($deprecated[$identifier . ',' . $plugintype . '_' . $pluginname]); $normcomponent = $pluginname ? ($plugintype . '_' . $pluginname) : $plugintype;
return isset($deprecated[$identifier . ',' . $normcomponent]);
} }
/** /**
@ -383,7 +384,8 @@ class core_string_manager_standard implements core_string_manager {
// Display a debugging message if sting exists but was deprecated. // Display a debugging message if sting exists but was deprecated.
if ($this->string_deprecated($identifier, $component)) { if ($this->string_deprecated($identifier, $component)) {
list($plugintype, $pluginname) = core_component::normalize_component($component); list($plugintype, $pluginname) = core_component::normalize_component($component);
debugging("String [{$identifier},{$plugintype}_{$pluginname}] is deprecated. ". $normcomponent = $pluginname ? ($plugintype . '_' . $pluginname) : $plugintype;
debugging("String [{$identifier},{$normcomponent}] is deprecated. ".
'Either you should no longer be using that string, or the string has been incorrectly deprecated, in which case you should report this as a bug. '. 'Either you should no longer be using that string, or the string has been incorrectly deprecated, in which case you should report this as a bug. '.
'Please refer to https://docs.moodle.org/dev/String_deprecation', DEBUG_DEVELOPER); 'Please refer to https://docs.moodle.org/dev/String_deprecation', DEBUG_DEVELOPER);
} }

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'); $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]); 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'); $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])) { if (!$stringman->string_exists($matches[1], $matches[2])) {