Skip to content

Commit bc4bce1

Browse files
committed
Use default builtin english culture ACI0105529
1 parent 7f192ea commit bc4bce1

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

Resources/scripts/init.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,10 @@ document.addEventListener('DOMContentLoaded', function () {
140140
/*********
141141
* Culture
142142
*********/
143-
// in japanese, use builtin japanese culture
144-
if ((vp_localizedFolder !== 'ja.lproj') && (vp_localizedFolder !== 'en.lproj')) {
145-
// get a new culture based on 4D intl manager
143+
if ((vp_localizedFolder !== 'ja.lproj') // in japanese, use builtin japanese culture
144+
&& (!Utils.useDefaultEnglishCulture || (vp_localizedFolder !== 'en.lproj'))) { // in english, use culture according to the configuration
145+
146+
// get a new culture based on 4D intl manager
146147
const culture = getCulture(obj);
147148

148149
// get current culture name

Resources/scripts/utils.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -916,6 +916,9 @@ Utils._getLongOperationTimeout = function () {
916916
return (timeout) ? timeout : Utils.longOperationTimeout;
917917
};
918918

919+
// Use default english culture (ACI0105529)
920+
Utils.useDefaultEnglishCulture = true;
921+
919922
function vp_startLongOperation() {
920923
vp_counter++;
921924
vp_setOptimizer(Utils._getLongOperationTimeout());

0 commit comments

Comments
 (0)