Minor - format code.

1.9.x
Julio Montoya 11 years ago
parent ead31e12f1
commit 1863e40709
  1. 8
      main/admin/sub_language.class.php
  2. 3
      main/inc/lib/internationalization.lib.php
  3. 5
      main/inc/lib/main_api.lib.php

@ -412,8 +412,9 @@ class SubLanguageManager
// select language - if case several languages match, get the last (more recent) one // select language - if case several languages match, get the last (more recent) one
$sql = "SELECT english_name $sql = "SELECT english_name
FROM " . $adminLanguagesTable . " FROM " . $adminLanguagesTable . "
WHERE isocode ='$isocode' WHERE
AND available = 1 isocode ='$isocode' AND
available = 1
ORDER BY id ORDER BY id
DESC LIMIT 1"; DESC LIMIT 1";
$res = Database::query($sql); $res = Database::query($sql);
@ -434,7 +435,9 @@ class SubLanguageManager
if (empty($preferences)) { if (empty($preferences)) {
return false; return false;
} }
$preferencesArray = explode(',', $preferences); $preferencesArray = explode(',', $preferences);
if (count($preferencesArray) > 0) { if (count($preferencesArray) > 0) {
foreach ($preferencesArray as $pref) { foreach ($preferencesArray as $pref) {
$s = strpos($pref, ';'); $s = strpos($pref, ';');
@ -444,6 +447,7 @@ class SubLanguageManager
$code = $pref; $code = $pref;
} }
$name = self::getLanguageFromIsocode($code); $name = self::getLanguageFromIsocode($code);
if ($name !== false) { if ($name !== false) {
return $name; return $name;
} }

@ -2499,7 +2499,8 @@ function api_strcasecmp($string1, $string2, $language = null, $encoding = null)
* @link http://php.net/manual/en/function.strcmp.php * @link http://php.net/manual/en/function.strcmp.php
* @link http://php.net/manual/en/collator.compare.php * @link http://php.net/manual/en/collator.compare.php
*/ */
function api_strcmp($string1, $string2, $language = null, $encoding = null) { function api_strcmp($string1, $string2, $language = null, $encoding = null)
{
if (INTL_INSTALLED) { if (INTL_INSTALLED) {
$collator = _api_get_collator($language); $collator = _api_get_collator($language);
if (is_object($collator)) { if (is_object($collator)) {

@ -3776,8 +3776,8 @@ function api_get_languages_combo($name = 'language', $chozen=true) {
* @param boolean Hide form if only one language available (defaults to false = show the box anyway) * @param boolean Hide form if only one language available (defaults to false = show the box anyway)
* @return void Display the box directly * @return void Display the box directly
*/ */
function api_display_language_form($hide_if_no_choice = false) { function api_display_language_form($hide_if_no_choice = false)
{
// Retrieve a complete list of all the languages. // Retrieve a complete list of all the languages.
$language_list = api_get_languages(); $language_list = api_get_languages();
if (count($language_list['name']) <= 1 && $hide_if_no_choice) { if (count($language_list['name']) <= 1 && $hide_if_no_choice) {
@ -3788,7 +3788,6 @@ function api_display_language_form($hide_if_no_choice = false) {
if (isset($_SESSION['user_language_choice'])) { if (isset($_SESSION['user_language_choice'])) {
$user_selected_language = $_SESSION['user_language_choice']; $user_selected_language = $_SESSION['user_language_choice'];
} }
if (empty($user_selected_language)) { if (empty($user_selected_language)) {
$user_selected_language = api_get_setting('platformLanguage'); $user_selected_language = api_get_setting('platformLanguage');
} }

Loading…
Cancel
Save