aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-18 04:52:24 +0000
committerGerrit Code Review <review@openstack.org>2017-02-18 04:52:24 +0000
commitfb67bd6dae9eac346978425ab6f5451d777958c3 (patch)
tree885b2ffacc3af05f9685180fc3e0436fe842ab40
parentc78806286a7f169de7393a7bef091ece82577791 (diff)
parent053ee06787539f6da07985968d6c3b0194e56008 (diff)
Merge "Enable languages in UI config"
-rw-r--r--manifests/ui.pp6
-rw-r--r--releasenotes/notes/enable-languages-in-ui-88a8caa6db9b4dd7.yaml5
-rw-r--r--templates/ui/tripleo_ui_config.js.erb4
3 files changed, 13 insertions, 2 deletions
diff --git a/manifests/ui.pp b/manifests/ui.pp
index 7b87397..d51ef2e 100644
--- a/manifests/ui.pp
+++ b/manifests/ui.pp
@@ -31,6 +31,11 @@
# The port on which the UI is listening.
# Defaults to 3000
#
+# [*enabled_languages*]
+# Which languages to show in the UI.
+# An array.
+# Defaults to ['en-GB', 'en', 'de', 'ja', 'ko-KR', 'zh-CN', 'es']
+#
# [*endpoint_proxy_keystone*]
# The keystone proxy endpoint url
# Defaults to undef
@@ -89,6 +94,7 @@ class tripleo::ui (
$bind_host = hiera('controller_host'),
$ui_port = 3000,
$zaqar_default_queue = 'tripleo',
+ $enabled_languages = ['en-GB', 'en', 'de', 'ja', 'ko-KR', 'zh-CN', 'es'],
$endpoint_proxy_zaqar = undef,
$endpoint_proxy_keystone = undef,
$endpoint_proxy_heat = undef,
diff --git a/releasenotes/notes/enable-languages-in-ui-88a8caa6db9b4dd7.yaml b/releasenotes/notes/enable-languages-in-ui-88a8caa6db9b4dd7.yaml
new file mode 100644
index 0000000..2f7939d
--- /dev/null
+++ b/releasenotes/notes/enable-languages-in-ui-88a8caa6db9b4dd7.yaml
@@ -0,0 +1,5 @@
+---
+features:
+ - The undercloud UI is available in multiple languages, which can now
+ be configured via the manifest. All available languages are enabled
+ by default.
diff --git a/templates/ui/tripleo_ui_config.js.erb b/templates/ui/tripleo_ui_config.js.erb
index d49fe8e..c984cc3 100644
--- a/templates/ui/tripleo_ui_config.js.erb
+++ b/templates/ui/tripleo_ui_config.js.erb
@@ -12,13 +12,13 @@ window.tripleOUiConfig = {
'zaqar-websocket': '<%= @endpoint_config_zaqar %>',
// Default websocket queue name
- 'zaqar_default_queue': '<%= @zaqar_default_queue %>'
+ 'zaqar_default_queue': '<%= @zaqar_default_queue %>',
// Languages
// If you choose more than one language, a language switcher will appear in
// the navigation bar.
// Only 'en' (English) is enabled by default.
- // 'languages': ['en-GB', 'en', 'ja', 'ko-KR', 'zh-CN', 'es'],
+ 'languages': ['<%= @enabled_languages.join("', '") %>'],
// Logging
// 'loggers': ['console']