From f402b9e449f7226c4d4026f06986c989f040cb0d Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Thu, 28 Jun 2018 10:57:09 +0200
Subject: [PATCH] update labels on generate models buttons when using infinite
 editing

---
 .../src/views/documenttypes/edit.controller.js            | 8 +++++---
 .../src/views/mediatypes/edit.controller.js               | 6 ++++--
 src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml          | 3 ++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
index 4e1badaf67..da4a53328d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
@@ -27,6 +27,7 @@
         vm.contentType = {};
         vm.labels = {};
         vm.submitButtonKey = "buttons_save";
+        vm.generateModelsKey = "buttons_saveAndGenerateModels";
 
         vm.page = {};
         vm.page.loading = false;
@@ -59,6 +60,7 @@
                 create = $scope.model.create;
                 noTemplate = $scope.model.notemplate;
                 vm.submitButtonKey = "buttons_saveAndClose";
+                vm.generateModelsKey = "buttons_generateModelsAndClose";
             }
         }
 
@@ -185,7 +187,7 @@
                     alias: "save",
                     hotKey: "ctrl+s",
                     hotKeyWhenHidden: true,
-                    labelKey: "buttons_save",
+                    labelKey: vm.submitButtonKey,
                     letter: "S",
                     type: "submit",
                     handler: function () { vm.save(); }
@@ -194,13 +196,13 @@
                     alias: "saveAndGenerateModels",
                     hotKey: "ctrl+g",
                     hotKeyWhenHidden: true,
-                    labelKey: "buttons_saveAndGenerateModels",
+                    labelKey: vm.generateModelsKey,
                     letter: "G",
                     handler: function () {
 
                         vm.page.saveButtonState = "busy";
 
-                        vm.saveInternal().then(function (result) {
+                        saveInternal().then(function (result) {
 
                             vm.page.saveButtonState = "busy";
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
index b2c473d46f..0918a43188 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
@@ -27,6 +27,7 @@
         vm.page.saveButtonState = "init";
         vm.labels = {};
         vm.saveButtonKey = "buttons_save";
+        vm.generateModelsKey = "buttons_saveAndGenerateModels";
 
         onInit();
 
@@ -36,6 +37,7 @@
                 mediaTypeId = $scope.model.id;
                 create = $scope.model.create;
                 vm.saveButtonKey = "buttons_saveAndClose";
+                vm.generateModelsKey = "buttons_generateModelsAndClose";
             }
         }
 
@@ -154,7 +156,7 @@
                 vm.page.defaultButton = {
                     hotKey: "ctrl+s",
                     hotKeyWhenHidden: true,
-                    labelKey: "buttons_save",
+                    labelKey: vm.saveButtonKey,
                     letter: "S",
                     type: "submit",
                     handler: function () { vm.save(); }
@@ -162,7 +164,7 @@
                 vm.page.subButtons = [{
                     hotKey: "ctrl+g",
                     hotKeyWhenHidden: true,
-                    labelKey: "buttons_saveAndGenerateModels",
+                    labelKey: vm.generateModelsKey,
                     letter: "G",
                     handler: function () {
 
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index 6d9997b7de..b70cfe58e0 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -127,7 +127,7 @@
         <key alias="relations">Edit relations</key>
         <key alias="returnToList">Return to list</key>
         <key alias="save">Save</key>
-        <key alias="saveAndClose">Save and Close</key>
+        <key alias="saveAndClose">Save and close</key>
         <key alias="saveAndPublish">Publish</key>
         <key alias="saveAndPublishMany">Publish…</key>
         <key alias="saveAndSchedule">Save and schedule</key>
@@ -139,6 +139,7 @@
         <key alias="styleShow">Show styles</key>
         <key alias="tableInsert">Insert table</key>
         <key alias="generateModels">Generate models</key>
+        <key alias="generateModelsAndClose">Generate models and close</key>
         <key alias="saveAndGenerateModels">Save and generate models</key>
         <key alias="undo">Undo</key>
         <key alias="redo">Redo</key>