Replace enabled languages with excluded languages in UI

Change-Id: I14d2c8d11abb1df17759e2a9d4ae6b9ccebbe30f
Depends-On: Idf5a3314c19be18ca6cabbae1e94bc7cb1d1fe94

diff --git a/manifests/ui.pp b/manifests/ui.pp
index d744044..cb1da21 100644 (file)
--- 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 (file)
--- 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']