diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-08-16 00:39:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-08-16 00:39:17 +0000 |
| commit | c82a5fe7e0d6347b317505b2dd49d8b1d3fa8163 (patch) | |
| tree | c93a65446e11ad36df938fcdaf808c7fa9942739 | |
| parent | 4d20d1099d6cbe58a4f325c6ee52868cdcf0ed96 (diff) | |
| parent | b59d7e7725866f8bc3018e5be130ce4a194509c6 (diff) | |
Merge "Replace enabled languages with excluded languages in UI"
| -rw-r--r-- | manifests/ui.pp | 34 | ||||
| -rw-r--r-- | templates/ui/tripleo_ui_config.js.erb | 10 |
2 files changed, 14 insertions, 30 deletions
diff --git a/manifests/ui.pp b/manifests/ui.pp index d744044..cb1da21 100644 --- a/manifests/ui.pp +++ b/manifests/ui.pp @@ -31,19 +31,9 @@ # The port on which the UI is listening. # Defaults to 3000 # -# [*enabled_languages*] -# Which languages to show in the UI. -# A hash. -# Defaults to -# { -# 'de' => 'German', -# 'en' => 'English', -# 'es' => 'Spanish', -# 'id' => 'Indonesian', -# 'ja' => 'Japanese', -# 'ko-KR' => 'Korean', -# 'zh-CN' => 'Simplified Chinese' -# } +# [*excluded_languages*] +# A list of languages that shouldn't be enabled in the UI, e.g. ['en', 'de'] +# Defaults to [] # # [*endpoint_proxy_keystone*] # The keystone proxy endpoint url @@ -107,19 +97,11 @@ # Defaults to 'tripleo' # class tripleo::ui ( - $servername = $::fqdn, - $bind_host = hiera('controller_host'), - $ui_port = 3000, - $zaqar_default_queue = 'tripleo', - $enabled_languages = { - 'de' => 'German', - 'en' => 'English', - 'es' => 'Spanish', - 'id' => 'Indonesian', - 'ja' => 'Japanese', - 'ko-KR' => 'Korean', - 'zh-CN' => 'Simplified Chinese' - }, + $servername = $::fqdn, + $bind_host = hiera('controller_host'), + $ui_port = 3000, + $zaqar_default_queue = 'tripleo', + $excluded_languages = [], $endpoint_proxy_zaqar = undef, $endpoint_proxy_keystone = undef, $endpoint_proxy_heat = undef, diff --git a/templates/ui/tripleo_ui_config.js.erb b/templates/ui/tripleo_ui_config.js.erb index cd02798..613042b 100644 --- a/templates/ui/tripleo_ui_config.js.erb +++ b/templates/ui/tripleo_ui_config.js.erb @@ -16,10 +16,12 @@ window.tripleOUiConfig = { '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': <%= @enabled_languages.to_json %>, + // + // By default, all available languages are enabled. Use this setting to + // disable certain languages. + // + 'excludedLanguages': <%= @excluded_languages.to_json %>, + // Logging // 'loggers': ['console'] |