From: David Wong Date: Fri, 6 Jan 2017 08:02:51 +0000 (+0100) Subject: [TASK] Properly select Chinese (Simplified) in DatePicker.js X-Git-Tag: v9.2.0~594 X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/commitdiff_plain/825e5d3280370558ec995b15675f7c0e63efcef0 [TASK] Properly select Chinese (Simplified) in DatePicker.js The language identifier key for Chinese in TYPO3s backend is ‘ch’. The valid identifier should be ‘zh-cn’, but we cannot change the entire translation server in a meaningful way. Releases: master Resolves: #79179 Change-Id: I5fee14f2eceacc5676588bdb8cac2aeceb88fff6 Reviewed-on: https://review.typo3.org/51161 Reviewed-by: Andreas Fernandez Reviewed-by: Frank Naegler Tested-by: Frank Naegler Tested-by: TYPO3com Reviewed-by: Christian Kuhn Tested-by: Christian Kuhn --- diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/DateTimePicker.js b/typo3/sysext/backend/Resources/Public/JavaScript/DateTimePicker.js index f3f258bb8093..43326261b45c 100644 --- a/typo3/sysext/backend/Resources/Public/JavaScript/DateTimePicker.js +++ b/typo3/sysext/backend/Resources/Public/JavaScript/DateTimePicker.js @@ -44,6 +44,10 @@ define(['jquery'], function($) { if ($dateTimeFields.length > 0) { require(['moment', 'TYPO3/CMS/Backend/Storage/Persistent', 'twbs/bootstrap-datetimepicker'], function(moment, PersistentStorage) { var userLocale = PersistentStorage.get('lang'); + // Fix our made up locale "ch" + if (userLocale === 'ch') { + userLocale = 'zh-cn'; + } var setLocale = userLocale ? moment.locale(userLocale) : false; // initialize the datepicker on each selected element