// TODO: refactoring ongoing down from here...
function getWeekDayName($id) {
- $id = intval($id);
+ $id = (int) $id;
return $this->weekdayNames[$id];
}
$this->weekdayNames = $i18n_weekdays;
$this->weekdayShortNames = $i18n_weekdays_short;
- if (defined('SHOW_HOLIDAYS') && isTrue(SHOW_HOLIDAYS)) {
+// if (defined('SHOW_HOLIDAYS') && isTrue(SHOW_HOLIDAYS)) {
$this->holidays = $i18n_holidays;
- }
+// }
foreach ($i18n_key_words as $kword=>$value) {
$pos = strpos($kword, ".");
$this->monthNames = $i18n_months;
$this->weekdayNames = $i18n_weekdays;
$this->weekdayShortNames = $i18n_weekdays_short;
- if (defined('SHOW_HOLIDAYS') && isTrue(SHOW_HOLIDAYS)) {
+// if (defined('SHOW_HOLIDAYS') && isTrue(SHOW_HOLIDAYS)) {
$this->holidays = $i18n_holidays;
- }
+// }
foreach ($i18n_key_words as $kword=>$value) {
if (!$value) continue;
$pos = strpos($kword, ".");
$lang_prefs = explode(',', $acclang);
foreach ($lang_prefs as $lang_pref) {
$lang_pref_parts = explode(';', trim($lang_pref));
- if ($this->hasLang($lang_pref_parts[0])) {
- return $lang_pref_parts[0]; // Return full language designation, such as pt-BR.
+ $lang = $lang_pref_parts[0];
+ if ($this->hasLang($lang)) {
+ return $lang; // Return full language designation (if available), such as pt-BR.
}
- $lang_parts = explode('-', trim($lang_pref_parts[0]));
+
+ if (strlen($lang) <= 2)
+ continue; // Do not bother determining main language because we already have it.
+
+ $lang_parts = explode('-', trim($lang));
$lang_main = $lang_parts[0];
- if ($this->hasLang($lang_main)) {
- return $lang_main; // Return main language designation, such as pt.
+ if ($lang_main != $lang && $this->hasLang($lang_main)) {
+ return $lang_main; // Return main language designation, such as pt.
}
}
return false;