diff --git a/languages/en_us/Users.php b/languages/en_us/Users.php index c55af466b60e23fed7b626013fbf6033315489de..5e58d9b9ea2ff8404e798b335057b8b8a2877764 100644 --- a/languages/en_us/Users.php +++ b/languages/en_us/Users.php @@ -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', diff --git a/languages/en_us/Vtiger.php b/languages/en_us/Vtiger.php index 73eab329f7116769bd78f286e4fc291e05013274..42acf45725dcccb740be575b203f21ff9a9172a0 100644 --- a/languages/en_us/Vtiger.php +++ b/languages/en_us/Vtiger.php @@ -1935,4 +1935,5 @@ $jsLanguageStrings = array( 'JS_DEFAULT_DASHBOARD_TOOLTIP' => 'Make this dashboard as default by reordering it as the first tab!', 'JS_SET_DEFAULT_TAB' => 'is set as your default dashboard', 'JS_PASSWORD_MISMATCH_ERROR' => 'Please re-enter passwords. The "new password" and "confirm password" values do not match.', + 'LBL_LIST_DELETE_CONFIRMATION' => 'Are you sure you want to delete?', ); \ No newline at end of file diff --git a/layouts/v7/modules/CustomView/resources/CustomView.js b/layouts/v7/modules/CustomView/resources/CustomView.js index 8f6b68d3ea197e42fac061b32b5a5c5190bae012..8e719919935f9c5ee52396ea7935348cd495d7b7 100644 --- a/layouts/v7/modules/CustomView/resources/CustomView.js +++ b/layouts/v7/modules/CustomView/resources/CustomView.js @@ -288,7 +288,7 @@ jQuery.Class("Vtiger_CustomView_Js",{ jQuery(document).on('post.DeleteFilter.click',function(e,params){ var target = jQuery(e.target); - app.helper.showConfirmationBox({'message': app.vtranslate('LBL_DELETE_CONFIRMATION')}).then( + app.helper.showConfirmationBox({'message': app.vtranslate('LBL_LIST_DELETE_CONFIRMATION')}).then( function(){ app.helper.showProgress(); app.request.post({'url':params.url}).then(function(){ diff --git a/modules/Migration/schema/701_to_710.php b/modules/Migration/schema/701_to_710.php index cb2cbaf98ffff85d4e61a9bb6515a84acaa5e82d..fb2d6ffffccb7128abf613a4ef459cca52734f92 100644 --- a/modules/Migration/schema/701_to_710.php +++ b/modules/Migration/schema/701_to_710.php @@ -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 diff --git a/pkg/vtiger/translations/Arabic_ar_ae/modules/Users.php b/pkg/vtiger/translations/Arabic_ar_ae/modules/Users.php index aee43fa5427dd9859ceeeeab88831ef6786edbc1..3c47d7341285353a63c18401090dcf1d9a26a14e 100644 --- a/pkg/vtiger/translations/Arabic_ar_ae/modules/Users.php +++ b/pkg/vtiger/translations/Arabic_ar_ae/modules/Users.php @@ -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', diff --git a/pkg/vtiger/translations/Arabic_ar_ae/modules/Vtiger.php b/pkg/vtiger/translations/Arabic_ar_ae/modules/Vtiger.php index 9e530ec2e2b9a25303cf617666990dd53cac0f7f..c3eb45d0e10435ba76f7e6355032f49833e4e57c 100644 --- a/pkg/vtiger/translations/Arabic_ar_ae/modules/Vtiger.php +++ b/pkg/vtiger/translations/Arabic_ar_ae/modules/Vtiger.php @@ -1691,4 +1691,5 @@ $jsLanguageStrings = array( 'JS_DUPLICATES_DETECTED' => 'تكرار (Ù‚) الكش٠عن!', 'JS_PASSWORD_MISMATCH_ERROR' => 'يرجى إعادة إدخال كلمة السر. "كلمة السر الجديدة" Ùˆ "كلمة السر تأكيد" عدم تطابق القيم.', + 'JS_LIST_DELETE_CONFIRMATION' => 'هل أنت متأكد أنك تريد ØØ°ÙØŸ', ); \ No newline at end of file diff --git a/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Users.php b/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Users.php index 571938b29f96ced1455913eccd09bcee6e19bd83..217343f5a15bce3dcce778bacbc759a275df4dc0 100644 --- a/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Users.php +++ b/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Users.php @@ -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' , diff --git a/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Vtiger.php b/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Vtiger.php index 4d479d2e799181738b297801cd752ccd35e85d48..70e185ad3bf7c2172e3b109c1fabbcdbb7bdd470 100644 --- a/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Vtiger.php +++ b/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Vtiger.php @@ -1493,4 +1493,5 @@ $jsLanguageStrings = array( 'JS_DUPLICATES_DETECTED' => 'Duplicar (s) detectado!', 'JS_PASSWORD_MISMATCH_ERROR' => 'Por favor, re-introduzir senhas. A "nova senha" e "Confirmar senha" valores não coincidem.', + 'JS_LIST_DELETE_CONFIRMATION' => 'Tem certeza de que deseja excluir?', ); \ No newline at end of file diff --git a/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Users.php b/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Users.php index 879a08dc1f022537ccfb0394ec68fa305158cf29..f1ff5e849e560f07e4a2ecd1516355de6161d1de 100644 --- a/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Users.php +++ b/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Users.php @@ -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' , diff --git a/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Vtiger.php b/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Vtiger.php index 83f5971b99f535533f8b7b26996c25dc2bbe563d..28b830dfc33ee765c3b1ec6aacd9a53fb8f3f3de 100644 --- a/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Vtiger.php +++ b/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Vtiger.php @@ -1494,4 +1494,5 @@ $jsLanguageStrings = array( 'JS_DUPLICATES_DETECTED' => 'Duplicate(s) detected!', 'JS_PASSWORD_MISMATCH_ERROR' => 'Please re-enter passwords. The "new password" and "confirm password" values do not match.', + 'JS_LIST_DELETE_CONFIRMATION' => 'Are you sure you want to delete?', ); \ No newline at end of file diff --git a/pkg/vtiger/translations/Deutsch/modules/Users.php b/pkg/vtiger/translations/Deutsch/modules/Users.php index a6ca4b106fd14b27fd50adefd09325c19075a536..f919c9b1da71a0468bda360d530de776e13c69ed 100644 --- a/pkg/vtiger/translations/Deutsch/modules/Users.php +++ b/pkg/vtiger/translations/Deutsch/modules/Users.php @@ -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' , diff --git a/pkg/vtiger/translations/Deutsch/modules/Vtiger.php b/pkg/vtiger/translations/Deutsch/modules/Vtiger.php index 4cd3ee6fac818609b67d8224fcbb31974be9206e..fd7f0c6c2b657c07183d0544888abe6423baf756 100644 --- a/pkg/vtiger/translations/Deutsch/modules/Vtiger.php +++ b/pkg/vtiger/translations/Deutsch/modules/Vtiger.php @@ -1496,4 +1496,5 @@ $jsLanguageStrings = array( 'JS_DUPLICATES_DETECTED' => 'Duplizieren (n) erkannt!', 'JS_PASSWORD_MISMATCH_ERROR' => 'Bitte geben Sie ein Passwort. Die „neue Kennwort“ und „Kennwort bestätigen“ Werte nicht übereinstimmen.', + 'JS_LIST_DELETE_CONFIRMATION' => 'Sind Sie sicher, dass Sie löschen möchten?', ); \ No newline at end of file diff --git a/pkg/vtiger/translations/Dutch/modules/Users.php b/pkg/vtiger/translations/Dutch/modules/Users.php index 40a7248663110057d212f7e90f35af16ffd4c219..b37b4683f477f57a0b0c9f138986e28401758ed4 100644 --- a/pkg/vtiger/translations/Dutch/modules/Users.php +++ b/pkg/vtiger/translations/Dutch/modules/Users.php @@ -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' , diff --git a/pkg/vtiger/translations/Dutch/modules/Vtiger.php b/pkg/vtiger/translations/Dutch/modules/Vtiger.php index e5fa093054d24e1fe774a4b4dfc7eb4833fdc04c..02d705248109189e97c6b30e03f841d8e4f682b3 100644 --- a/pkg/vtiger/translations/Dutch/modules/Vtiger.php +++ b/pkg/vtiger/translations/Dutch/modules/Vtiger.php @@ -1500,4 +1500,5 @@ $jsLanguageStrings = array( 'JS_DUPLICATES_DETECTED' => 'Duplicate (s) gedetecteerd!', 'JS_PASSWORD_MISMATCH_ERROR' => 'Gelieve opnieuw in te voeren wachtwoorden. De "nieuwe wachtwoord" en "Wachtwoord bevestigen" waarden komen niet overeen.', + 'JS_LIST_DELETE_CONFIRMATION' => 'Weet je zeker dat je wilt verwijderen?', ); \ No newline at end of file diff --git a/pkg/vtiger/translations/French/modules/Users.php b/pkg/vtiger/translations/French/modules/Users.php index c869e50878d7898ba4e6f64c86d23507be68c072..0cf4fa76eac760e8a647d7ca22447b07508480fa 100644 --- a/pkg/vtiger/translations/French/modules/Users.php +++ b/pkg/vtiger/translations/French/modules/Users.php @@ -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' , diff --git a/pkg/vtiger/translations/French/modules/Vtiger.php b/pkg/vtiger/translations/French/modules/Vtiger.php index 03a731f66feee56070b308b5daef29e484bcf6f2..f67e9ba7ac24b3100d1232ba4ce3439aaf3e852d 100644 --- a/pkg/vtiger/translations/French/modules/Vtiger.php +++ b/pkg/vtiger/translations/French/modules/Vtiger.php @@ -1500,4 +1500,5 @@ $jsLanguageStrings = array( 'JS_DUPLICATES_DETECTED' => 'Double (s) détectée!', 'JS_PASSWORD_MISMATCH_ERROR' => "S'il vous plaît entrer de nouveau les mots de passe. Les valeurs « nouveau mot de passe » et « mot de passe de confirmation » ne correspondent pas.", + 'JS_LIST_DELETE_CONFIRMATION' => 'Etes-vous sûr que vous voulez supprimer?', ); \ No newline at end of file diff --git a/pkg/vtiger/translations/Hungarian/modules/Users.php b/pkg/vtiger/translations/Hungarian/modules/Users.php index 3b9901b2eee4b2821462a4c395066a3f04497524..bbc5da952fa81b4de8c7b30504b1d91210af2786 100644 --- a/pkg/vtiger/translations/Hungarian/modules/Users.php +++ b/pkg/vtiger/translations/Hungarian/modules/Users.php @@ -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' , diff --git a/pkg/vtiger/translations/Hungarian/modules/Vtiger.php b/pkg/vtiger/translations/Hungarian/modules/Vtiger.php index 3dad2a5442d22686d8a4b1dbc2c6ad86c7fdbf1f..bdc7e07eb4c331106490d803d7042712739f2871 100644 --- a/pkg/vtiger/translations/Hungarian/modules/Vtiger.php +++ b/pkg/vtiger/translations/Hungarian/modules/Vtiger.php @@ -1501,4 +1501,5 @@ $jsLanguageStrings = array( 'JS_DUPLICATES_DETECTED' => 'IsmétlÅ‘dÅ‘ (ek) észlelt!', 'JS_PASSWORD_MISMATCH_ERROR' => 'Kérjük, adja meg újra a jelszavakat. Az „új jelszó†és a „Jelszó megerÅ‘sÃtése†értékek nem egyeznek.', + 'JS_LIST_DELETE_CONFIRMATION' => 'Biztos vagy benne, hogy törölni akarod?', ); \ No newline at end of file diff --git a/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Users.php b/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Users.php index 92ab60600d716caf88545cb2e2e6b91447a9a7b9..e3e048ca7e334106aca735307ea65040223fe524 100644 --- a/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Users.php +++ b/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Users.php @@ -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' , diff --git a/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Vtiger.php b/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Vtiger.php index 393e723ec1e26f5f8c61b4caf9bd40f9155ed53a..d230bd313645ce69fc14fe3bf0ab3aceca723ce4 100644 --- a/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Vtiger.php +++ b/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Vtiger.php @@ -1495,4 +1495,5 @@ $jsLanguageStrings = array( 'JS_DUPLICATES_DETECTED' => 'Duplicate (s) rilevata!', 'JS_PASSWORD_MISMATCH_ERROR' => 'Si prega di inserire nuovamente le password. La "nuova password" e "password conferma" valori non corrispondono.', + 'JS_LIST_DELETE_CONFIRMATION' => 'Sei sicuro di voler eliminare?', ); \ No newline at end of file diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Users.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Users.php index d5eeb18847b597562875826838119a6d55b8cb33..09c9bfefa67516c54d2b190d2efc90919eb462f2 100644 --- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Users.php +++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Users.php @@ -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' , diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Vtiger.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Vtiger.php index 0b8864cdee97ad5b436c0daf762f7f0fb828b528..b35d86d80c79f27b65e55afd62ed9becb6fe1135 100644 --- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Vtiger.php +++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Vtiger.php @@ -1478,4 +1478,5 @@ $jsLanguageStrings = array( 'JS_DUPLICATES_DETECTED' => 'Duplicar (s) detectado!', 'JS_PASSWORD_MISMATCH_ERROR' => 'Por favor, vuelva a introducir las contraseñas. La "nueva contraseña" y "Confirmar contraseña" valores no coinciden.', + 'JS_LIST_DELETE_CONFIRMATION' => '¿Estas seguro que quieres borrarlo?', ); \ No newline at end of file diff --git a/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Users.php b/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Users.php index 960b4f4a9ee89d2a14408ee54b53e34e6b3cd74c..efc9eb52039311b4c546c26047ec381279ed3c7f 100644 --- a/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Users.php +++ b/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Users.php @@ -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', diff --git a/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Vtiger.php b/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Vtiger.php index 99a3a6f32c42c7d95ce7d6948362e753b5cbf72e..14a8a6d0cd01a910ad9b8c727980640ea9dc05ee 100644 --- a/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Vtiger.php +++ b/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Vtiger.php @@ -1649,4 +1649,5 @@ $jsLanguageStrings = array( 'JS_DUPLICATES_DETECTED' => 'Duplikat (e) wykryto!', 'JS_PASSWORD_MISMATCH_ERROR' => 'Należy ponownie wprowadzić hasÅ‚o. „Nowe hasÅ‚o†i „Potwierdź hasÅ‚o†WartoÅ›ci nie pasujÄ….', + 'JS_LIST_DELETE_CONFIRMATION' => 'Czy na pewno chcesz usunąć?', ); \ No newline at end of file diff --git a/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Users.php b/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Users.php index 33ea953959136e820e0f5d79dfede102b1de2536..19afc3689585439e570733583c9be1c4220818d2 100644 --- a/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Users.php +++ b/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Users.php @@ -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' , diff --git a/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Vtiger.php b/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Vtiger.php index fa2a5039fa34e23d949b3eef03ba58dc896786c7..bb1a8eaba272c9e2a4abc42998d0242a18e7063d 100644 --- a/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Vtiger.php +++ b/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Vtiger.php @@ -1493,4 +1493,5 @@ $jsLanguageStrings = array( 'JS_DUPLICATES_DETECTED' => 'Duplicate (e) detectat!', 'JS_PASSWORD_MISMATCH_ERROR' => 'Vă rugăm să reintroduceÈ›i parolele. „Parola nouă“ È™i „parola confirma“ valorile nu se potrivesc.', + 'JS_LIST_DELETE_CONFIRMATION' => 'EÈ™ti sigur că vrei să È™tergi?', ); \ No newline at end of file diff --git a/pkg/vtiger/translations/Russian/modules/Users.php b/pkg/vtiger/translations/Russian/modules/Users.php index ad44620ce8951b195854900ab6e7650dda04ed19..2447bd3551b476b7e0fb5325ebd8232e132c1b40 100644 --- a/pkg/vtiger/translations/Russian/modules/Users.php +++ b/pkg/vtiger/translations/Russian/modules/Users.php @@ -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' , diff --git a/pkg/vtiger/translations/Russian/modules/Vtiger.php b/pkg/vtiger/translations/Russian/modules/Vtiger.php index b3fd645ad2c4d0e7e45b8d0a060ad2addf08fdb0..67f0cfeec79c7b40331ce5ec7633c54bfccef05e 100644 --- a/pkg/vtiger/translations/Russian/modules/Vtiger.php +++ b/pkg/vtiger/translations/Russian/modules/Vtiger.php @@ -1493,4 +1493,5 @@ $jsLanguageStrings = array( 'JS_DUPLICATES_DETECTED' => 'Дубликат (s) обнаружено!', 'JS_PASSWORD_MISMATCH_ERROR' => 'ПожалуйÑта, повторно ввеÑти пароль. «Ðовый пароль» и «Подтверждение паролÑ» Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð½Ðµ Ñовпадают.', + 'JS_LIST_DELETE_CONFIRMATION' => 'Ð’Ñ‹ уверены, что хотите удалить?', ); \ No newline at end of file diff --git a/pkg/vtiger/translations/Spanish/modules/Users.php b/pkg/vtiger/translations/Spanish/modules/Users.php index e36c44cadcbd3eebebff12a9b1af7d2a56c5cfee..ed5ada7a988873bd74a100ada331a483f1493d5c 100644 --- a/pkg/vtiger/translations/Spanish/modules/Users.php +++ b/pkg/vtiger/translations/Spanish/modules/Users.php @@ -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', diff --git a/pkg/vtiger/translations/Spanish/modules/Vtiger.php b/pkg/vtiger/translations/Spanish/modules/Vtiger.php index c92578db5d5fba2c852158e84db0f8105126bbdb..94f93268893f582e2402474533d5d1982ea1281b 100644 --- a/pkg/vtiger/translations/Spanish/modules/Vtiger.php +++ b/pkg/vtiger/translations/Spanish/modules/Vtiger.php @@ -1531,4 +1531,5 @@ $jsLanguageStrings = array( 'JS_DUPLICATES_DETECTED' => 'Duplicar (s) detectado!', 'JS_PASSWORD_MISMATCH_ERROR' => 'Por favor, vuelva a introducir las contraseñas. La "nueva contraseña" y "Confirmar contraseña" valores no coinciden.', + 'JS_LIST_DELETE_CONFIRMATION' => '¿Estas seguro que quieres borrarlo?', ); \ No newline at end of file diff --git a/pkg/vtiger/translations/Sweden_sv_se/modules/Users.php b/pkg/vtiger/translations/Sweden_sv_se/modules/Users.php index 4988b998a6d1c8a221ae40d1215ec8609a2d19f8..de9cbc676f2113c8d1d3d1186d5ce62d56812344 100755 --- a/pkg/vtiger/translations/Sweden_sv_se/modules/Users.php +++ b/pkg/vtiger/translations/Sweden_sv_se/modules/Users.php @@ -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', diff --git a/pkg/vtiger/translations/Sweden_sv_se/modules/Vtiger.php b/pkg/vtiger/translations/Sweden_sv_se/modules/Vtiger.php index f2052491600713ce26f5c4ac8cfdc6f577c1ed0f..29a34a4ef8d80562cd54f87c44b06beecb1b34b6 100755 --- a/pkg/vtiger/translations/Sweden_sv_se/modules/Vtiger.php +++ b/pkg/vtiger/translations/Sweden_sv_se/modules/Vtiger.php @@ -1664,4 +1664,5 @@ $jsLanguageStrings = array( 'JS_DUPLICATES_DETECTED' => 'Duplicera (s) upptäckt!', 'JS_PASSWORD_MISMATCH_ERROR' => 'Vänligen ange lösenord. Den "nya lösenord" och "Bekräfta lösenord" värden inte stämmer överens.', + 'JS_LIST_DELETE_CONFIRMATION' => 'Är du säker att du vill radera?', ); \ No newline at end of file diff --git a/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Users.php b/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Users.php index d893f13c5897ade7d84af9d6b6d45e192626442b..6895424aad797ee6ae88d10666329a61d17c8331 100644 --- a/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Users.php +++ b/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Users.php @@ -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' , diff --git a/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Vtiger.php b/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Vtiger.php index ed81e59c0ad392125a654381593ed82a748abd2a..624188be0693c98d3697aa1b20d31d1f115b3fef 100644 --- a/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Vtiger.php +++ b/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Vtiger.php @@ -1499,4 +1499,5 @@ $jsLanguageStrings = array( 'JS_DUPLICATES_DETECTED' => 'ÇoÄŸaltın (ler) algılandı!', 'JS_PASSWORD_MISMATCH_ERROR' => 'yeniden girin ÅŸifreleri. "Yeni ÅŸifre" ve "onayla parola" deÄŸerleri eÅŸleÅŸmiyor.', + 'JS_LIST_DELETE_CONFIRMATION' => 'Silmek istediÄŸine emin misin?', ); \ No newline at end of file diff --git a/schema/DatabaseSchema.xml b/schema/DatabaseSchema.xml index a5c75049e9b960fd195264320c8a662b2ca95332..95d52998bb0736ba1ba6b4a749ff3d4fa43a1c27 100644 --- a/schema/DatabaseSchema.xml +++ b/schema/DatabaseSchema.xml @@ -1971,9 +1971,10 @@ <deftimestamp /> </field> <field name="login_time" type="T"> - <deftimestamp /> - <!--mysql 5.7 not able create table as default value missing for this field--> - <default value="CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP" /> + <!-- Troublesome with STRICT_TRANS_TABLE mode depends on MySQL 5.5 or 5.6+ --> + <!-- + <deftimestamp /> + --> </field> <field name="status" type="C" size="25" /> <opt platform="mysql">Engine=InnoDB</opt>