diff --git a/~dev_rating/application/classes/Controller/Environment/Student.php b/~dev_rating/application/classes/Controller/Environment/Student.php index e432785263a089aef07de8d80ae9591c4223bd4b..a2d662ac638f40fa5df7c48d306edb17a78494c9 100644 --- a/~dev_rating/application/classes/Controller/Environment/Student.php +++ b/~dev_rating/application/classes/Controller/Environment/Student.php @@ -15,9 +15,5 @@ class Controller_Environment_Student extends Controller_Environment_User parent::before(); $this->user->checkAccess(User::RIGHTS_STUDENT); - - // todo: remove it, english only - $uniDegree = $this->user->Degree; - $this->user->Degree = Model_Grades::getDegreeTitle($uniDegree); } } \ No newline at end of file diff --git a/~dev_rating/application/classes/Model/Grades.php b/~dev_rating/application/classes/Model/Grades.php index eadae6ec25fc03164fcd39f696cfe6434d5df3ec..c46125cc3ee8c2ffed60dfe9da89f74c03f67959 100644 --- a/~dev_rating/application/classes/Model/Grades.php +++ b/~dev_rating/application/classes/Model/Grades.php @@ -22,10 +22,6 @@ class Model_Grades extends Model return $list; } - public static function getDegreeTitle($degree) { - return RusLang::tr($degree); - } - public static function getDegreeType($degree) { switch ($degree) { case 'Бакалавр': @@ -52,7 +48,7 @@ class Model_Grades extends Model $i++; } - $list[$i]['Title'] = self::getDegreeTitle($row['Degree']); + $list[$i]['Title'] = RusLang::tr($row['Degree']); $list[$i]['Grades'][] = $row; }