Feature #306 - The function api_validate_language() has been renamed as api_get_valid_language(). This new name is accurate, the function is not a validator, but a filter.

skala
Ivan Tcholakov 16 years ago
parent b58e3b7ce4
commit 7373315387
  1. 2
      main/admin/course_import.php
  2. 2
      main/admin/session_import.php
  3. 2
      main/inc/lib/internationalization.lib.php
  4. 8
      tests/main/inc/lib/internationalization.lib.test.php

@ -104,7 +104,7 @@ function save_data($courses) {
global $purification_option_for_usernames;
$msg = '';
foreach ($courses as $index => $course) {
$course_language = api_validate_language($course['Language']);
$course_language = api_get_valid_language($course['Language']);
$keys = define_course_keys($course['Code'], '', $_configuration['db_prefix']);
$user_table = Database::get_main_table(TABLE_MAIN_USER);
$sql = "SELECT user_id, ".(api_is_western_name_order(null, $course_language) ? "CONCAT(firstname,' ',lastname)" : "CONCAT(lastname,' ',firstname)")." AS name FROM $user_table WHERE username = '".Database::escape_string(UserManager::purify_username($course['Teacher'], $purification_option_for_usernames))."'";

@ -170,7 +170,7 @@ if ($_POST['formSent']) {
$course_code = trim(api_utf8_decode($courseNode->CourseCode));
$title = trim(api_utf8_decode($courseNode->CourseTitle));
$description = trim(api_utf8_decode($courseNode->CourseDescription));
$language = api_validate_language(api_utf8_decode($courseNode->CourseLanguage));
$language = api_get_valid_language(api_utf8_decode($courseNode->CourseLanguage));
$username = trim(api_utf8_decode($courseNode->CourseTeacher));
// Looking up for the teacher.

@ -247,7 +247,7 @@ function api_is_language_supported($language) {
* @param string $language The language identificator to be validated.
* @return string Returns the input language identificator. If the input language is not enabled, platform language is returned then.
*/
function api_validate_language($language) {
function api_get_valid_language($language) {
static $enabled_languages;
if (!isset($enabled_languages)) {
$enabled_languages_info = api_get_languages();

@ -1016,13 +1016,13 @@ class TestInternationalization extends UnitTestCase {
//var_dump($res9);
}
public function test_api_validate_language() {
public function test_api_get_valid_language() {
$language1 = ' '.strtoupper(api_get_interface_language()).' ';
$language2 = " \t ".strtoupper(api_get_setting('platformLanguage'))." \t ";
$language3 = 'xxxxxxxxxxxxxx';
$res1 = api_validate_language($language1);
$res2 = api_validate_language($language2);
$res3 = api_validate_language($language3);
$res1 = api_get_valid_language($language1);
$res2 = api_get_valid_language($language2);
$res3 = api_get_valid_language($language3);
$this->assertTrue(
$res1 === api_get_interface_language()
&& $res2 === api_get_setting('platformLanguage')

Loading…
Cancel
Save