@sapui5/sap.ushell 1.136.2 → 1.136.4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sapui5/sap.ushell",
-    "version": "1.136.2",
+    "version": "1.136.4",
     "description": "SAPUI5 Library sap.ushell",
     "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
     "keywords": [

package/src/main/js/sap/ushell/.library

@@ -2,7 +2,7 @@
 <library xmlns="http://www.sap.com/sap.ui.library.xsd">
     <name>sap.ushell</name>
     <vendor>SAP SE</vendor>
-    <version>1.136.2</version>
+    <version>1.136.4</version>
     <copyright>Copyright (c) 2009-2025 SAP SE, All Rights Reserved</copyright>
     <documentation>SAP library: sap.ushell</documentation>
 

package/src/main/js/sap/ushell/ApplicationType/wcfResolution.js

@@ -1,26 +1,28 @@
 // Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 sap.ui.define([
-    "sap/base/Log",
     "sap/base/util/deepExtend",
     "sap/ui/thirdparty/URI",
     "sap/ushell/ApplicationType/systemAlias",
-    "sap/ushell/ApplicationType/utils"
-], function (
-    Log,
+    "sap/ushell/ApplicationType/utils",
+    "sap/ushell/Config",
+    "sap/ushell/Container"
+], (
     deepExtend,
     URI,
     oSystemAlias,
-    oApplicationTypeUtils
-) {
+    oApplicationTypeUtils,
+    Config,
+    Container
+) => {
     "use strict";
 
-    function generateWCFResolutionResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
-        var oUri = new URI(sBaseUrl);
-        var oInbound = oMatchingTarget.inbound;
-        var oInboundResolutionResult = oInbound && oInbound.resolutionResult;
-        var oEffectiveParameters = deepExtend({}, oMatchingTarget.mappedIntentParamsPlusSimpleDefaults);
-        var sSapSystem;
-        var sSapSystemDataSrc;
+    async function generateWCFResolutionResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
+        const oUri = new URI(sBaseUrl);
+        const oInbound = oMatchingTarget.inbound;
+        const oInboundResolutionResult = oInbound && oInbound.resolutionResult;
+        const oEffectiveParameters = deepExtend({}, oMatchingTarget.mappedIntentParamsPlusSimpleDefaults);
+        let sSapSystem;
+        let sSapSystemDataSrc;
 
         if (oEffectiveParameters["sap-system"]) {
             sSapSystem = oEffectiveParameters["sap-system"][0];
@@ -32,27 +34,30 @@ sap.ui.define([
             delete oEffectiveParameters["sap-system-src"];
         }
 
-        return oSystemAlias.spliceSapSystemIntoURI(
-            oUri, oInboundResolutionResult.systemAlias, sSapSystem, sSapSystemDataSrc, "WCF",
-            oInboundResolutionResult.systemAliasSemantics || oSystemAlias.SYSTEM_ALIAS_SEMANTICS.applied, fnExternalSystemAliasResolver)
-            .then(function (oURI) {
-                var sParameters = oApplicationTypeUtils.getURLParsing().paramsToString(oEffectiveParameters);
-                var sFinalUrl = oApplicationTypeUtils.appendParametersToUrl(sParameters, oURI);
+        if (Config.last("/core/extension/dap/enabled")) {
+            const oPluginManager = await Container.getServiceAsync("PluginManager");
+            oEffectiveParameters["sap-load-dap"] = oPluginManager.isPluginConfigured(Config.last("/core/extension/dap/pluginName"));
+        } else {
+            oEffectiveParameters["sap-load-dap"] = false;
+        }
 
-                var oResolutionResult = {
-                    url: sFinalUrl,
-                    text: oInboundResolutionResult.text || "",
-                    additionalInformation: oInboundResolutionResult.additionalInformation || "",
-                    applicationType: "WCF",
-                    fullWidth: true,
-                    extendedInfo: oApplicationTypeUtils.getExtendedInfo(oMatchingTarget)
-                };
-                oApplicationTypeUtils.checkOpenWithPost(oMatchingTarget, oResolutionResult);
-                oApplicationTypeUtils.addKeepAliveToURLTemplateResult(oResolutionResult);
-                oApplicationTypeUtils.addIframeCacheHintToURL(oResolutionResult, "WCF");
+        const oURI = await oSystemAlias.spliceSapSystemIntoURI(oUri, oInboundResolutionResult.systemAlias, sSapSystem, sSapSystemDataSrc, "WCF",
+            oInboundResolutionResult.systemAliasSemantics || oSystemAlias.SYSTEM_ALIAS_SEMANTICS.applied, fnExternalSystemAliasResolver);
+        const sParameters = oApplicationTypeUtils.getURLParsing().paramsToString(oEffectiveParameters);
+        const sFinalUrl = oApplicationTypeUtils.appendParametersToUrl(sParameters, oURI);
+        const oResolutionResult = {
+            url: sFinalUrl,
+            text: oInboundResolutionResult.text || "",
+            additionalInformation: oInboundResolutionResult.additionalInformation || "",
+            applicationType: "WCF",
+            fullWidth: true,
+            extendedInfo: oApplicationTypeUtils.getExtendedInfo(oMatchingTarget)
+        };
+        oApplicationTypeUtils.checkOpenWithPost(oMatchingTarget, oResolutionResult);
+        oApplicationTypeUtils.addKeepAliveToURLTemplateResult(oResolutionResult);
+        oApplicationTypeUtils.addIframeCacheHintToURL(oResolutionResult, "WCF");
 
-                return oResolutionResult;
-            });
+        return oResolutionResult;
     }
 
     return {

package/src/main/js/sap/ushell/Fiori20Adapter.js

@@ -5,7 +5,7 @@
  *
  * The Fiori20 adapter automatically re-styles old (Fiori 1) applications to match Fiori2 design requirements.
  *
- * @version 1.136.2
+ * @version 1.136.4
  */
 sap.ui.define([
     "sap/ui/base/Object",

package/src/main/js/sap/ushell/Fiori20AdapterTest.js

@@ -4,7 +4,7 @@
  * @fileOverview The purpose Fiori20AdapterTest in this file is to decide whether to load the Fiori20Adapter at all.
  * This file is kept small in size on purpose as it is always required in productive code even when Fiori2 adaptation is not required.
  *
- * @version 1.136.2
+ * @version 1.136.4
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/NWBCInterface.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview NWBCInterface for NWBC client
  *
- * @version 1.136.2
+ * @version 1.136.4
  */
 sap.ui.define([
     "sap/ushell/EventHub",

package/src/main/js/sap/ushell/TechnicalParameters.js

@@ -42,7 +42,7 @@
  * parameters. If the application tries to access an internal parameter (e.g.,
  * sap-ui-app-id-hint) via the API, the application receives an error message.
  *
- * @version 1.136.2
+ * @version 1.136.4
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/URLTemplateProcessor/DefinitionParameterSetBuilder.js

@@ -4,7 +4,7 @@
  * @fileOverview Methods to build the set of parameters used by the URL template.
  *
  *
- * @version 1.136.2
+ * @version 1.136.4
  *
  * @private
  *

package/src/main/js/sap/ushell/URLTemplateProcessor/DependencyGraph.js

@@ -8,7 +8,7 @@
  * The proper order of evaluation can be determined by creating and visiting a graph that represents parameters and depending parameters
  * as nodes. This graph can be also used to detect cyclic references in the parameter set definition.
  *
- * @version 1.136.2
+ * @version 1.136.4
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/URLTemplateProcessor/Functions.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Methods to parse and execute functions defined for the URL Template parameter language.
- * @version 1.136.2
+ * @version 1.136.4
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/URLTemplateProcessor/Resolvers.js

@@ -5,7 +5,7 @@
  * For a given context (e.g. the reference to a site, the application section from the site, parameters added during runtime, etc),
  * this module can be used to find the values associated to given URL Template parameter names.
  *
- * @version 1.136.2
+ * @version 1.136.4
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/URLTemplateProcessor/TemplateParameterParser.js

@@ -34,7 +34,7 @@
  *     }
  *   }
  *   </pre>
- * @version 1.136.2
+ * @version 1.136.4
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/URLTemplateProcessor/utils.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Utility functions for modules of <code>URLTemplateProcessor</code>.
- * @version 1.136.2
+ * @version 1.136.4
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/URLTemplateProcessor.js

@@ -26,7 +26,7 @@
  * The language to define parameters in the URL Template parameter set contains a minimal set of conditionals,
  * logical operators, and functions that allow to define the parameter set with a certain degree of control.
  *
- * @version 1.136.2
+ * @version 1.136.4
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/Ui5NativeServiceFactory.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview Ui5 Native Service Factory
  *
- * @version 1.136.2
+ * @version 1.136.4
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/Ui5ServiceFactory.js

@@ -6,7 +6,7 @@
  * Exposes methods to create a UI5 Service Factory for a specific Unified Shell
  * Service.
  *
- * @version 1.136.2
+ * @version 1.136.4
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/ClientSideTargetResolutionAdapter.js

@@ -9,7 +9,7 @@
  * <li>provide the resolveHashFragment function, a fallback method called by ClientSideTargetResolution service.</li>
  * </ul>
  *
- * @version 1.136.2
+ * @version 1.136.4
  */
 sap.ui.define([
     "sap/base/util/Version",

package/src/main/js/sap/ushell/adapters/cdm/CommonDataModelAdapter.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's sap.ushell.adapters.cdm.CommonDataModelAdapter for the 'CDM'
  *               platform.
  *
- * @version 1.136.2
+ * @version 1.136.4
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/adapters/cdm/ConfigurationDefaultsAdapter.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The ConfigurationDefaults adapter for the CDM platform.
  *
- * @version 1.136.2
+ * @version 1.136.4
  */
 sap.ui.define([
     "sap/ushell/bootstrap/cdm/cdm.constants",

package/src/main/js/sap/ushell/adapters/cdm/ContainerAdapter.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Unified Shell"s container adapter for the Common Data Model (CDM) platform.
  *
- * @version 1.136.2
+ * @version 1.136.4
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/adapters/cdm/LaunchPageAdapter.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's LaunchPageAdapter for the
  *               'CDM' platform - Version 2 (V2)
  * @deprecated since 1.100
- * @version 1.136.2
+ * @version 1.136.4
  */
 sap.ui.define([
     "sap/ushell/adapters/cdm/_LaunchPage/readHome",

package/src/main/js/sap/ushell/adapters/cdm/PagesCommonDataModelAdapter.js

@@ -5,7 +5,7 @@
  * It combines the page data, tile data, navigation data and personalization into a CDM 3.1 site.
  * Only used on the ABAP platform and on local for testing.
  *
- * @version 1.136.2
+ * @version 1.136.4
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/adapters/cdm/PersonalizationAdapter.js

@@ -5,7 +5,7 @@
  *
  *
  * The CDM personalization adapter can be used to store data in the RA@ABAP platform.
- * @version 1.136.2
+ * @version 1.136.4
  */
 sap.ui.define([
     "sap/ushell/adapters/cdm/_Personalization/internals",

package/src/main/js/sap/ushell/adapters/cdm/PersonalizationV2Adapter.js

@@ -5,7 +5,7 @@
  *
  *
  * The CDM personalization adapter can be used to store data in the RA@ABAP platform.
- * @version 1.136.2
+ * @version 1.136.4
  */
 sap.ui.define([
     "./PersonalizationAdapter"

package/src/main/js/sap/ushell/adapters/cdm/Settings/UserLanguageAndRegion/UserLanguageAndRegion.controller.js

@@ -13,7 +13,7 @@ sap.ui.define([
     "sap/ui/core/format/NumberFormat",
     "sap/base/i18n/Localization",
     "sap/ushell/resources"
-], function (
+], (
     Log,
     Formatting,
     Locale,
@@ -26,22 +26,24 @@ sap.ui.define([
     NumberFormat,
     Localization,
     oResources
-) {
+) => {
     "use strict";
 
     return Controller.extend("sap.ushell.adapters.cdm.Settings.UserLanguageAndRegion.UserLanguageAndRegion", {
         onInit: function () {
             this.oUser = Container.getUser();
 
-            var oLocale = new Locale(Formatting.getLanguageTag());
+            const oLocale = new Locale(Formatting.getLanguageTag());
 
-            var bIsLanguagePersonalized = this.oUser.isLanguagePersonalized();
+            const bIsEnableSetLanguage = Container.getRendererInternal("fiori2").getShellConfig().enableSetLanguage || false;
+            const bIsLanguagePersonalized = this.oUser.isLanguagePersonalized();
 
-            var { sTimeFormat, sExampleDate, sDecimalFormat, sWorkWeek, sTimeZone } = this._getParsedLocaleProperties(oLocale);
+            const { sTimeFormat, sExampleDate, sDecimalFormat, sWorkWeek, sTimeZone } = this._getParsedLocaleProperties(oLocale);
 
-            var oModel = new JSONModel({
+            const oModel = new JSONModel({
                 languageList: null,
                 selectedLanguage: this.oUser.getLanguage(),
+                selectedLanguageText: this.oUser.getLanguageText(),
                 selectedDateFormat: sExampleDate,
                 selectedTimeFormat: sTimeFormat,
                 selectedDecimalFormat: sDecimalFormat,
@@ -50,25 +52,27 @@ sap.ui.define([
                 selectedWorkWeek: sWorkWeek
             });
 
-            this.getView().setBusy(true);
+            if (bIsEnableSetLanguage) {
+                this.getView().setBusy(true);
 
-            this._loadLanguagesList().then(function (aLanguageList) {
-                if (aLanguageList?.length > 1) {
-                    oModel.setProperty("/languageList", aLanguageList);
+                this._loadLanguagesList().then((aLanguageList) => {
+                    if (aLanguageList?.length > 1) {
+                        oModel.setProperty("/languageList", aLanguageList);
 
-                    if (!bIsLanguagePersonalized) {
-                        var bHasDefault = aLanguageList.some(function (oLanguage) {
-                            return oLanguage.key === "default";
-                        });
+                        if (!bIsLanguagePersonalized) {
+                            const bHasDefault = aLanguageList.some((oLanguage) => {
+                                return oLanguage.key === "default";
+                            });
 
-                        if (bHasDefault) {
-                            oModel.setProperty("/selectedLanguage", "default");
+                            if (bHasDefault) {
+                                oModel.setProperty("/selectedLanguage", "default");
+                            }
                         }
                     }
-                }
 
-                this.getView().setBusy(false);
-            }.bind(this));
+                    this.getView().setBusy(false);
+                });
+            }
 
             this.oView.setModel(oModel);
         },
@@ -81,15 +85,15 @@ sap.ui.define([
         _loadLanguagesList: function () {
             Measurement.start("FLP:UserLanguageAndRegion._getLanguagesList", "_getLanguagesList", "FLP");
             return Container.getServiceAsync("UserInfo")
-                .then(function (UserInfo) {
-                    return new Promise(function (resolve) {
+                .then((UserInfo) => {
+                    return new Promise((resolve) => {
                         Measurement.start("FLP:UserLanguageAndRegion._getLanguagesList", "_getLanguagesList", "FLP");
                         UserInfo.getLanguageList()
-                            .done(function (oData) {
+                            .done((oData) => {
                                 Measurement.end("FLP:UserLanguageAndRegion._getLanguagesList");
                                 resolve(oData);
                             })
-                            .fail(function (error) {
+                            .fail((error) => {
                                 Measurement.end("FLP:UserLanguageAndRegion._getLanguagesList");
                                 Log.error("Failed to load language list.", error,
                                     "sap.ushell.components.ushell.settings.UserLanguageAndRegion.UserLanguageAndRegion.controller");
@@ -104,20 +108,20 @@ sap.ui.define([
          * @private
          */
         _resetLanguage: function () {
-            var oUserLanguage = this.oUser.getLanguage(),
-                oModel = this.getView().getModel(),
-                oModelData = oModel.getData();
+            const oUserLanguage = this.oUser.getLanguage();
+            const oModel = this.getView().getModel();
+            const oModelData = oModel.getData();
             // if the user language isn't personalzied - need to return browser language in select
-            var sSelectedLanguage = oModelData.isLanguagePersonalized ? oUserLanguage : "default";
+            const sSelectedLanguage = oModelData.isLanguagePersonalized ? oUserLanguage : "default";
             oModel.setProperty("/selectedLanguage", sSelectedLanguage);
             // Date and time format are taken from current language
             this._updateTextFields(sSelectedLanguage);
         },
 
         onCancel: function () {
-            var oModel = this.getView().getModel(),
-                oModelData = oModel.getData(),
-                aLanguageList = oModelData.languageList;
+            const oModel = this.getView().getModel();
+            const oModelData = oModel.getData();
+            const aLanguageList = oModelData.languageList;
 
             if (aLanguageList && aLanguageList.length > 0) {
                 this._resetLanguage();
@@ -125,7 +129,7 @@ sap.ui.define([
         },
 
         onSaveSuccess: function (oUser) {
-            var oResolvedResult = {
+            const oResolvedResult = {
                 refresh: true
             };
 
@@ -134,7 +138,7 @@ sap.ui.define([
             oResolvedResult.obsoleteUrlParams = ["sap-language"];
             oResolvedResult.clearSapUserContextCookie = true; // Language related content in `sap-usercontext` cookie is invalid now.
 
-            return oResolvedResult; //refresh the page to apply changes.
+            return oResolvedResult; // refresh the page to apply changes.
         },
 
         /**
@@ -145,12 +149,12 @@ sap.ui.define([
          * @private
          */
         onSave: function (fnUpdateUserPreferences) {
-            var oUser = this.oUser,
-                oModelData = this.getView().getModel().getData(),
-                sSelectedLanguage = oModelData.selectedLanguage,
-                sOriginLanguage = oUser.getLanguage(),
-                bLanguageChanged = sSelectedLanguage && sSelectedLanguage !== (oModelData.isLanguagePersonalized ? sOriginLanguage : "default"),
-                bUpdateLanguage = oModelData.languageList && oModelData.languageList.length > 0 && bLanguageChanged;
+            const oUser = this.oUser;
+            const oModelData = this.getView().getModel().getData();
+            const sSelectedLanguage = oModelData.selectedLanguage;
+            const sOriginLanguage = oUser.getLanguage();
+            const bLanguageChanged = sSelectedLanguage && sSelectedLanguage !== (oModelData.isLanguagePersonalized ? sOriginLanguage : "default");
+            const bUpdateLanguage = oModelData.languageList && oModelData.languageList.length > 0 && bLanguageChanged;
 
             Log.debug("[000] UserLanguageAndRegion:onSave:bUpdateLanguage:", bUpdateLanguage, "UserLanguageAndRegion.controller");
             if (bUpdateLanguage) {
@@ -158,12 +162,12 @@ sap.ui.define([
                 oUser.setLanguage(sSelectedLanguage);
 
                 return fnUpdateUserPreferences()
-                    .then(function () {
+                    .then(() => {
                         Log.debug("[000] onSave:fnUpdateUserPreferences", "UserLanguageAndRegion.controller");
                         return this.onSaveSuccess(oUser);
-                    }.bind(this))
+                    })
                     // in case of failure - return to the original language
-                    .catch(function (errorMessage) {
+                    .catch((errorMessage) => {
                         Log.debug("[000] onSave:catch:errorMessage", errorMessage, "UserLanguageAndRegion.controller");
 
                         oUser.setLanguage(sOriginLanguage);
@@ -173,7 +177,7 @@ sap.ui.define([
                         Log.error("Failed to save Language and Region Settings", errorMessage,
                             "sap.ushell.adapters.cdm.Settings.cdmUserLanguageRegion.UserLanguageAndRegion.controller");
                         throw errorMessage;
-                    }.bind(this));
+                    });
             }
 
             this._resetLanguage();
@@ -186,7 +190,7 @@ sap.ui.define([
          * @private
          */
         _handleLanguageSelectChange: function (oEvent) {
-            var sSelectedLanguage = oEvent.getSource().getSelectedKey();
+            const sSelectedLanguage = oEvent.getSource().getSelectedKey();
             if (sSelectedLanguage) {
                 this._updateTextFields(sSelectedLanguage);
             }
@@ -199,10 +203,10 @@ sap.ui.define([
          */
         _updateTextFields: function (language) {
             Formatting.setLanguageTag(language);
-            var oLocale = new Locale(language);
+            const oLocale = new Locale(language);
 
-            var { sTimeFormat, sExampleDate, sDecimalFormat, sWorkWeek, sTimeZone } = this._getParsedLocaleProperties(oLocale);
-            var oModel = this.getView().getModel();
+            const { sTimeFormat, sExampleDate, sDecimalFormat, sWorkWeek, sTimeZone } = this._getParsedLocaleProperties(oLocale);
+            const oModel = this.getView().getModel();
 
             oModel.setProperty("/selectedTimeFormat", sTimeFormat);
             oModel.setProperty("/selectedDateFormat", sExampleDate);
@@ -218,17 +222,17 @@ sap.ui.define([
          * @private
          */
         _getParsedLocaleProperties: function (oLocale) {
-            var oLocaleData = LocaleData.getInstance(oLocale);
-            var sDatePattern = oLocaleData.getDatePattern("medium");
-            var sTimePattern = oLocaleData.getTimePattern("medium");
+            const oLocaleData = LocaleData.getInstance(oLocale);
+            const sDatePattern = oLocaleData.getDatePattern("medium");
+            const sTimePattern = oLocaleData.getTimePattern("medium");
 
-            var oDateFormat = DateFormat.getDateInstance({
+            const oDateFormat = DateFormat.getDateInstance({
                 pattern: sDatePattern
             });
 
-            var sDecimalPattern = oLocaleData.getDecimalPattern();
+            const sDecimalPattern = oLocaleData.getDecimalPattern();
 
-            var oNumberFormat = NumberFormat.getInstance({
+            const oNumberFormat = NumberFormat.getInstance({
                 pattern: sDecimalPattern
             });
 
@@ -243,7 +247,7 @@ sap.ui.define([
                 sTimeFormat: (sTimePattern.indexOf("H") === -1) ? oResources.i18n.getText("fld12h") : oResources.i18n.getText("fld24h"),
                 sExampleDate: oDateFormat.format(new Date()),
                 sDecimalFormat: oNumberFormat.format(1000.2),
-                sWorkWeek: aWorkWeekDays[0] + " - " + aWorkWeekDays[aWorkWeekDays.length - 1],
+                sWorkWeek: `${aWorkWeekDays[0]} - ${aWorkWeekDays[aWorkWeekDays.length - 1]}`,
                 sTimeZone: Localization.getTimezone()
             };
         }

package/src/main/js/sap/ushell/adapters/cdm/Settings/UserLanguageAndRegion/UserLanguageAndRegion.view.xml

@@ -36,8 +36,11 @@
                 <core:Icon src="sap-icon://information" tooltip="{i18n>timeZoneTooltip}"/>
             </HBox>
 
-            <Label text="{i18n>languageSlashRegion}" labelFor="languageSelectionSelect"/>
+            <Label id="languageSettingsFormLabel" text="{i18n>languageAndRegionTit}" visible="{= !${/languageList}}" labelFor="languageSelectionText"/>
+            <Text id="languageSelectionText" text="{/selectedLanguageText}" visible="{= !${/languageList} }"/>
+            <Label id="languageSelectionLabel" text="{i18n>languageAndRegionTit}" visible="{= !!${/languageList}}" labelFor="languageSelectionSelect"/>
             <ComboBox id="languageSelectionSelect"
+                visible="{= !!${/languageList} }"
                 items="{/languageList}"
                 selectedKey="{/selectedLanguage}"
                 valueState="{= ${/selectedLanguage} ? 'None' : 'Error'}"
@@ -68,4 +71,4 @@
         <Text text="{i18n>LanguageAndRegionHelpingText}" class="sapUshellFlpSettingsWideDescription" visible="{= !!${/languageList}}" width="100%"/>
         </VBox>
     </FlexBox>
-</mvc:View>
+</mvc:View>

package/src/main/js/sap/ushell/adapters/cdm/Ui5ComponentLoaderAdapter.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's Ui5ComponentLoaderAdapter for the CDM platform
  *
- * @version 1.136.2
+ * @version 1.136.4
  */
 sap.ui.define([
 ], function () {

package/src/main/js/sap/ushell/adapters/cdm/_LaunchPage/modifyHome.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview Helper of modifying the home page data for the 'CDM' platform.
- * @version 1.136.2
+ * @version 1.136.4
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/_LaunchPage/readCatalogs.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview Helper of accessing catalog data for the 'CDM' platform.
- * @version 1.136.2
+ * @version 1.136.4
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/_LaunchPage/readHome.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Helper of accessing Home Page data for the 'CDM' platform.
  *
- * @version 1.136.2
+ * @version 1.136.4
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/_LaunchPage/uri.transform.js

@@ -4,7 +4,7 @@
  * @fileOverview Transforms relative URIs as used e.g. for data sources in the
  * manifest.json
  *
- * @version 1.136.2
+ * @version 1.136.4
  */
 sap.ui.define([
     "sap/ui/thirdparty/URI"