@openui5/sap.ui.core 1.116.0 → 1.117.0

package/.eslintrc.json

@@ -55,7 +55,7 @@
 				// "multiline" doesn't match our style
 				"object-curly-newline": ["error", {"consistent": true}],
 				"object-curly-spacing": "error",
-				"one-var": "error", // let's see how this fits let, const, require
+				"one-var": ["error", {"const" : "never", "let": "never", "var": "always"}],
 				"one-var-declaration-per-line": ["error", "initializations"],
 				"operator-assignment": "error",
 				"operator-linebreak": ["error", "before"],
@@ -128,27 +128,6 @@
 			"rules": {
 				"max-len": "off"
 			}
-		},
-		{
-			"files": [
-				"test/sap/ui/core/loader/fixture/make.js",
-				"test/sap/ui/core/qunit/test/starter/find/*.js",
-				"test/sap/ui/core/qunit/testdata/libraries/make.js"
-			],
-			"parserOptions": {
-				"ecmaVersion": 6
-			}
-		},
-		{
-			"files": [
-				"src/ui5loader.js"
-			],
-			"env": {
-				"es2022": true
-			},
-			"parserOptions": {
-				"ecmaVersion": 2022
-			}
 		}
 	]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.core",
-  "version": "1.116.0",
+  "version": "1.117.0",
   "description": "OpenUI5 Core Library sap.ui.core",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",

package/src/jquery.sap.global.js

@@ -208,7 +208,7 @@ sap.ui.define([
 	/**
 	 * Root Namespace for the jQuery plug-in provided by SAP SE.
 	 *
-	 * @version 1.116.0
+	 * @version 1.117.0
 	 * @namespace
 	 * @public
 	 * @static

package/src/jquery.sap.properties.js

@@ -67,7 +67,7 @@ sap.ui.define(['jquery.sap.global', 'sap/base/util/Properties'],
 	 * {@link #setProperty} to store or change a value for a key and {@link #getKeys}
 	 * can be used to retrieve an array of all keys that are currently stored in the collection.
 	 *
-	 * @version 1.116.0
+	 * @version 1.117.0
 	 * @since 0.9.0
 	 * @name jQuery.sap.util.Properties
 	 * @public

package/src/jquery.sap.resources.js

@@ -99,7 +99,7 @@ sap.ui.define([
 	 * Exception: Fallback for "zh_HK" is "zh_TW" before zh.
 	 *
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.117.0
 	 * @since 0.9.0
 	 * @name jQuery.sap.util.ResourceBundle
 	 * @public

package/src/jquery.sap.script.js

@@ -267,7 +267,7 @@ sap.ui.define([
 	 * Use {@link jQuery.sap.getUriParameters} to create an instance of jQuery.sap.util.UriParameters.
 	 *
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.117.0
 	 * @since 0.9.0
 	 * @name jQuery.sap.util.UriParameters
 	 * @public

package/src/jquery.sap.storage.js

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @param {string} [sIdPrefix] Prefix used for the Ids. If not set a default prefix is used.
 	 * @returns {jQuery.sap.storage.Storage}
 	 *
-	 * @version 1.116.0
+	 * @version 1.117.0
 	 * @since 0.11.0
 	 * @namespace
 	 * @public
@@ -97,7 +97,7 @@ sap.ui.define([
 	 * should be deleted the method {@link #removeAll} should be used.
 	 *
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.117.0
 	 * @since 0.11.0
 	 * @public
 	 * @name jQuery.sap.storage.Storage
@@ -201,7 +201,7 @@ sap.ui.define([
 	 * Enumeration of the storage types supported by {@link jQuery.sap.storage.Storage}
 	 * @enum {string}
 	 * @public
-	 * @version 1.116.0
+	 * @version 1.117.0
 	 * @since 0.11.0
 	 */
 	jQuery.sap.storage.Type = Storage.Type;

package/src/sap/base/Event.js

@@ -3,7 +3,7 @@
  * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-// Provides class sap.base.Event
+// Provides class module:sap/base/Event
 sap.ui.define(["sap/base/assert"],
 	function(assert) {
 	"use strict";
@@ -15,11 +15,11 @@ sap.ui.define(["sap/base/assert"],
 	 * @class Creates an event with the given <code>sType</code>, linked to the provided <code>oTarget</code> and enriched with the <code>oParameters</code>.
 	 *
 	 * @param {string} sType The type of the event
-	 * @param {sap.base.Eventing} oTarget Target of the event
+	 * @param {module:sap/base/Eventing} oTarget Target of the event
 	 * @param {object} oParameters Parameters for this event. The parameters will be accessible as properties of the Event instance.
 	 *
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.117.0
 	 * @alias module:sap/base/Event
 	 * @private
 	 * @ui5-restricted sap.ui.core
@@ -93,7 +93,7 @@ sap.ui.define(["sap/base/assert"],
 
 	/**
 	 * Returns the event parameters as map
-	 * @param {sap.base.Event} oEvent The event object to retrieve the parameters
+	 * @param {module:sap/base/Event} oEvent The event object to retrieve the parameters
 	 * @returns {object} Map of event parameters
 	 * @private
 	 * @ui5-restricted sap/base/i18n sap.ui.core

package/src/sap/base/Eventing.js

@@ -18,8 +18,8 @@ sap.ui.define([
 	 * Eventing mixin
 	 *
 	 * @author SAP SE
-	 * @version 1.116.0
-	 * @param {sap.base.Event} fnEventClass The Event class
+	 * @version 1.117.0
+	 * @param {module:sap/base/Event} fnEventClass The Event class
 	 * @mixin module:sap/base/Eventing
 	 * @private
 	 * @ui5-restricted sap.ui.core sap/base/i18n sap/ui/base/EventProvider
@@ -241,7 +241,7 @@ sap.ui.define([
 	 * As the callers are limited and known and for performance reasons the internal event registry
 	 * is returned. It contains more information than necessary, but needs no expensive conversion.
 	 *
-	 * @param {sap.base.Eventing} oEventing The event provider to get the registered events for
+	 * @param {module:sap/base/Eventing} oEventing The event provider to get the registered events for
 	 * @return {object} the list of events currently having listeners attached
 	 * @name module:sap/base/Eventing.getEventList
 	 * @function
@@ -258,7 +258,7 @@ sap.ui.define([
 	 * Returns true if function and listener object both match the corresponding parameters of
 	 * at least one listener registered for the named event.
 	 *
-	 * @param {sap.base.Eventing}
+	 * @param {module:sap/base/Eventing}
 	 *            oEventing The event provider to get the registered events for
 	 * @param {string}
 	 *            sType The type of the event to check listeners for
@@ -293,7 +293,7 @@ sap.ui.define([
 	 * structured, this can be overwritten to make the object hierarchy visible to the Eventing and
 	 * enables the use of event bubbling within this object hierarchy.
 	 *
-	 * @return {sap.base.Eventing|null} The parent event provider
+	 * @return {module:sap/base/Eventing|null} The parent event provider
 	 * @name module:sap/base/Eventing#getEventingParent
 	 * @function
 	 * @protected
@@ -307,7 +307,6 @@ sap.ui.define([
 	 *
 	 * The object must not be used anymore after destroy was called.
 	 *
-	 * @see sap.base.Object#destroy
 	 * @name module:sap/base/Eventing#destroy
 	 * @function
 	 * @public

package/src/sap/base/config/MemoryConfigurationProvider.js

@@ -3,11 +3,20 @@
  * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-sap.ui.define([], function() {
+sap.ui.define([
+    "sap/base/util/uid"
+], function(
+    uid
+) {
     "use strict";
 
     var MemoryConfigurationProvider = function() {
         this.oConfig = Object.create(null);
+        this.id = uid();
+    };
+
+    MemoryConfigurationProvider.prototype.getId = function() {
+        return this.id;
     };
 
     MemoryConfigurationProvider.prototype.get = function(sName) {

package/src/sap/base/config.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * The base Configuration.
 	 *
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.117.0
 	 * @private
 	 * @alias module:sap/base/config
 	 * @namespace
@@ -26,7 +26,7 @@ sap.ui.define([
 
 	/**
 	 * Returns a writable base configuration instance
-	 * @returns {sap.base.config} The writable base configuration
+	 * @returns {module:sap/base/config} The writable base configuration
 	 */
 	_Configuration.getWritableInstance = function() {
 		var oProvider = new MemoryConfigurationProvider();
@@ -36,6 +36,7 @@ sap.ui.define([
 				var rValidKey = /^[a-z][A-Za-z0-9]*$/;
 				if (rValidKey.test(sName)) {
 					oProvider.set(sName, vValue);
+					_Configuration._.invalidate();
 				} else {
 					throw new TypeError(
 						"Invalid configuration key '" + sName + "'!"

package/src/sap/base/i18n/Formatting.js

@@ -76,8 +76,7 @@ sap.ui.define([
 	 * or, throws an error for non BCP-47 compliant languages.
 	 *
 	 * @param {string} sLanguageTag A BCP-47 compliant language tag
-	 * @return {sap.base.i18n.LanguageTag} The resulting LanguageTag
-	 * @throws {TypeError} Throws a TypeError for unknown languages
+	 * @returns {module:sap/base/i18n/LanguageTag} The resulting LanguageTag
 	 * @private
 	 */
 	function createLanguageTag(sLanguageTag) {
@@ -121,7 +120,7 @@ sap.ui.define([
 
 		/**
 		 * Attaches the <code>fnFunction</code> event handler to the {@link #event:change change} event
-		 * of <code>sap.base.i18n.Formatting</code>.
+		 * of <code>module:sap/base/i18n/Formatting</code>.
 		 *
 		 * @param {function} fnFunction
 		 *   The function to be called when the event occurs
@@ -134,7 +133,7 @@ sap.ui.define([
 
 		/**
 		 * Detaches event handler <code>fnFunction</code> from the {@link #event:change change} event of
-		 * this <code>sap.base.i18n.Formatting</code>.
+		 * this <code>module:sap/base/i18n/Formatting</code>.
 		 *
 		 * @param {function} fnFunction Function to be called when the event occurs
 		 * @private
@@ -155,7 +154,7 @@ sap.ui.define([
 		 * is added to the LanguageTag, indicating to the framework that these user preferences
 		 * should be applied.
 		 *
-		 * @return {sap.base.i18n.LanguageTag} the format LanguageTag
+		 * @returns {module:sap/base/i18n/LanguageTag} the format LanguageTag
 		 * @public
 		 */
 		getLanguageTag : function() {
@@ -177,7 +176,7 @@ sap.ui.define([
 			return oWritableConfig.get({
 				name: "sapUiFormatLocale",
 				type: function(sFormatLocale) {return new LanguageTag(sFormatLocale);},
-				defaultValue: fallback(this),
+				defaultValue: fallback.bind(Formatting, this),
 				external: true
 			});
 		},
@@ -207,7 +206,7 @@ sap.ui.define([
 		 * @param {string|null} sLanguageTag the new BCP47 compliant language tag;
 		 *   case doesn't matter and underscores can be used instead of dashes to separate
 		 *   components (compatibility with Java Locale IDs)
-		 * @return {this} <code>this</code> to allow method chaining
+		 * @returns {this} <code>this</code> to allow method chaining
 		 * @public
 		 * @throws {Error} When <code>sLanguageTag</code> is given, but is not a valid BCP47 language
 		 *   tag or Java locale identifier
@@ -231,6 +230,7 @@ sap.ui.define([
 		},
 
 		_set : function(sKey, oValue) {
+			BaseConfig._.invalidate();
 			var oOldValue = mSettings[sKey];
 			if ( oValue != null ) {
 				mSettings[sKey] = oValue;
@@ -251,7 +251,7 @@ sap.ui.define([
 		/**
 		 * Retrieves the custom units.
 		 * These custom units are set by {@link #setCustomUnits} and {@link #addCustomUnits}
-		 * @return {object} custom units object
+		 * @returns {object} custom units object
 		 * @see #setCustomUnits
 		 * @see #addCustomUnits
 		 */
@@ -378,8 +378,8 @@ sap.ui.define([
 
 		/**
 		 * Returns the currently set date pattern or undefined if no pattern has been defined.
-		 * @param {string} sStyle The date style (short, medium, long or full)
-		 * @return {string} The resulting date pattern
+		 * @param {"short"|"medium"|"long"|"full"} sStyle The date style (short, medium, long or full)
+		 * @returns {string} The resulting date pattern
 		 * @public
 		 */
 		getDatePattern : function(sStyle) {
@@ -400,7 +400,7 @@ sap.ui.define([
 		 * specific parts of the UI. See the documentation of {@link module:sap/base/i18n/Localization.getLanguage Localization.getLanguage()}
 		 * for details and restrictions.
 		 *
-		 * @param {string} sStyle must be one of short, medium, long or full.
+		 * @param {"short"|"medium"|"long"|"full"} sStyle must be one of short, medium, long or full.
 		 * @param {string} sPattern the format pattern to be used in LDML syntax.
 		 * @returns {this} Returns <code>this</code> to allow method chaining
 		 * @public
@@ -413,8 +413,8 @@ sap.ui.define([
 
 		/**
 		 * Returns the currently set time pattern or undefined if no pattern has been defined.
-		 * @param {string} sStyle The time style (short, medium, long or full)
-		 * @return {string} The resulting time pattern
+		 * @param {"short"|"medium"|"long"|"full"} sStyle The time style (short, medium, long or full)
+		 * @returns {string} The resulting time pattern
 		 * @public
 		 */
 		getTimePattern : function(sStyle) {
@@ -436,7 +436,7 @@ sap.ui.define([
 		 * {@link module:sap/base/i18n/Localization.getLanguage Localization.getLanguage()}
 		 * for details and restrictions.
 		 *
-		 * @param {string} sStyle must be one of short, medium, long or full.
+		 * @param {"short"|"medium"|"long"|"full"} sStyle must be one of short, medium, long or full.
 		 * @param {string} sPattern the format pattern to be used in LDML syntax.
 		 * @returns {this} Returns <code>this</code> to allow method chaining
 		 * @public
@@ -451,7 +451,7 @@ sap.ui.define([
 		 * Returns the currently set number symbol of the given type or undefined if no symbol has been defined.
 		 *
 		 * @param {"group"|"decimal"|"plusSign"|"minusSign"} sType the type of symbol
-		 * @return {string} A non-numerical symbol used as part of a number for the given type,
+		 * @returns {string} A non-numerical symbol used as part of a number for the given type,
 		 *   e.g. for locale de_DE:
 		 *     <ul>
 		 *       <li>"group": "." (grouping separator)</li>
@@ -586,7 +586,7 @@ sap.ui.define([
 		/**
 		 * Returns the currently set legacy ABAP date format (its id) or undefined if none has been set.
 		 *
-		 * @return {"1"|"2"|"3"|"4"|"5"|"6"|"7"|"8"|"9"|"A"|"B"|"C"|undefined} ID of the ABAP date format,
+		 * @returns {"1"|"2"|"3"|"4"|"5"|"6"|"7"|"8"|"9"|"A"|"B"|"C"|undefined} ID of the ABAP date format,
 		 *   if not set or set to <code>""</code>, <code>undefined</code> will be returned
 		 * @public
 		 */
@@ -594,7 +594,6 @@ sap.ui.define([
 			var sLegacyDateFormat = oWritableConfig.get({
 				name: "sapUiLegacyDateFormat",
 				type: BaseConfig.Type.String,
-				defaultValue: undefined,
 				external: true
 			});
 			return sLegacyDateFormat ? sLegacyDateFormat.toUpperCase() : undefined;
@@ -638,7 +637,7 @@ sap.ui.define([
 		/**
 		 * Returns the currently set legacy ABAP time format (its id) or undefined if none has been set.
 		 *
-		 * @return {"0"|"1"|"2"|"3"|"4"|undefined} ID of the ABAP date format,
+		 * @returns {"0"|"1"|"2"|"3"|"4"|undefined} ID of the ABAP date format,
 		 *   if not set or set to <code>""</code>, <code>undefined</code> will be returned
 		 * @public
 		 */
@@ -646,7 +645,6 @@ sap.ui.define([
 			var sLegacyTimeFormat = oWritableConfig.get({
 				name: "sapUiLegacyTimeFormat",
 				type: BaseConfig.Type.String,
-				defaultValue: undefined,
 				external: true
 			});
 			return sLegacyTimeFormat ? sLegacyTimeFormat.toUpperCase() : undefined;
@@ -692,7 +690,7 @@ sap.ui.define([
 		/**
 		 * Returns the currently set legacy ABAP number format (its id) or undefined if none has been set.
 		 *
-		 * @return {" "|"X"|"Y"|undefined} ID of the ABAP number format,
+		 * @returns {" "|"X"|"Y"|undefined} ID of the ABAP number format,
 		 *   if not set or set to <code>""</code>, <code>undefined</code> will be returned
 		 * @public
 		 */
@@ -700,7 +698,6 @@ sap.ui.define([
 			var sLegacyNumberFormat = oWritableConfig.get({
 				name: "sapUiLegacyNumberFormat",
 				type: BaseConfig.Type.String,
-				defaultValue: undefined,
 				external: true
 			});
 			return sLegacyNumberFormat ? sLegacyNumberFormat.toUpperCase() : undefined;
@@ -765,7 +762,7 @@ sap.ui.define([
 		/**
 		 * Returns the currently set customizing data for Islamic calendar support
 		 *
-		 * @return {object[]} Returns an array contains the customizing data. Each element in the array has properties: dateFormat, islamicMonthStart, gregDate. For details, please see {@link #setLegacyDateCalendarCustomizing}
+		 * @returns {object[]} Returns an array contains the customizing data. Each element in the array has properties: dateFormat, islamicMonthStart, gregDate. For details, please see {@link #setLegacyDateCalendarCustomizing}
 		 * @public
 		 */
 		getLegacyDateCalendarCustomizing : function() {
@@ -818,7 +815,7 @@ sap.ui.define([
 		 * Returns a live object with the current settings
 		 * TODO this method is part of the facade to be accessible from LocaleData, but it shouldn't be
 		 *
-		 * @return {mSettings} The custom LocaleData settings object
+		 * @returns {mSettings} The custom LocaleData settings object
 		 * @private
 		 */
 		getCustomLocaleData : function() {
@@ -827,9 +824,9 @@ sap.ui.define([
 
 		/**
 		 * Returns the calendar week numbering algorithm used to determine the first day of the week
-		 * and the first calendar week of the year, see {@link sap.base.i18n.CalendarWeekNumbering}.
+		 * and the first calendar week of the year, see {@link module:sap/base/i18n/data/CalendarWeekNumbering}.
 		 *
-		 * @returns {sap.base.i18n.CalendarWeekNumbering} The calendar week numbering algorithm
+		 * @returns {module:sap/base/i18n/date/CalendarWeekNumbering} The calendar week numbering algorithm
 		 *
 		 * @public
 		 * @since 1.113.0
@@ -852,15 +849,15 @@ sap.ui.define([
 
 		/**
 		 * Sets the calendar week numbering algorithm which is used to determine the first day of the week
-		 * and the first calendar week of the year, see {@link sap.base.i18n.CalendarWeekNumbering}.
+		 * and the first calendar week of the year, see {@link module:sap/base/i18n/date/CalendarWeekNumbering}.
 		 *
-		 * @param {sap.base.i18n.CalendarWeekNumbering} sCalendarWeekNumbering
+		 * @param {module:sap/base/i18n/date/CalendarWeekNumbering} sCalendarWeekNumbering
 		 *   The calendar week numbering algorithm
 		 * @returns {this}
 		 *   <code>this</code> to allow method chaining
 		 * @throws {Error}
 		 *   If <code>sCalendarWeekNumbering</code> is not a valid calendar week numbering algorithm,
-		 *   defined in {@link sap.base.i18n.CalendarWeekNumbering}
+		 *   defined in {@link module:sap/base/i18n/date/CalendarWeekNumbering}
 		 *
 		 * @public
 		 * @since 1.113.0
@@ -891,7 +888,7 @@ sap.ui.define([
 		 * When it's explicitly set by calling <code>setCalendar</code>, the set calendar type is returned.
 		 * Otherwise, the calendar type is determined by checking the format settings and current locale.
 		 *
-		 * @return {sap.base.i18n.CalendarType} the current calendar type, e.g. <code>Gregorian</code>
+		 * @returns {module:sap/base/i18n/date/CalendarType} the current calendar type, e.g. <code>Gregorian</code>
 		 * @since 1.28.6
 		 */
 		getCalendarType: function() {
@@ -899,10 +896,11 @@ sap.ui.define([
 				sCalendarType = oWritableConfig.get({
 					name: "sapUiCalendarType",
 					type: BaseConfig.Type.String,
-					defaultValue: null,
 					external: true
 				});
 
+			sCalendarType = sCalendarType || null;
+
 			if (sCalendarType) {
 				for (sName in CalendarType) {
 					if (sName.toLowerCase() === sCalendarType.toLowerCase()) {
@@ -940,9 +938,9 @@ sap.ui.define([
 		 * Sets the new calendar type to be used from now on in locale dependent functionality (for example,
 		 * formatting, translation texts, etc.).
 		 *
-		 * @param {sap.base.i18n.CalendarType|null} sCalendarType the new calendar type. Set it with null to clear the calendar type
+		 * @param {module:sap/base/i18n/date/CalendarType|null} sCalendarType the new calendar type. Set it with null to clear the calendar type
 		 *   and the calendar type is calculated based on the format settings and current locale.
-		 * @return {this} <code>this</code> to allow method chaining
+		 * @returns {this} <code>this</code> to allow method chaining
 		 * @public
 		 * @since 1.28.6
 		 */

package/src/sap/base/i18n/LanguageTag.js

@@ -4,7 +4,7 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-//Provides the LanguageTag object sap.base.i18n.LanguageTag
+//Provides the LanguageTag object module:sap/base/i18n/LanguageTag
 sap.ui.define([
 ], function(
 ) {
@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @param {string} sLanguageTag the language tag identifier, in format en-US or en_US.
 	 *
 	 * @author SAP SE
-	 * @version 1.116.0
+	 * @version 1.117.0
 	 * @private
 	 * @ui5-restricted sap.ui.core sap/base/i18n
 	 * @alias module:sap/base/i18n/LanguageTag

package/src/sap/base/i18n/Localization.js

@@ -128,7 +128,7 @@ sap.ui.define([
 	 *
 	 * As of 3/2013 config is true for all locales/regions supported by UI5.
 	 *
-	 * @param {sap.base.i18n.LanguageTag} oLanguageTag LanguageTag to check
+	 * @param {module:sap/base/i18n/LanguageTag} oLanguageTag LanguageTag to check
 	 * @returns {boolean} <code>true</code> if <code>vLanguage</code> implies RTL,
 	 *  otherwise <code>false</code>
 	 * @private
@@ -172,7 +172,7 @@ sap.ui.define([
 	 * or, throws an error for non BCP-47 compliant languages.
 	 *
 	 * @param {string} sLanguage A BCP-47 compliant language
-	 * @return {sap.base.i18n.LanguageTag} The resulting LanguageTag
+	 * @returns {module:sap/base/i18n/LanguageTag} The resulting LanguageTag
 	 * @throws {TypeError} Throws a TypeError for unknown languages
 	 * @private
 	 */
@@ -241,7 +241,7 @@ sap.ui.define([
 
 		/**
 		 * Attaches the <code>fnFunction</code> event handler to the {@link #event:change change} event
-		 * of <code>sap.base.i18n.Localization</code>.
+		 * of <code>module:sap/base/i18n/Localization</code>.
 		 *
 		 * @param {function} fnFunction
 		 *   The function to be called when the event occurs
@@ -254,7 +254,7 @@ sap.ui.define([
 
 		/**
 		 * Detaches event handler <code>fnFunction</code> from the {@link #event:change change} event of
-		 * this <code>sap.base.i18n.Localization</code>.
+		 * this <code>module:sap/base/i18n/Localization</code>.
 		 *
 		 * @param {function} fnFunction Function to be called when the event occurs
 		 * @private
@@ -290,9 +290,9 @@ sap.ui.define([
 		 * </pre>
 		 *
 		 * For a normalized BCP47 tag, call {@link #getLanguageTag} or call {@link #getLanguageTag} to get a
-		 * {@link sap.base.i18n.LanguageTag LanguageTag} object matching the language.
+		 * {@link module:sap/base/i18n/LanguageTag LanguageTag} object matching the language.
 		 *
-		 * @return {string} Language string as configured
+		 * @returns {string} Language string as configured
 		 * @public
 		 */
 		getLanguage : function () {
@@ -418,20 +418,19 @@ sap.ui.define([
 		setLanguage : function (sLanguage, sSAPLogonLanguage) {
 			var oLanguageTag = createLanguageTag(sLanguage),
 				bOldRTL = Localization.getRTL();
-
 			check(oLanguageTag, "Configuration.setLanguage: sLanguage must be a valid BCP47 language tag");
 			check(sSAPLogonLanguage == null || (typeof sSAPLogonLanguage === 'string' && /^[A-Z0-9]{2,2}$/i.test(sSAPLogonLanguage)),
 				"Configuration.setLanguage: sSAPLogonLanguage must be null or be a string of length 2, consisting of digits and latin characters only");
 
+			sSAPLogonLanguage = sSAPLogonLanguage || "";
 			if ( oLanguageTag.toString() != Localization.getLanguageTag().toString() ||
 				sSAPLogonLanguage !== oWritableConfig.get({
 					name: "sapLanguage",
 					type: BaseConfig.Type.String,
-					defaultValue: undefined,
 					external: true
 				})) {
 				oWritableConfig.set("sapLanguage", sSAPLogonLanguage);
-				oWritableConfig.set("sapUiLanguage", oLanguageTag.toString());
+				oWritableConfig.set("sapUiLanguage", sLanguage);
 				mChanges = {};
 				mChanges.language = Localization.getLanguageTag().toString();
 				var bRtl = Localization.getRTL();
@@ -478,12 +477,12 @@ sap.ui.define([
 		 * {@link topic:6c9e61dc157a40c19460660ece8368bc Dates, Times, Timestamps, and Time Zones}.
 		 *
 		 * When the timezone has changed, the Core will fire its
-		 * {@link sap.base.i18n.Localization#event:change change} event.
+		 * {@link module:sap/base/i18n/Localization#event:change change} event.
 		 *
 		 * @param {string|null} [sTimezone] IANA timezone ID, e.g. "America/New_York". Use <code>null</code> to reset the timezone to the browser's local timezone.
 		 *   An invalid IANA timezone ID will fall back to the browser's timezone.
 		 * @public
-		 * @return {this} <code>this</code> to allow method chaining
+		 * @returns {this} <code>this</code> to allow method chaining
 		 * @since 1.99.0
 		 */
 		setTimezone : function (sTimezone) {
@@ -506,7 +505,7 @@ sap.ui.define([
 		 *
 		 * The LanguageTag is derived from the {@link #getLanguage language} property.
 		 *
-		 * @return {sap.base.i18n.LanguageTag} The LanguageTag
+		 * @returns {module:sap/base/i18n/LanguageTag} The LanguageTag
 		 * @public
 		 */
 		getLanguageTag : function () {
@@ -532,7 +531,7 @@ sap.ui.define([
 		 * If no mode has been explicitly set (neither <code>true</code> nor <code>false</code>),
 		 * the mode is derived from the current language setting.
 		 *
-		 * @return {boolean} whether the page uses the RTL text direction
+		 * @returns {boolean} whether the page uses the RTL text direction
 		 * @public
 		 */
 		getRTL : function () {
@@ -544,7 +543,7 @@ sap.ui.define([
 				defaultValue: oWritableConfig.get({
 					name: "sapUiRtl",
 					type: BaseConfig.Type.Boolean,
-					defaultValue: impliesRTL(Localization.getLanguageTag()),
+					defaultValue: function() { return impliesRTL(Localization.getLanguageTag()); },
 					external:true
 				})
 			});
@@ -565,7 +564,7 @@ sap.ui.define([
 		 * <b>Note</b>: See documentation of {@link #setLanguage} for restrictions.
 		 *
 		 * @param {boolean|null} bRTL new character orientation mode or <code>null</code>
-		 * @return {this} <code>this</code> to allow method chaining
+		 * @returns {this} <code>this</code> to allow method chaining
 		 * @public
 		 */
 		setRTL : function(bRTL) {
@@ -599,7 +598,7 @@ sap.ui.define([
 		 * supported by the default set of SAP languages. config method has no knowledge
 		 * about the concrete languages of any given backend system.
 		 *
-		 * @param {sap.base.i18n.LanguageTag} oLanguageTag The Locale to calculate the SAPLogonLanguage
+		 * @param {module:sap/base/i18n/LanguageTag} oLanguageTag The Locale to calculate the SAPLogonLanguage
 		 * @returns {string} a language code that should
 		 * @private
 		 * @ui5-restricted sap.ui.core
@@ -634,7 +633,7 @@ sap.ui.define([
 		 * It will be returned in uppercase.
 		 * e.g. "EN", "DE"
 		 *
-		 * @return {string} The SAP logon language code for the current language
+		 * @returns {string} The SAP logon language code for the current language
 		 * @public
 		 */
 		getSAPLogonLanguage : function () {
@@ -659,7 +658,7 @@ sap.ui.define([
 		},
 
 		/**
-		 * @returns {sap.base.i18n.date.CalendarType} The preferred Calendar type.
+		 * @returns {module:sap/base/i18n/date/CalendarType} The preferred Calendar type.
 		 * @private
 		 * @ui5-restricted sap.ui.core
 		 */
@@ -675,7 +674,7 @@ sap.ui.define([
 		 *
 		 * Might return undefined if the information is not available.
 		 *
-		 * @return {array|undefined} List of Languages delivered with core
+		 * @returns {string[]|undefined} List of Languages delivered with core
 		 * @experimental
 		 */
 		getLanguagesDeliveredWithCore : function() {
@@ -683,7 +682,7 @@ sap.ui.define([
 		},
 
 		/**
-		 * @return {array} List of supported languages
+		 * @returns {string[]} List of supported languages
 		 * @experimental
 		 */
 		getSupportedLanguages : function() {