Merge branch 'MDL-33084_strict_calc' of git://github.com/andyjdavis/moodle

This commit is contained in:
Sam Hemelryk
2012-05-28 14:07:59 +12:00
+2 -2
View File
@@ -115,7 +115,7 @@ class calc_formula {
* @param string $formula
* @return string localised formula
*/
function localize($formula) {
public static function localize($formula) {
$formula = str_replace('.', '$', $formula); // temp placeholder
$formula = str_replace(',', get_string('listsep', 'langconfig'), $formula);
$formula = str_replace('$', get_string('decsep', 'langconfig'), $formula);
@@ -127,7 +127,7 @@ class calc_formula {
* @param string $formula localised formula
* @return string
*/
function unlocalize($formula) {
public static function unlocalize($formula) {
$formula = str_replace(get_string('decsep', 'langconfig'), '$', $formula);
$formula = str_replace(get_string('listsep', 'langconfig'), ',', $formula);
$formula = str_replace('$', '.', $formula); // temp placeholder