BUGFIX: Readd configuration urls and remove remove l18n hack

neos · Sep 4, 2019 · b9e5aea · b9e5aea
1 parent 87d39cb
commit b9e5aea
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/Neos.Neos/Resources/Private/Templates/Backend/Module/Index.html b/Neos.Neos/Resources/Private/Templates/Backend/Module/Index.html
@@ -25,7 +25,10 @@
 	<script type="text/javascript">
 		// TODO: Get rid of those global variables
 		{neos:backend.javascriptConfiguration()}
-	</script>
+  </script>
+
+  <link rel="neos-vieschema" href="{f:uri.action(action: 'vieSchema', controller: 'Backend\Schema', package: 'Neos.Neos', absolute: true, arguments: {version: '{neos:backend.configurationCacheVersion()}'})}" />
+  <link rel="neos-xliff" href="{f:uri.action(action: 'xliffAsJson', arguments: {locale: '{neos:backend.interfaceLanguage()}', version: '{neos:backend.xliffCacheVersion()}'}, controller: 'Backend\Backend', package: 'Neos.Neos', absolute: true) -> f:format.raw()}" />
 </f:section>
 
 <f:section name="body">

diff --git a/Neos.Neos/Resources/Public/JavaScript/LegacyUiBootstrap-built.js b/Neos.Neos/Resources/Public/JavaScript/LegacyUiBootstrap-built.js
diff --git a/Neos.Neos/Resources/Public/JavaScript/Shared/I18n.js b/Neos.Neos/Resources/Public/JavaScript/Shared/I18n.js
@@ -81,6 +81,12 @@ define(
 		 * @returns {string}
 		 */
 		translate: function(id, fallback, packageKey, source, parameters, context) {
+			// Prevent caching missing keys when used too early
+			if (this.get('initialized') === false) {
+				console.error('Labels not initialized when trying to translate "' + id + '"');
+				return;
+			}
+
 			var translatedValue, translationParts;
 			fallback = fallback || id;
 			packageKey = packageKey || this.defaultPackage;