@openui5/sap.ui.core 1.120.1 → 1.120.3

package/src/sap/ui/core/UIComponent.js

@@ -1,6 +1,6 @@
 /*
  * OpenUI5
- * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -55,7 +55,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Component
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.120.1
+	 * @version 1.120.3
 	 * @alias sap.ui.core.UIComponent
 	 * @since 1.9.2
 	 */
@@ -457,7 +457,7 @@ sap.ui.define([
 				}
 			}
 			if (!fnConstructor) {
-				Log.error("The specified class for router or targets '" + vRoutingObjectConstructor + "' is undefined.", this);
+				Log.error("[FUTURE FATAL] The specified class for router or targets '" + vRoutingObjectConstructor + "' is undefined.", this);
 			}
 		} else {
 			fnConstructor = vRoutingObjectConstructor;
@@ -487,7 +487,7 @@ sap.ui.define([
 	UIComponent.prototype.rootControlLoaded = function() {
 		if (!this.pRootControlLoaded) {
 			Log.error(
-				"Mandatory init() not called for UIComponent: '" + this.getManifestObject().getComponentName() + "'. This is likely caused by a missing super call in the component's init implementation.",
+				"[FUTURE FATAL] Mandatory init() not called for UIComponent: '" + this.getManifestObject().getComponentName() + "'. This is likely caused by a missing super call in the component's init implementation.",
 				null,
 				"sap.ui.support",
 				function() {

package/src/sap/ui/core/UIComponentMetadata.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -18,7 +18,7 @@ sap.ui.define(['./ComponentMetadata', 'sap/ui/core/mvc/ViewType'],
 	 * @experimental Since 1.15.1. The Component concept is still under construction, so some implementation details can be changed in future.
 	 * @class
 	 * @author SAP SE
-	 * @version 1.120.1
+	 * @version 1.120.3
 	 * @since 1.15.1
 	 * @alias sap.ui.core.UIComponentMetadata
 	 * @extends sap.ui.core.ComponentMetadata

package/src/sap/ui/core/ValueStateSupport.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -16,7 +16,7 @@ sap.ui.define(['./Element', './library', './Lib', "sap/base/assert"],
 		 * Helper functionality for value state support.
 		 *
 		 * @author SAP SE
-		 * @version 1.120.1
+		 * @version 1.120.3
 		 * @public
 		 * @namespace sap.ui.core.ValueStateSupport
 		 */

package/src/sap/ui/core/VariantLayoutData.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -20,7 +20,7 @@ sap.ui.define(['./LayoutData', './library'],
 	 * @class
 	 * Allows to add multiple LayoutData to one control in case that an easy switch of layouts (e.g. in a Form) is needed.
 	 * @extends sap.ui.core.LayoutData
-	 * @version 1.120.1
+	 * @version 1.120.3
 	 *
 	 * @public
 	 * @since 1.9.2

package/src/sap/ui/core/XMLComposite.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -148,7 +148,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.120.1
+		 * @version 1.120.3
 		 * @since 1.56.0
 		 * @alias sap.ui.core.XMLComposite
 		 * @see {@link topic:b83a4dcb7d0e46969027345b8d32fd44 XML Composite Controls}

package/src/sap/ui/core/XMLCompositeMetadata.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @param {object} oClassInfo static info to construct the metadata from
 	 *
 	 * @author SAP SE
-	 * @version 1.120.1
+	 * @version 1.120.3
 	 * @since 1.50.0
 	 * @alias sap.ui.core.XMLCompositeMetadata
 	 * @extends sap.ui.core.ElementMetadata

package/src/sap/ui/core/XMLTemplateProcessor.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -87,7 +87,7 @@ function(
 
 				// if the parsed value is not valid, we don't fail but only log an error
 				if (!oType.isValid(vValue)) {
-					Log.error("Value '" + sValue + "' is not valid for type '" + oType.getName() + "'.");
+					Log.error("[FUTURE FATAL] Value '" + sValue + "' is not valid for type '" + oType.getName() + "'.");
 				}
 			}
 			// else keep original sValue (e.g. for enums)
@@ -741,7 +741,7 @@ function(
 			sNodeName = localName(node);
 			if (oView.isA("sap.ui.core.mvc.XMLView")) {
 				if ((sNodeName !== "View" && sNodeName !== "XMLView") || node.namespaceURI !== CORE_MVC_NAMESPACE) {
-					Log.error("XMLView's root node must be 'View' or 'XMLView' and have the namespace 'sap.ui.core.mvc'" + (sCurrentName ? " (View name: " + sCurrentName + ")" : ""));
+					Log.error("[FUTURE FATAL] XMLView's root node must be 'View' or 'XMLView' and have the namespace 'sap.ui.core.mvc'" + (sCurrentName ? " (View name: " + sCurrentName + ")" : ""));
 				}
 				// createRegularControls
 				pResultChain = pChain.then(function() {
@@ -764,6 +764,16 @@ function(
 			return bWrapped;
 		}
 
+		function scopedRunWithOwner(fnCreation) {
+			if (oView.fnScopedRunWithOwner) {
+				// We need to use the already created scoped runWithOwner function from the outer view instance.
+				// This way, the nested views are receiving the correct Owner component, across asynchronous calls.
+				return oView.fnScopedRunWithOwner(fnCreation);
+			} else {
+				return fnCreation();
+			}
+		}
+
 		/**
 		 * Requests the control class if not loaded yet.
 		 * If the View is set to async=true, an async XHR is sent, otherwise a sync XHR.
@@ -783,34 +793,49 @@ function(
 			// TODO guess library from sNamespaceURI and load corresponding lib!?
 			sClassName = sClassName || sNamespaceURI + "." + sLocalName;
 
-			// ensure that control and library are loaded
-			function getObjectFallback(oClassObject) {
-				// some modules might not return a class definition, so we fallback to the global
-				// this is against the AMD definition, but is required for backward compatibility
-				if (!oClassObject) {
-					Log.error("Control '" + sClassName + "' did not return a class definition from sap.ui.define.", "", "XMLTemplateProcessor");
-					oClassObject = ObjectPath.get(sClassName);
-				}
-				if (!oClassObject) {
-					Log.error("Can't find object class '" + sClassName + "' for XML-view", "", "XMLTemplateProcessor");
+			/**
+			 * Validates if a control class is available and provides error feedback otherwise.
+			 * @param {sap.ui.core.Control|undefined} fnClass control class or undefined if not returned as module content for its sap.ui.define factory
+			 * @return {sap.ui.core.Control|undefined} the resolved class.
+			 */
+			function validateClass(fnClass) {
+				if (!fnClass) {
+					let sErrorLogMessage = `[FUTURE FATAL] Control '${sClassName}' did not return a class definition from sap.ui.define.`;
+					/**
+					 * Some modules might not return a class definition, so we fallback to the global namespace.
+					 * This is against the AMD definition, but is required for backward compatibility.
+					 * @deprecated
+					 */
+					(() => {
+						fnClass = ObjectPath.get(sClassName);
+						if (fnClass) {
+							sErrorLogMessage += " The control class was instead retrieved via a deprecated access to the global namespace. This fallback behavior will be removed in the next major version (2.0).";
+						}
+					})();
+
+					Log.error(sErrorLogMessage, "", "XMLTemplateProcessor");
 				}
-				return oClassObject;
+				return fnClass;
 			}
 
 			var sResourceName = sClassName.replace(/\./g, "/");
 			var oClassObject = sap.ui.require(sResourceName);
 			if (!oClassObject) {
-				if (bAsync) {
-					return new Promise(function(resolve, reject) {
-						sap.ui.require([sResourceName], function(oClassObject) {
-							oClassObject = getObjectFallback(oClassObject);
-							resolve(oClassObject);
-						}, reject);
-					});
-				} else {
+				/**
+				 * Synchronous loading of control class
+				 * @deprecated since 1.120
+				 */
+				if (!bAsync) {
 					oClassObject = sap.ui.requireSync(sResourceName); // legacy-relevant: Sync path
-					oClassObject = getObjectFallback(oClassObject);
+					oClassObject = validateClass(oClassObject);
+					return oClassObject;
 				}
+				return new Promise(function(resolve, reject) {
+					sap.ui.require([sResourceName], function(oClassObject) {
+						oClassObject = validateClass(oClassObject);
+						resolve(oClassObject);
+					}, reject);
+				});
 			}
 			return oClassObject;
 		}
@@ -980,15 +1005,11 @@ function(
 									containingView: oView._oContainingView,
 									processingMode: oView._sProcessingMode // add processing mode, so it can be propagated to subviews inside the HTML block
 								};
+
 								// running with owner component
-								if (oView.fnScopedRunWithOwner) {
-									return oView.fnScopedRunWithOwner(function () {
-										return new oViewClass(mViewParameters);
-									});
-								}
-								// no owner component
-								// (or fully sync path, which handles the owner propagation on a higher level)
-								return new oViewClass(mViewParameters);
+								return scopedRunWithOwner(function() {
+									return new oViewClass(mViewParameters);
+								});
 							};
 
 							return pRequireContext.then(function(oRequireContext) {
@@ -1079,7 +1100,7 @@ function(
 						});
 					}, undefined /* [targetControl] */, undefined /* [aggregationName] */, bAsync);
 
-					return SyncPromise.resolve(oView.fnScopedRunWithOwner ? oView.fnScopedRunWithOwner(fnExtensionPointFactory) : fnExtensionPointFactory());
+					return SyncPromise.resolve(scopedRunWithOwner(fnExtensionPointFactory));
 				}
 
 			} else {
@@ -1241,7 +1262,7 @@ function(
 								try {
 									mMetaContextsInfo = XMLTemplateProcessor._calculatedModelMapping(sValue, oView._oContainingView.oController, true);
 								} catch (e) {
-									Log.error(oView + ":" + e.message);
+									Log.error("[FUTURE FATAL] " + oView + ":" + e.message);
 								}
 
 								if (mMetaContextsInfo) {
@@ -1303,8 +1324,7 @@ function(
 								if ( oBindingInfo ) {
 									mSettings[sName] = oBindingInfo;
 								} else {
-									// TODO we now in theory allow more than just a binding path. Update message?
-									Log.error(oView + ": aggregations with cardinality 0..n only allow binding paths as attribute value (wrong value: " + sName + "='" + sValue + "')");
+									Log.error("[FUTURE FATAL] " + oView + ": aggregations with cardinality 0..n specifies a non valid BindingInfo (wrong value: " + sName + "='" + sValue + "')");
 								}
 							}
 
@@ -1330,7 +1350,7 @@ function(
 									if (vEventHandler) {
 										aEventHandlers.push(vEventHandler);
 									} else  {
-										Log.warning(oView + ": event handler function \"" + sEventHandler + "\" is not a function or does not exist in the controller.");
+										Log.warning("[FUTURE FATAL] " + oView + ": event handler function \"" + sEventHandler + "\" is not a function or does not exist in the controller.");
 									}
 								});
 
@@ -1344,10 +1364,10 @@ function(
 							if (oMetadata.isA("sap.ui.core.mvc.View") && sName == "async") {
 								mSettings[sName] = parseScalarType(oInfo.type, sValue, sName, oView._oContainingView.oController, oRequireModules);
 							} else {
-								Log.warning(oView + ": setting '" + sName + "' for class " + oMetadata.getName() + " (value:'" + sValue + "') is not supported");
+								Log.warning("[FUTURE FATAL] " + oView + ": setting '" + sName + "' for class " + oMetadata.getName() + " (value:'" + sValue + "') is not supported");
 							}
 						} else {
-							assert(sName === 'xmlns', oView + ": encountered unknown setting '" + sName + "' for class " + oMetadata.getName() + " (value:'" + sValue + "')");
+							assert(sName === 'xmlns', "[FUTURE FATAL] " + oView + ": encountered unknown setting '" + sName + "' for class " + oMetadata.getName() + " (value:'" + sValue + "')");
 							if (XMLTemplateProcessor._supportInfo) {
 								XMLTemplateProcessor._supportInfo({
 									context : node,
@@ -1479,11 +1499,7 @@ function(
 								});
 							};
 
-							if (oView.fnScopedRunWithOwner) {
-								oView.fnScopedRunWithOwner(fnCreateStashedControl);
-							} else {
-								fnCreateStashedControl();
-							}
+							scopedRunWithOwner(fnCreateStashedControl);
 
 							// ...and mark the stashed node as invisible.
 							// The original visibility value is still scoped in the clone (visible could be bound, yet stashed controls are never visible)
@@ -1598,42 +1614,47 @@ function(
 						setId(oView, node);
 					}
 				} else if (!bViewRootNode && oClass.getMetadata().isA("sap.ui.core.mvc.View")) {
-					var fnCreateViewInstance = function () {
-						if (!oClass._sType && !mSettings.viewName) {
-							// Add module view name
-							mSettings.viewName = "module:" + oClass.getMetadata().getName().replace(/\./g, "/");
-						}
+					if (!oClass._sType && !mSettings.viewName) {
+						// Add module view name
+						mSettings.viewName = "module:" + oClass.getMetadata().getName().replace(/\./g, "/");
+					}
 
-						// If the view is owned by an async-component we can propagate the asynchronous creation behavior to the nested views
-						if (bIsAsyncComponent && bAsync) {
-							// legacy check: async=false is not supported with an async-component
-							if (mSettings.async === false) {
-								throw new Error(
-									"A nested view contained in a Component implementing 'sap.ui.core.IAsyncContentCreation' is processed asynchronously by default and cannot be processed synchronously.\n" +
-									"Affected Component '" + oOwnerComponent.getMetadata().getComponentName() + "' and View '" + mSettings.viewName + "'."
-								);
-							}
+					mSettings.type = oClass._sType || sType;
 
-							mSettings.type = oClass._sType || sType;
-							pInstanceCreated = View.create(mSettings);
-						} else {
-							// Pass processingMode to nested XMLViews
-							if (oClass.getMetadata().isA("sap.ui.core.mvc.XMLView") && oView._sProcessingMode) {
-								mSettings.processingMode = oView._sProcessingMode;
-							}
-							return View._create(mSettings, undefined, oClass._sType || sType);
+					// If the view is owned by an async-component we can propagate the asynchronous creation behavior to the nested views
+					if (bIsAsyncComponent && bAsync) {
+						// legacy check: async=false is not supported with an async-component
+						if (mSettings.async === false) {
+							throw new Error(
+								"A nested view contained in a Component implementing 'sap.ui.core.IAsyncContentCreation' is processed asynchronously by default and cannot be processed synchronously.\n" +
+								"Affected Component '" + oOwnerComponent.getMetadata().getComponentName() + "' and View '" + mSettings.viewName + "'."
+							);
 						}
-					};
 
-					// for views having a factory function defined we use the factory function!
-					if (oView.fnScopedRunWithOwner) {
-						// We need to use the already created scoped runWithOwner function from the outer view instance.
-						// This way, the nested views are receiving the correct Owner component, across asynchronous calls.
-						vNewControlInstance = oView.fnScopedRunWithOwner(fnCreateViewInstance);
+						pInstanceCreated = scopedRunWithOwner(function() {
+							return View.create(mSettings);
+						});
 					} else {
-						vNewControlInstance = fnCreateViewInstance();
-					}
+						// Pass processingMode to nested XMLViews
+						if (oClass.getMetadata().isA("sap.ui.core.mvc.XMLView") && oView._sProcessingMode) {
+							mSettings.processingMode = oView._sProcessingMode;
+						}
 
+						var sViewClass = View._getViewClassName(mSettings, true /* skip error log*/);
+						if (bAsync && sViewClass) {
+							pInstanceCreated = new Promise(function(resolve, reject) {
+								sap.ui.require([sViewClass], resolve, reject);
+							}).then(function() {
+								return scopedRunWithOwner(function() {
+									return View._create(mSettings);
+								});
+							});
+						} else {
+							vNewControlInstance = scopedRunWithOwner(function() {
+								return View._create(mSettings);
+							});
+						}
+					}
 				} else if (oClass.getMetadata().isA("sap.ui.core.Fragment") && bAsync) {
 
 					// Pass processingMode to any fragments except JS
@@ -1687,14 +1708,12 @@ function(
 								}
 							}
 							oView.applySettings(mSettings);
-						} else if (oView.fnScopedRunWithOwner) {
+						} else {
 							// the scoped runWithOwner function is only during ASYNC processing!
-							oInstance = oView.fnScopedRunWithOwner(function () {
+							oInstance = scopedRunWithOwner(function () {
 								var oInstance = new oClass(mSettings);
 								return oInstance;
 							});
-						} else {
-							oInstance = new oClass(mSettings);
 						}
 
 						// check if we need to hand the ExtensionPoint info to the ExtensionProvider

package/src/sap/ui/core/_IconRegistry.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /* global FontFace */

package/src/sap/ui/core/_UrlResolver.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([

package/src/sap/ui/core/boot/_bootConfig.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/core/boot/_runBoot.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/core/boot/initDOM.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/core/boot/loadCalendar.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/core/boot/loadManifest.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/core/boot/loadModules.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/core/boot/onInit.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/core/boot.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/core/cache/CacheManager.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/core/cache/CacheManagerNOP.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/core/cache/LRUPersistentCache.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/core/cldr/Unicode-Data-Files-LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright © 1991-2014 Unicode, Inc. All rights reserved.
+Copyright © 1991-2023 Unicode, Inc. All rights reserved.
 Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of the

package/src/sap/ui/core/cldr/cy.json

@@ -1195,7 +1195,10 @@
 					"Ion",
 					"Chwef",
 					"Maw",
-					"Ebr",
+					[
+						"Ebr",
+						"Ebrill"
+					],
 					"Mai",
 					"Meh",
 					"Gorff",
@@ -2244,7 +2247,10 @@
 					"Ion",
 					"Chwef",
 					"Maw",
-					"Ebr",
+					[
+						"Ebr",
+						"Ebrill"
+					],
 					"Mai",
 					"Meh",
 					"Gorff",
@@ -3294,7 +3300,10 @@
 					"Ion",
 					"Chwef",
 					"Maw",
-					"Ebr",
+					[
+						"Ebr",
+						"Ebrill"
+					],
 					"Mai",
 					"Meh",
 					"Gorff",