Skip to content
Snippets Groups Projects
Commit 89155ff0 authored by Satish's avatar Satish
Browse files

Fixes #711 - Moscow time zone is UTC+3 not UTC+4

parent 19abd049
No related branches found
No related tags found
No related merge requests found
Showing
with 48 additions and 16 deletions
......@@ -137,9 +137,9 @@ $languageStrings = array(
'Asia/Kuwait' => '(UTC+03:00) Kuwait, Riyadh',
'Asia/Baghdad' => '(UTC+03:00) Baghdad',
'Africa/Nairobi' => '(UTC+03:00) Nairobi',
'Europe/Moscow' => '(UTC+03:00) Moscow, Volgograd',
'Asia/Tehran' => '(UTC+03:30) Tehran',
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi',
'Europe/Moscow' => '(UTC+04:00) Moscow, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku',
'Asia/Yerevan' => '(UTC+04:00) Yerevan',
......
......@@ -106,6 +106,38 @@ if (defined('VTIGER_UPGRADE')) {
$em->registerHandler('vtiger.entity.aftersave', 'modules/Vtiger/handlers/FollowRecordHandler.php', 'FollowRecordHandler');
//END::Follow & unfollow features
//START::Reordering Timezones
$fieldName = 'time_zone';
$userModuleModel = Vtiger_Module_Model::getInstance('Users');
$fieldModel = Vtiger_Field_Model::getInstance($fieldName, $userModuleModel);
if ($fieldModel) {
$picklistValues = $fieldModel->getPicklistValues();
$utcTimezones = preg_grep('/\(UTC\)/', $picklistValues);
asort($utcTimezones);
$utcPlusTimezones = preg_grep('/\(UTC\+/', $picklistValues);
asort($utcPlusTimezones);
$utcMinusTimezones = preg_grep('/\(UTC\-/', $picklistValues);
arsort($utcMinusTimezones);
$timeZones = array_merge($utcMinusTimezones, $utcTimezones, $utcPlusTimezones);
$originalPicklistValues = array_flip(Vtiger_Util_Helper::getPickListValues($fieldName));
$orderedPicklists = array();
$i = 0;
foreach ($timeZones as $timeZone => $value) {
$orderedPicklists[$originalPicklistValues[$timeZone]] = $i++;
}
ksort($orderedPicklists);
$moduleModel = new Settings_Picklist_Module_Model();
$moduleModel->updateSequence($fieldName, $orderedPicklists);
echo '<br>Succecssfully reordered timezones<br>';
}
//END::Reordering Timezones
//Update existing package modules
Install_Utils_Model::installModules();
}
\ No newline at end of file
......@@ -141,7 +141,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi',
'Asia/Tehran' => '(UTC+03:30) Tehran',
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi',
'Europe/Moscow' => '(UTC+04:00) Moscow, Volgograd',
'Europe/Moscow' => '(UTC+03:00) Moscow, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku',
'Asia/Yerevan' => '(UTC+04:00) Yerevan',
......
......@@ -130,7 +130,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi' ,
'Asia/Tehran' => '(UTC+03:30) Tehran' ,
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi' ,
'Europe/Moscow' => '(UTC+04:00) Moscou, Volgograd',
'Europe/Moscow' => '(UTC+03:00) Moscou, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku' ,
'Asia/Yerevan' => '(UTC+04:00) Yerevan' ,
......
......@@ -129,7 +129,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi' ,
'Asia/Tehran' => '(UTC+03:30) Tehran' ,
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi' ,
'Europe/Moscow' => '(UTC+04:00) Moscow, Volgograd',
'Europe/Moscow' => '(UTC+03:00) Moscow, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku' ,
'Asia/Yerevan' => '(UTC+04:00) Yerevan' ,
......
......@@ -130,7 +130,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi' ,
'Asia/Tehran' => '(UTC+03:30) Teheran' ,
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi' ,
'Europe/Moscow' => '(UTC+04:00) Moskau, Wolgograd',
'Europe/Moscow' => '(UTC+03:00) Moskau, Wolgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muskat',
'Asia/Baku' => '(UTC+04:00) Baku' ,
'Asia/Yerevan' => '(UTC+04:00) Yerevan' ,
......
......@@ -130,7 +130,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi' ,
'Asia/Tehran' => '(UTC+03:30) Tehran' ,
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi' ,
'Europe/Moscow' => '(UTC+04:00) Moscow, Volgograd',
'Europe/Moscow' => '(UTC+03:00) Moscow, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku' ,
'Asia/Yerevan' => '(UTC+04:00) Yerevan' ,
......
......@@ -130,7 +130,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi' ,
'Asia/Tehran' => '(UTC+03:30) Tehran' ,
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi' ,
'Europe/Moscow' => '(UTC+04:00) Moscow, Volgograd',
'Europe/Moscow' => '(UTC+03:00) Moscow, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku' ,
'Asia/Yerevan' => '(UTC+04:00) Yerevan' ,
......
......@@ -130,7 +130,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi' ,
'Asia/Tehran' => '(UTC+03:30) Tehran' ,
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi' ,
'Europe/Moscow' => '(UTC+04:00) Moscow, Volgograd',
'Europe/Moscow' => '(UTC+03:00) Moscow, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku' ,
'Asia/Yerevan' => '(UTC+04:00) Yerevan' ,
......
......@@ -130,7 +130,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi' ,
'Asia/Tehran' => '(UTC+03:30) Tehran' ,
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi' ,
'Europe/Moscow' => '(UTC+04:00) Moscow, Volgograd',
'Europe/Moscow' => '(UTC+03:00) Moscow, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku' ,
'Asia/Yerevan' => '(UTC+04:00) Yerevan' ,
......
......@@ -130,7 +130,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi' ,
'Asia/Tehran' => '(UTC+03:30) Tehran' ,
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi' ,
'Europe/Moscow' => '(UTC+04:00) Moscow, Volgograd',
'Europe/Moscow' => '(UTC+03:00) Moscow, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku' ,
'Asia/Yerevan' => '(UTC+04:00) Yerevan' ,
......
......@@ -137,7 +137,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi',
'Asia/Tehran' => '(UTC+03:30) Tehran',
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi',
'Europe/Moscow' => '(UTC+04:00) Moscow, Volgograd',
'Europe/Moscow' => '(UTC+03:00) Moscow, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku',
'Asia/Yerevan' => '(UTC+04:00) Yerevan',
......
......@@ -130,7 +130,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi' ,
'Asia/Tehran' => '(UTC+03:30) Tehran' ,
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi' ,
'Europe/Moscow' => '(UTC+04:00) Moscow, Volgograd',
'Europe/Moscow' => '(UTC+03:00) Moscow, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku' ,
'Asia/Yerevan' => '(UTC+04:00) Yerevan' ,
......
......@@ -130,7 +130,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi' ,
'Asia/Tehran' => '(UTC+03:30) Tehran' ,
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi' ,
'Europe/Moscow' => '(UTC+04:00) Москва, Волгоград',
'Europe/Moscow' => '(UTC+03:00) Москва, Волгоград',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku' ,
'Asia/Yerevan' => '(UTC+04:00) Yerevan' ,
......
......@@ -150,7 +150,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi',
'Asia/Tehran' => '(UTC+03:30) Tehran',
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi',
'Europe/Moscow' => '(UTC+04:00) Moscow, Volgograd',
'Europe/Moscow' => '(UTC+03:00) Moscow, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku',
'Asia/Yerevan' => '(UTC+04:00) Yerevan',
......
......@@ -141,7 +141,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi',
'Asia/Tehran' => '(UTC+03:30) Tehran',
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi',
'Europe/Moscow' => '(UTC+04:00) Moscow, Volgograd',
'Europe/Moscow' => '(UTC+03:00) Moscow, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku',
'Asia/Yerevan' => '(UTC+04:00) Yerevan',
......
......@@ -130,7 +130,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi' ,
'Asia/Tehran' => '(UTC+03:30) Tehran' ,
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi' ,
'Europe/Moscow' => '(UTC+04:00) Moscow, Volgograd',
'Europe/Moscow' => '(UTC+03:00) Moscow, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku' ,
'Asia/Yerevan' => '(UTC+04:00) Yerevan' ,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment