@openui5/sap.ui.integration 1.96.2 → 1.98.0

package/src/sap/ui/integration/editor/Editor.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -30,6 +30,7 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/core/Popup",
 	"sap/base/i18n/ResourceBundle",
+	"sap/ui/integration/editor/EditorResourceBundles",
 	"sap/ui/thirdparty/URI",
 	"sap/ui/dom/includeStylesheet",
 	"sap/base/util/LoaderExtensions",
@@ -72,6 +73,7 @@ sap.ui.define([
 	Log,
 	Popup,
 	ResourceBundle,
+	EditorResourceBundles,
 	URI,
 	includeStylesheet,
 	LoaderExtensions,
@@ -134,7 +136,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 * @constructor
 	 * @since 1.94
 	 * @private
@@ -257,8 +259,6 @@ sap.ui.define([
 				if (oControl.getMode() !== "translation") {
 					oRm.addClass("settingsButtonSpace");
 				}
-
-				oRm.writeClasses();
 				oRm.openEnd();
 				if (oControl.getMode() !== "translation") {
 					oRm.renderControl(oControl.getAggregation("_messageStrip"));
@@ -607,6 +607,7 @@ sap.ui.define([
 		this.setAggregation("_messageStrip", new MessageStrip({
 			showIcon: false
 		}));
+		this.setLanguage(Core.getConfiguration().getLanguage());
 		/**
 		 * Facade of the {@link sap.ui.integration.editor.Editor} control.
 		 * @interface
@@ -614,7 +615,7 @@ sap.ui.define([
 		 * @experimental since 1.94
 		 * @public
 		 * @author SAP SE
-		 * @version 1.96.2
+		 * @version 1.98.0
 		 * @borrows sap.ui.integration.editor.Editor#getParameters as getParameters
 		 * @borrows sap.ui.integration.editor.Editor#resolveDestination as resolveDestination
 		 * @borrows sap.ui.integration.editor.Editor#request as request
@@ -755,17 +756,22 @@ sap.ui.define([
 				this._registerManifestModulePath();
 				this._oInitialManifestModel = new JSONModel(this._oEditorManifest._oInitialJson);
 				this.setProperty("json", this._oEditorManifest._oInitialJson, bSuppress);
-				var oManifestJson = this._oEditorManifest._oManifest.getRawJson();
+				var oManifestJson = this._oEditorManifest.oJson;
 				var _beforeCurrentLayer = merge({}, oManifestJson);
 				this._beforeManifestModel = new JSONModel(_beforeCurrentLayer);
 				if (iCurrentModeIndex < Merger.layers["translation"] && this._currentLayerManifestChanges) {
 					//merge if not translation
-					oManifestJson = Merger.mergeDelta(oManifestJson, [this._currentLayerManifestChanges]);
+					oManifestJson = Merger.mergeDelta(oManifestJson, [this._currentLayerManifestChanges], this.getSection());
 				}
 				//create a manifest model after the changes are merged
 				this._manifestModel = new JSONModel(oManifestJson);
 				this._isManifestReady = true;
 				this.fireManifestReady();
+				var vI18n = this._oEditorManifest.get("/sap.app/i18n");
+				var sResourceBundleURL = this.getBaseUrl() + vI18n;
+				if (vI18n && EditorResourceBundles.getResourceBundleURL() !== sResourceBundleURL) {
+					EditorResourceBundles.setResourceBundleURL(sResourceBundleURL);
+				}
 				//use the translations
 				this._loadDefaultTranslations();
 				//add a context model
@@ -773,7 +779,6 @@ sap.ui.define([
 				if (this._oEditorManifest.getResourceBundle()) {
 					this._enhanceI18nModel(this._oEditorManifest.getResourceBundle());
 				}
-
 				return this._loadExtension().then(function() {
 					this._initInternal();
 				}.bind(this));
@@ -801,27 +806,21 @@ sap.ui.define([
 		}
 
 		var oResourceBundle = Core.getLibraryResourceBundle("sap.ui.integration");
-		this._enhanceI18nModel(oResourceBundle);
+		var oResourceModel = new ResourceModel({
+			bundle: oResourceBundle
+		});
+
+		this.setModel(oResourceModel, "i18n");
+		this._oResourceBundle = oResourceBundle;
 		this._defaultTranslationsLoaded = true;
 	};
 
 	Editor.prototype._enhanceI18nModel = function (oResourceBundle) {
 		var oResourceModel = this.getModel("i18n");
-
-		if (oResourceModel) {
-			if (oResourceModel.getResourceBundle().oUrlInfo.url !== oResourceBundle.oUrlInfo.url) {
-				oResourceModel.enhance(oResourceBundle);
-				this._oResourceBundle = oResourceModel.getResourceBundle();
-			}
-			return;
+		if (oResourceModel.getResourceBundle().oUrlInfo.url !== oResourceBundle.oUrlInfo.url) {
+			oResourceModel.enhance(oResourceBundle);
+			this._oResourceBundle = oResourceModel.getResourceBundle();
 		}
-
-		oResourceModel = new ResourceModel({
-			bundle: oResourceBundle
-		});
-
-		this.setModel(oResourceModel, "i18n");
-		this._oResourceBundle = oResourceBundle;
 	};
 
 	Editor.prototype._loadExtension = function () {
@@ -894,7 +893,11 @@ sap.ui.define([
 			this._oDataProviderFactory.destroy();
 		}
 		var oExtension = this.getAggregation("_extension");
-		this._oDataProviderFactory = new DataProviderFactory(this._oDestinations, oExtension, undefined, this);
+		this._oDataProviderFactory = new DataProviderFactory({
+			destinations: this._oDestinations,
+			extension: oExtension,
+			editor: this
+		});
 	};
 
 	/**
@@ -981,8 +984,7 @@ sap.ui.define([
 		this._language = sValue.replaceAll('_', '-');
 		if (this.getLanguage() != sValue) {
 			//reload resource bundler if language changed
-			var oResourceBundle = Core.getLibraryResourceBundle("sap.ui.integration");
-			this._enhanceI18nModel(oResourceBundle);
+			this._loadDefaultTranslations();
 		}
 		this.setProperty("language", sValue, bSuppress);
 		if (!Editor._languages[this._language]) {
@@ -1012,44 +1014,36 @@ sap.ui.define([
 		 */
 	 Editor.prototype._filterManifestChangesByLayer = function (oManifestSettings) {
 		var aChanges = [],
+			that = this,
+			oBeforeLayerChanges = {},
 			oCurrentLayerChanges = { ":layer": Merger.layers[this.getMode()] },
-			iCurrentModeIndex = Merger.layers[this.getMode()];
-		/* hide multi language function since there has a translation issue in Portal
-		var sEditorLanguage = this._language || this.getLanguage() || Core.getConfiguration().getLanguage().replaceAll('_', '-');
-		*/
+			iCurrentModeIndex = Merger.layers[that.getMode()];
 		oManifestSettings.manifestChanges.forEach(function (oChange) {
 			//filter manifest changes. only the changes before the current layer are needed
 			//editor will merge the last layer locally to allow "reset" or properties
 			//also for translation layer, the "original" value is needed
 			var iLayer = oChange.hasOwnProperty(":layer") ? oChange[":layer"] : 1000;
-			/* hide multi language function since there has a translation issue in Portal
-			//backward compatibility for old changes which not have property "multipleLanguage"
-			//replace the value property by valueTranslation property
-			if (!oChange.hasOwnProperty(":multipleLanguage")) {
-				var oChangeTransfered = {};
-				var aKeys = Object.keys(oChange);
-				for (var j = 0; j < aKeys.length; j++) {
-					if (aKeys[j].endsWith("/value") && typeof oChange[aKeys[j]] === "string") {
-						var sValueTranslationsPath = aKeys[j].substring(0, aKeys[j].lastIndexOf("/")) + "/valueTranslations";
-						if (!includes(aKeys, sValueTranslationsPath)) {
-							var oValueTranslation = {};
-							if (iLayer === Merger.layers["translation"]) {
-								oValueTranslation[sEditorLanguage] = oChange[aKeys[j]];
-							} else {
-								for (var p in Editor._languages) {
-									oValueTranslation[p] = oChange[aKeys[j]];
-								}
-							}
-							oChangeTransfered[sValueTranslationsPath] = oValueTranslation;
-							continue;
-						}
-					}
-					oChangeTransfered[aKeys[j]] = oChange[aKeys[j]];
+			if (iLayer === Merger.layers["translation"]) {
+				var sLanguage = that._language;
+				if (sLanguage === "") {
+					sLanguage = Core.getConfiguration().getLanguage().replaceAll('_', '-');
 				}
-				oChange = oChangeTransfered;
-			}*/
+				var oTranslationChange = {
+					"texts": {}
+				};
+				oTranslationChange.texts[sLanguage] = {};
+				Object.keys(oChange).forEach(function (s) {
+					if (s.charAt(0) === "/") {
+						oTranslationChange.texts[sLanguage][s] = oChange[s];
+					} else {
+						oTranslationChange[s] = oChange[s];
+					}
+				});
+				oChange = oTranslationChange;
+			}
 			if (iLayer < iCurrentModeIndex) {
 				aChanges.push(oChange);
+				oBeforeLayerChanges = merge(oBeforeLayerChanges, oChange);
 			} else if (iLayer === iCurrentModeIndex) {
 				//store the current layer changes locally for later processing
 				oCurrentLayerChanges = oChange;
@@ -1057,6 +1051,7 @@ sap.ui.define([
 		});
 		oManifestSettings.manifestChanges = aChanges;
 		this._currentLayerManifestChanges = oCurrentLayerChanges;
+		this._beforeLayerManifestChanges = oBeforeLayerChanges;
 	};
 	/**
 	 * Initializes the editor after the json is set
@@ -1187,43 +1182,19 @@ sap.ui.define([
 			for (var n in oSettings.form.items) {
 				var oItem = oSettings.form.items[n];
 				if (oItem.editable && oItem.visible) {
-					/* hide multi language function since there has a translation issue in Portal
-					var oValueTranslations;
-					var sLanguage = this.getMode() !== "translation" ? Core.getConfiguration().getLanguage().replaceAll('_', '-') : this._language || this.getLanguage();
-					*/
-					var sValueTranslationsPath = "";
-					if (oItem.manifestpath) {
-						sValueTranslationsPath = oItem.manifestpath.substring(0, oItem.manifestpath.lastIndexOf("/")) + "/valueTranslations";
-					}
 					if (this.getMode() !== "translation") {
-						if (oItem.translatable && !oItem._changed && oItem._translatedPlaceholder && !this._currentLayerManifestChanges[oItem.manifestpath] && !this._currentLayerManifestChanges[sValueTranslationsPath]) {
+						if (oItem.translatable && !oItem._changed && oItem._translatedPlaceholder && !this._currentLayerManifestChanges[oItem.manifestpath]) {
 							//do not save a value that was not changed and comes from a translated default value
 							//mResult[oItem.manifestpath] = oItem._translatedPlaceholder;
 							//if we would save it
 							continue;
 						} else {
-							/* hide multi language function since there has a translation issue in Portal
-							* need to remove below line later if we want release multi language function again
-							*/
-							mResult[oItem.manifestpath] = oItem.value;
 							if (oItem.valueItems) {
 								mResult[oItem.manifestpath.substring(0, oItem.manifestpath.lastIndexOf("/")) + "/valueItems"] = oItem.valueItems;
 							}
-							/* hide multi language function since there has a translation issue in Portal
-							//if current parameter is string and translatable, create or merge valueTranslations property of it.
-							//set the current change to current language in valueTranslations.
-							if (oItem.type === "string" && oItem.translatable) {
-								if (!oItem.valueTranslations) {
-									oValueTranslations = {};
-								} else {
-									oValueTranslations = deepClone(oItem.valueTranslations, 500);
-								}
-								oValueTranslations[sLanguage] = oItem.value;
-								oItem.valueTranslations = oValueTranslations;
-								mResult[sValueTranslationsPath] = oItem.valueTranslations;
-							} else {
+							if (oItem.type !== "string" || !oItem.translatable) {
 								mResult[oItem.manifestpath] = oItem.value;
-							}*/
+							}
 						}
 					} else if (oItem.translatable && oItem.value) {
 						//in translation mode create an entry if there is a value
@@ -1252,6 +1223,15 @@ sap.ui.define([
 				}
 			}
 		}
+		if (oSettings.texts) {
+			mResult.texts = {};
+			for (var language in oSettings.texts) {
+				mResult.texts[language] = {};
+				for (var translation in oSettings.texts[language]) {
+					mResult.texts[language][translation] = oSettings.texts[language][translation];
+				}
+			}
+		}
 		//add a property ":multipleLanguage" for backward compatibility of multiple language feature
 		if (this.getMode() !== "translation") {
 			mResult[":multipleLanguage"] = true;
@@ -1696,16 +1676,25 @@ sap.ui.define([
 			oSuggestValueBinding.attachChange(function () {
 				var oConfigTemp = merge({}, oConfig);
 				oConfigTemp._cancel = false;
-				this._addValueListModel(oConfigTemp, oField, true);
+				this._addValueListModel(oConfigTemp, oField);
 			}.bind(this));
 		}
-		this._addValueListModel(oConfig, oField);
+		if (oConfig.values) {
+			// for MultiInput used in string[] field with filter backend, do not request data when creating it
+			if (oConfig.type === "string[]" && oField.isFilterBackend() && oConfig.visualization && oConfig.visualization.type === "MultiInput") {
+				oField.setModel(new JSONModel({}), undefined);
+			} else {
+				this._addValueListModel(oConfig, oField);
+			}
+		}
+		this._createDependentFields(oConfig, oField);
 		oField._cols = oConfig.cols || 2; //by default 2 cols
 		if (oConfig.layout) {
 			oField._layout = oConfig.layout;
 		}
 		oField._oDataProviderFactory = this._oDataProviderFactory;
 		oField.setAssociation("_messageStrip", this.getAggregation("_messageStrip"));
+		oField._previewPostion = this.getPreviewPosition();
 		return oField;
 	};
 
@@ -1725,7 +1714,7 @@ sap.ui.define([
 			for (var i = 0; i < aDependentFields.length; i++) {
 				var o = aDependentFields[i];
 				o.config._cancel = false;
-				this._addValueListModel(o.config, o.field, true, 500 * i);
+				this._addValueListModel(o.config, o.field, 500 * i);
 			}
 			this._bIgnoreUpdates = false;
 		}
@@ -1984,7 +1973,7 @@ sap.ui.define([
 	 * @param {object} oConfig
 	 * @param {BaseField} oField
 	 */
-	Editor.prototype._addValueListModel = function (oConfig, oField, bIgnore, nTimeout) {
+	Editor.prototype._addValueListModel = function (oConfig, oField, nTimeout) {
 		if (oConfig.values) {
 			var oValueModel;
 			if (oConfig.values.data) {
@@ -2041,44 +2030,60 @@ sap.ui.define([
 				//to carry the values.
 				oField.setModel(oValueModel, undefined);
 			}
-			if (!bIgnore) {
-				var sData = JSON.stringify(oConfig.values.data);
-				if (sData) {
-					var destParamRegExp = /parameters\.([^\}\}]+)|destinations\.([^\}\}]+)|\{items\>[\/?\w+]+\}/g,
-						aResult = sData.match(destParamRegExp);
-					if (aResult) {
-						//add the field to dependency to either the parameter or destination
-						for (var i = 0; i < aResult.length; i++) {
-							var sValueKey = "/value";
-							var sDependentPath = this.getConfigurationPath();
-							if (aResult[i].indexOf("destinations.") === 0 || aResult[i].indexOf("parameters.") === 0) {
-								if (aResult[i].indexOf("destinations.") === 0) {
-									sValueKey = "/name";
-								}
-								sDependentPath = sDependentPath + aResult[i].replace(".", "/") + "/" + sValueKey;
-							} else if (aResult[i].indexOf("{items>") === 0) {
-								sDependentPath = sDependentPath + "/parameters/" + aResult[i].slice(7, -1);
-							}
-							var oItem = this._mItemsByPaths[sDependentPath];
-							if (oItem) {
-								//DIGITALWORKPLACE-4802
-								//clone the config since the item may dependent to itself in filter backend feature
-								if (oItem._settingspath === oConfig._settingspath) {
-									oConfig = merge({}, oConfig);
-								}
-								oItem._dependentFields = oItem._dependentFields || [];
-								oItem._dependentFields.push({
-									field: oField,
-									config: oConfig
-								});
+		}
+	};
 
+	Editor.prototype._createDependentFields = function (oConfig, oField) {
+		if (oConfig.values) {
+			var sData = JSON.stringify(oConfig.values.data);
+			if (sData) {
+				var destParamRegExp = /parameters\.([^\}\}]+)|destinations\.([^\}\}]+)|\{items\>[\/?\w+]+\}/g,
+					aResult = sData.match(destParamRegExp);
+				if (aResult) {
+					//add the field to dependency to either the parameter or destination
+					for (var i = 0; i < aResult.length; i++) {
+						var sValueKey = "/value";
+						var sDependentPath = this.getConfigurationPath();
+						if (aResult[i].indexOf("destinations.") === 0 || aResult[i].indexOf("parameters.") === 0) {
+							if (aResult[i].indexOf("destinations.") === 0) {
+								sValueKey = "/name";
 							}
+							sDependentPath = sDependentPath + aResult[i].replace(".", "/") + "/" + sValueKey;
+						} else if (aResult[i].indexOf("{items>") === 0) {
+							sDependentPath = sDependentPath + "/parameters/" + aResult[i].slice(7, -1);
+						}
+						var oItem = this._mItemsByPaths[sDependentPath];
+						if (oItem) {
+							//DIGITALWORKPLACE-4802
+							//clone the config since the item may dependent to itself in filter backend feature
+							if (oItem._settingspath === oConfig._settingspath) {
+								oConfig = merge({}, oConfig);
+							}
+							oItem._dependentFields = oItem._dependentFields || [];
+							oItem._dependentFields.push({
+								field: oField,
+								config: oConfig
+							});
 						}
 					}
 				}
 			}
 		}
 	};
+
+	Editor.prototype.getBeforeLayerChange = function (sKey) {
+		if (!this._beforeLayerManifestChanges) {
+			this._beforeLayerManifestChanges = {};
+		}
+		return this._beforeLayerManifestChanges[sKey];
+	};
+
+	Editor.prototype.getTranslationValueInTexts = function (sLanguage, sKey) {
+		var sTranslationPath = "/texts/" + sLanguage;
+		var oProperty = this._settingsModel.getProperty(sTranslationPath) || {};
+		return oProperty[sKey];
+	};
+
 	/**
 	 * Adds an item to the _formContent aggregation based on the config settings
 	 * @param {} oConfig
@@ -2134,6 +2139,14 @@ sap.ui.define([
 			if (oConfig.hint) {
 				this._addHint(oConfig.hint);
 			}
+			//add "aria-label" for each panel to make the landmark uniquely
+			var oDelegate = {
+				onAfterRendering: function() {
+					var ePanel = document.getElementById(oPanel.getId());
+					ePanel.setAttribute("aria-label", oConfig.label);
+				}
+			};
+			oPanel.addEventDelegate(oDelegate);
 			return;
 		}
 		if (oConfig.type === "separator") {
@@ -2144,6 +2157,7 @@ sap.ui.define([
 			return;
 		}
 		var oNewLabel = null;
+		var sLanguage = Core.getConfiguration().getLanguage().replaceAll('_', '-');
 		if (sMode === "translation") {
 			if ((typeof oConfig.value === "string" && oConfig.value.indexOf("{") === 0) || typeof oConfig.values !== "undefined") {
 				//do not show dynamic values for translation
@@ -2161,63 +2175,68 @@ sap.ui.define([
 			delete oConfig.values;
 
 			//create a configuration clone. map the _settingspath setting to _language, and set it to not editable
-			var origLangField = deepClone(oConfig, 500);
-			origLangField._settingspath += "/_language";
-			origLangField.editable = false;
-			origLangField.required = false;
-			/* hide multi language function since there has a translation issue in Portal
-			//if has valueTransaltions, get value via language setting in core
-			if (origLangField.valueTranslations) {
-				var sLanguage = Core.getConfiguration().getLanguage().replaceAll('_', '-');
-				if (Editor._languages[sLanguage]) {
-					if (origLangField.valueTranslations[sLanguage]) {
-						origLangField.value = origLangField.valueTranslations[sLanguage];
-					}
-				} else if (sLanguage.indexOf"-") > -1) {
-					sLanguage = sLanguage.substring(0, sLanguage.indexOf("-"));
-					if (Editor._languages[sLanguage]) {
-						if (origLangField.valueTranslations[sLanguage]) {
-							origLangField.value = origLangField.valueTranslations[sLanguage];
-						}
-					}
+			var origLangFieldConfig = deepClone(oConfig, 500);
+			origLangFieldConfig._settingspath += "/_language";
+			origLangFieldConfig.editable = false;
+			origLangFieldConfig.required = false;
+			//if has value transaltions, get value via language setting in core
+			if (!Editor._languages[sLanguage] && sLanguage.indexOf("-") > -1) {
+				sLanguage = sLanguage.substring(0, sLanguage.indexOf("-"));
+			}
+			if (Editor._languages[sLanguage]) {
+				var sTranslateText = this.getTranslationValueInTexts(sLanguage, oConfig.manifestpath);
+				if (sTranslateText) {
+					origLangFieldConfig.value = sTranslateText;
 				}
-			}*/
-			if (!origLangField.value) {
+			}
+			if (!origLangFieldConfig.value) {
 				//the original language field shows only a text control. If empty we show a dash to avoid empty text.
-				origLangField.value = "-";
+				origLangFieldConfig.value = "-";
 			}
-			var oLabel = this._createLabel(origLangField);
+			var oLabel = this._createLabel(origLangFieldConfig);
 			this.addAggregation("_formContent",
 				oLabel
 			);
-			var oField = this._createField(origLangField);
-			oField.isOrigLangField = true;
-			this.addAggregation("_formContent", oField);
+			var oOrigLanguageField = this._createField(origLangFieldConfig);
+			oOrigLanguageField.isOrigLangField = true;
+			this.addAggregation("_formContent", oOrigLanguageField);
 
-			oConfig.value = oConfig._translatedValue || "";
 			//even if a item is not visible or not editable by another layer for translations it should always be editable and visible
 			oConfig.editable = oConfig.visible = oConfig.translatable;
-			//if there are changes for the current layer, read the already translated value from there
-			//now merge these changes for translation into the item configs
-			if (this._currentLayerManifestChanges) {
-				oConfig.value = this._currentLayerManifestChanges[oConfig.manifestpath] || oConfig.value;
+			sLanguage = this._language;
+			if (!this.getBeforeLayerChange(oConfig.manifestpath)) {
+				oConfig.value = oConfig._translatedValue || "";
+			}
+			var sTranslateText = this.getTranslationValueInTexts(sLanguage, oConfig.manifestpath);
+			if (sTranslateText) {
+				oConfig.value = sTranslateText;
 			}
 			//change the label for the translation field
 			oConfig.label = oConfig._translatedLabel || "";
 			oConfig.required = false; //translation is never required
-			var oField = this._createField(oConfig);
+			var oTranslateLanguageField = this._createField(oConfig);
 			this.addAggregation("_formContent",
-				oField
+				oTranslateLanguageField
 			);
 		} else {
 			oNewLabel = this._createLabel(oConfig);
 			this.addAggregation("_formContent",
 				oNewLabel
 			);
+			var sBeforeLayerChange = this.getBeforeLayerChange(oConfig.manifestpath);
+			if (sBeforeLayerChange) {
+				oConfig._beforeLayerChange = sBeforeLayerChange;
+			}
 			//if there are changes for the current layer, read the already translated value from there
 			//now merge these changes for translation into the item configs
-			if (this._currentLayerManifestChanges) {
-				oConfig.value = this._currentLayerManifestChanges[oConfig.manifestpath] || oConfig.value;
+			if (this._currentLayerManifestChanges && this._currentLayerManifestChanges[oConfig.manifestpath]) {
+				oConfig.value = this._currentLayerManifestChanges[oConfig.manifestpath];
+				oConfig._beforeLayerChange = oConfig.value;
+			}
+			sLanguage = this._language;
+			var sTranslateText = this.getTranslationValueInTexts(sLanguage, oConfig.manifestpath);
+			if (sTranslateText) {
+				oConfig.value = sTranslateText;
 			}
 			var oField = this._createField(oConfig);
 			this.addAggregation("_formContent",
@@ -2335,28 +2354,12 @@ sap.ui.define([
 					//force a label setting, set it to the name of the item
 					oItem.label = oItem.label || n;
 					//what is the current value from the change?
-					/* hide multi language function since there has a translation issue in Portal
-					var sCurrentLayerValue, sValueTranslationsPath, aTranslationLayerValueChanges;
-					* remove below line if release this feature again
-					*/
 					var sCurrentLayerValue;
 					if (oItem.manifestpath) {
 						this._mItemsByPaths[oItem.manifestpath] = oItem;
-						/* hide multi language function since there has a translation issue in Portal
-						sValueTranslationsPath = oItem.manifestpath.substring(0, oItem.manifestpath.lastIndexOf("/")) + "/valueTranslations";
-						if (this.getMode() === "translation") {
-							if (this._currentLayerManifestChanges
-								&& this._currentLayerManifestChanges[sValueTranslationsPath]) {
-								//get valueTranslations from current layer changes if current mode is translation
-								aTranslationLayerValueChanges = this._currentLayerManifestChanges[sValueTranslationsPath];
-							}
-						} else {
+						if (this.getMode() !== "translation") {
 							sCurrentLayerValue = this._currentLayerManifestChanges[oItem.manifestpath];
-						}*/
-						/* hide multi language function since there has a translation issue in Portal
-						* need to remove below line later if release multi language function again
-						*/
-						sCurrentLayerValue = this._currentLayerManifestChanges[oItem.manifestpath];
+						}
 					}
 					//if not changed it should be undefined, and ignore changes in tranlation layer
 					oItem._changed = sCurrentLayerValue !== undefined && this.getMode() !== "translation";
@@ -2370,19 +2373,6 @@ sap.ui.define([
 					//check if the provided value from the parameter or designtime default value is a translated value
 					//restrict this to string types for now
 					if (oItem.type === "string") {
-						/* hide multi language function since there has a translation issue in Portal
-						//get i18n path of the editor, and set it to item for initializing EditorResourceBundles
-						var vI18n = this._oEditorManifest.get("/sap.app/i18n");
-						if (!vI18n) {
-							vI18n = "";
-						}
-						oItem._resourceBundleURL = this.getBaseUrl() + vI18n;
-						if (oItem.manifestpath) {
-							//merge valueTranslations in current mainfest mode and current layer changes
-							var oValueTranslationsInManifest = this._manifestModel.getProperty(sValueTranslationsPath);
-							oItem.valueTranslations = merge(oValueTranslationsInManifest, aTranslationLayerValueChanges);
-							aTranslationLayerValueChanges = undefined;
-						}*/
 						//check if is translatable via default value, if default value match "{{sTranslationTextKey}}" or "{i18n>sTranslationTextKey}", it is translatable
 						oItem._translatedDefaultPlaceholder = this._getManifestDefaultValue(oItem.manifestpath);
 						var sTranslationTextKey = null,
@@ -2392,7 +2382,7 @@ sap.ui.define([
 							if (this._isValueWithParameterSyntax(sPlaceholder)) {
 								oItem.translatable = false;
 							}
-							//parameter translated value wins over designtime defaultValue
+							//parameter translated value
 							if (this._isValueWithHandlebarsTranslation(sPlaceholder)) {
 								sTranslationTextKey = sPlaceholder.substring(2, sPlaceholder.length - 2);
 							} else if (sPlaceholder.startsWith("{i18n>")) {
@@ -2402,11 +2392,15 @@ sap.ui.define([
 							if (sTranslationTextKey) {
 								//force translatable, even if it was not explicitly set already
 								oItem.translatable = true;
+							} else if (oItem.translatable  && this.getMode() === "translation" && !this.getBeforeLayerChange(oItem.manifestpath)) {
+								//if no translation key which means item defined as string value directly.
+								//set the _translatedValue with item manifest value.
+								oItem._translatedValue  = oItem._translatedDefaultPlaceholder;
+								oItem.value = oItem._translatedValue;
 							}
 						}
 						//check if before value still has tranlation key
 						oItem._translatedPlaceholder = oItem._beforeValue;
-						sTranslationTextKey = null;
 						sPlaceholder = oItem._translatedPlaceholder;
 						if (sPlaceholder) {
 							//value with parameter syntax will not be translated
@@ -2419,35 +2413,33 @@ sap.ui.define([
 							} else if (sPlaceholder.startsWith("{i18n>")) {
 								sTranslationTextKey = sPlaceholder.substring(6, sPlaceholder.length - 1);
 							}
-							//only if there is a translation key
-							if (sTranslationTextKey) {
-								oItem._translatedValue = this.getModel("i18n").getResourceBundle().getText(sTranslationTextKey);
-								if (oItem._changed) {
-									//item was changed, take the current value
-									oItem.value = sCurrentLayerValue;
-								} else {
-									oItem.value = oItem._translatedValue;
-								}
-								if (oItem.valueTranslations && oItem.valueTranslations[sLanguage]) {
-									oItem.value = oItem.valueTranslations[sLanguage];
-								}
-								if (this.getMode() === "translation") {
-									//if we are in translation mode the default value differs and depends on the language
-									//TODO this does not work in SWZ, the base path is not taken into account...
-									//get the translated default value for the language we want to translate this.getLanguage()
-									oItem._translatedValue = this._getCurrentLanguageSpecificText(sTranslationTextKey);
+						}
+						var sTranslationValueinTexts = this.getTranslationValueInTexts(sLanguage, oItem.manifestpath);
+						//only if there is a translation key
+						if (sTranslationTextKey) {
+							oItem._translatedValue = this.getModel("i18n").getResourceBundle().getText(sTranslationTextKey);
+							if (oItem._changed) {
+								//item was changed, take the current value
+								oItem.value = sCurrentLayerValue;
+							} else if (oItem.value === oItem._translatedDefaultPlaceholder) {
+								oItem.value = oItem._translatedValue;
+							}
+							if (this.getMode() === "translation") {
+								//if we are in translation mode the default value differs and depends on the language
+								//TODO this does not work in SWZ, the base path is not taken into account...
+								//get the translated default value for the language we want to translate this.getLanguage()
+								//if the value is "", which means the i18n setting is not correct, do not use it as translated value
+								var sCurrentLanguageSpecificText = this._getCurrentLanguageSpecificText(sTranslationTextKey);
+								if (sCurrentLanguageSpecificText !== "") {
+									oItem._translatedValue = sCurrentLanguageSpecificText;
 								}
-							} else if (oItem.translatable  && this.getMode() === "translation") {
-								//if no translation key which means item defined as string value directly.
-								//set the _translatedValue with item manifest value or default value.
-								oItem._translatedValue  = oItem._translatedPlaceholder;
-								oItem.value = oItem._beforeValue;
+							} else if (sTranslationValueinTexts) {
+								oItem.value = sTranslationValueinTexts;
 							}
+						} else if (this.getMode() !== "translation" && oItem.translatable && sTranslationValueinTexts) {
+							oItem.value = sTranslationValueinTexts;
 						}
 						if (this.getMode() === "translation") {
-							if (oItem.valueTranslations && oItem.valueTranslations[sLanguage]) {
-								oItem._translatedValue = oItem.valueTranslations[sLanguage];
-							}
 							if (this._isValueWithHandlebarsTranslation(oItem.label)) {
 								oItem._translatedLabel = this._getCurrentLanguageSpecificText(oItem.label.substring(2, oItem.label.length - 2), true);
 							} else if (oItem.label && oItem.label.startsWith("{i18n>")) {
@@ -2462,6 +2454,12 @@ sap.ui.define([
 						if (oValueItems) {
 							oItem.valueItems = oValueItems;
 						}
+						// get value tokens of MultiInput from manifest change for current item
+						var sValueTokensPath = oItem.manifestpath.substring(0, oItem.manifestpath.lastIndexOf("/")) + "/valueTokens";
+						var oValueTokens = this._manifestModel.getProperty(sValueTokensPath);
+						if (oValueTokens) {
+							oItem.valueTokens = oValueTokens;
+						}
 					}
 
 					//translate label if it is {{KEY}}
@@ -2589,6 +2587,7 @@ sap.ui.define([
 	 * Applies previous layer designtime settings that were changed
 	 */
 	Editor.prototype._applyDesigntimeLayers = function (oSettings) {
+		var oTexts = {};
 		//pull current values
 		if (this._appliedLayerManifestChanges && Array.isArray(this._appliedLayerManifestChanges)) {
 			for (var i = 0; i < this._appliedLayerManifestChanges.length; i++) {
@@ -2599,6 +2598,10 @@ sap.ui.define([
 						this._settingsModel.setProperty(aKeys[j], oChanges[aKeys[j]]);
 					}
 				}
+				var oAppliedLayerManifestChangeTexts = this._appliedLayerManifestChanges[i]["texts"];
+				if (oAppliedLayerManifestChangeTexts) {
+					oTexts = merge(oTexts, oAppliedLayerManifestChangeTexts);
+				}
 			}
 		}
 		if (this._currentLayerManifestChanges) {
@@ -2619,6 +2622,13 @@ sap.ui.define([
 					this._settingsModel.setProperty(sNext + "/" + sProp, oChanges[aKeys[j]]);
 				}
 			}
+			var ocurrentLayerManifestChangeTexts = this._currentLayerManifestChanges["texts"];
+			if (ocurrentLayerManifestChangeTexts) {
+				oTexts = merge(oTexts, ocurrentLayerManifestChangeTexts);
+			}
+		}
+		if (!deepEqual(oTexts, {})) {
+			this._settingsModel.setProperty("/texts", oTexts);
 		}
 	};
 	/**