提交 e2e6aac0 编写于 作者: J Joram Barrez

Fix activiti 6 UI not working on some languages (see...

Fix activiti 6 UI not working on some languages (see https://forums.activiti.org/content/activiti-6-ui-internationalisation-problem)
上级 a76ae25e
...@@ -194,20 +194,10 @@ activitiModeler ...@@ -194,20 +194,10 @@ activitiModeler
suffix: '.json' suffix: '.json'
}); });
$translateProvider.registerAvailableLanguageKeys(['en', 'de', 'es', 'fr', 'it', 'ja'], { $translateProvider.registerAvailableLanguageKeys(['en'], {
'en_*': 'en', 'en_*': 'en',
'de_*': 'de', 'en-*': 'en'
'es_*': 'es', });
'fr_*': 'fr',
'it_*': 'it',
'ja_*': 'ja',
'en-*': 'en',
'de-*': 'de',
'es-*': 'es',
'fr-*': 'fr',
'it-*': 'it',
'ja-*': 'ja'
}).determinePreferredLanguage();
}]) }])
.run(['$rootScope', '$timeout', '$modal', '$translate', '$location', '$window', 'appResourceRoot', .run(['$rootScope', '$timeout', '$modal', '$translate', '$location', '$window', 'appResourceRoot',
......
...@@ -99,21 +99,12 @@ activitiApp.config(['$provide', '$routeProvider', '$translateProvider', function ...@@ -99,21 +99,12 @@ activitiApp.config(['$provide', '$routeProvider', '$translateProvider', function
prefix: appResourceRoot + 'i18n/', prefix: appResourceRoot + 'i18n/',
suffix: '.json' suffix: '.json'
}); });
$translateProvider.registerAvailableLanguageKeys(['en', 'de', 'es', 'fr', 'it', 'ja'], { $translateProvider.registerAvailableLanguageKeys(['en'], {
'en_*': 'en', 'en_*': 'en',
'de_*': 'de', 'en-*': 'en'
'es_*': 'es', });
'fr_*': 'fr',
'it_*': 'it',
'ja_*': 'ja',
'en-*': 'en',
'de-*': 'de',
'es-*': 'es',
'fr-*': 'fr',
'it-*': 'it',
'ja-*': 'ja'
}).determinePreferredLanguage();
}]) }])
.run(['$rootScope', '$location', '$window', 'AuthenticationSharedService', '$translate', 'appResourceRoot', '$modal', .run(['$rootScope', '$location', '$window', 'AuthenticationSharedService', '$translate', 'appResourceRoot', '$modal',
function($rootScope, $location, $window, AuthenticationSharedService, $translate, appResourceRoot, $modal) { function($rootScope, $location, $window, AuthenticationSharedService, $translate, appResourceRoot, $modal) {
......
...@@ -99,23 +99,14 @@ activitiApp ...@@ -99,23 +99,14 @@ activitiApp
$translateProvider.useStaticFilesLoader({ $translateProvider.useStaticFilesLoader({
prefix: './i18n/', prefix: './i18n/',
suffix: '.json' suffix: '.json'
}); })
$translateProvider.registerAvailableLanguageKeys(['en', 'de', 'es', 'fr', 'it', 'ja'], { .registerAvailableLanguageKeys(['en'], {
'en_*': 'en', 'en_*': 'en',
'de_*': 'de', 'en-*': 'en'
'es_*': 'es', });
'fr_*': 'fr',
'it_*': 'it',
'ja_*': 'ja',
'en-*': 'en',
'de-*': 'de',
'es-*': 'es',
'fr-*': 'fr',
'it-*': 'it',
'ja-*': 'ja'
}).determinePreferredLanguage();
}]) }])
.run(['$rootScope', function($rootScope) { .run(['$rootScope', function($rootScope) {
$rootScope.$on( "$routeChangeStart", function(event, next, current) { $rootScope.$on( "$routeChangeStart", function(event, next, current) {
......
...@@ -166,20 +166,10 @@ activitiApp ...@@ -166,20 +166,10 @@ activitiApp
suffix: '.json' suffix: '.json'
}); });
$translateProvider.registerAvailableLanguageKeys(['en', 'de', 'es', 'fr', 'it', 'ja'], { $translateProvider.registerAvailableLanguageKeys(['en'], {
'en_*': 'en', 'en_*': 'en',
'de_*': 'de', 'en-*': 'en'
'es_*': 'es', });
'fr_*': 'fr',
'it_*': 'it',
'ja_*': 'ja',
'en-*': 'en',
'de-*': 'de',
'es-*': 'es',
'fr-*': 'fr',
'it-*': 'it',
'ja-*': 'ja'
}).determinePreferredLanguage();
// turn loading bar spinner off (angular-loading-bar lib) // turn loading bar spinner off (angular-loading-bar lib)
cfpLoadingBarProvider.includeSpinner = false; cfpLoadingBarProvider.includeSpinner = false;
......
...@@ -6,7 +6,6 @@ if [ $STATUS -eq 0 ] ...@@ -6,7 +6,6 @@ if [ $STATUS -eq 0 ]
then then
cd activiti-app cd activiti-app
# Create activiti app & ldap properties files
echo "Creating development config files for backend" echo "Creating development config files for backend"
cd src/main/resources/META-INF/activiti-app/ cd src/main/resources/META-INF/activiti-app/
rm activiti-app.properties rm activiti-app.properties
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册